Skip to content

Commit 2902fb2

Browse files
NathanSweetNathanSweet
committedOct 5, 2014
Formatted source, committed formatter policy.
·
spine-libgdx-4.2.12.1.08
1 parent 7b07557 commit 2902fb2

38 files changed

+1184
-1278
lines changed
 

‎spine-unity/Assets/Examples/Scripts/BasicPlatformerController.cs

+114-142
Original file line numberDiff line numberDiff line change
@@ -39,196 +39,168 @@
3939
[RequireComponent(typeof(CharacterController))]
4040
public class BasicPlatformerController : MonoBehaviour {
4141

42-
#if !UNITY_4_3 && !UNITY_4_4
42+
#if UNITY_4_5
4343
[Header("Controls")]
4444
#endif
45-
public string XAxis = "Horizontal";
46-
public string YAxis = "Vertical";
47-
public string JumpButton = "Jump";
45+
public string XAxis = "Horizontal";
46+
public string YAxis = "Vertical";
47+
public string JumpButton = "Jump";
4848

49-
#if !UNITY_4_3 && !UNITY_4_4
49+
#if UNITY_4_5
5050
[Header("Moving")]
5151
#endif
5252
public float walkSpeed = 4;
53-
public float runSpeed = 10;
54-
public float gravity = 65;
53+
public float runSpeed = 10;
54+
public float gravity = 65;
5555

56-
#if !UNITY_4_3 && !UNITY_4_4
56+
#if UNITY_4_5
5757
[Header("Jumping")]
5858
#endif
5959
public float jumpSpeed = 25;
60-
public float jumpDuration = 0.5f;
61-
public float jumpInterruptFactor = 100;
62-
public float forceCrouchVelocity = 25;
63-
public float forceCrouchDuration = 0.5f;
60+
public float jumpDuration = 0.5f;
61+
public float jumpInterruptFactor = 100;
62+
public float forceCrouchVelocity = 25;
63+
public float forceCrouchDuration = 0.5f;
6464

65-
#if !UNITY_4_3 && !UNITY_4_4
65+
#if UNITY_4_5
6666
[Header("Graphics")]
6767
#endif
6868
public Transform graphicsRoot;
69-
public SkeletonAnimation skeletonAnimation;
69+
public SkeletonAnimation skeletonAnimation;
7070

71-
#if !UNITY_4_3 && !UNITY_4_4
71+
#if UNITY_4_5
7272
[Header("Animation")]
7373
#endif
7474
public string walkName = "Walk";
75-
public string runName = "Run";
76-
public string idleName = "Idle";
77-
public string jumpName = "Jump";
78-
public string fallName = "Fall";
79-
public string crouchName = "Crouch";
75+
public string runName = "Run";
76+
public string idleName = "Idle";
77+
public string jumpName = "Jump";
78+
public string fallName = "Fall";
79+
public string crouchName = "Crouch";
8080

81-
#if !UNITY_4_3 && !UNITY_4_4
81+
#if UNITY_4_5
8282
[Header("Audio")]
8383
#endif
8484
public AudioSource jumpAudioSource;
8585
public AudioSource hardfallAudioSource;
8686
public AudioSource footstepAudioSource;
8787
public string footstepEventName = "Footstep";
88-
89-
90-
91-
CharacterController controller;
92-
Vector2 velocity = Vector2.zero;
93-
Vector2 lastVelocity = Vector2.zero;
94-
bool lastGrounded = false;
95-
float jumpEndTime = 0;
96-
bool jumpInterrupt = false;
97-
float forceCrouchEndTime;
98-
99-
100-
Quaternion flippedRotation = Quaternion.Euler(0, 180, 0);
101-
102-
void Awake()
103-
{
104-
controller = GetComponent<CharacterController>();
88+
CharacterController controller;
89+
Vector2 velocity = Vector2.zero;
90+
Vector2 lastVelocity = Vector2.zero;
91+
bool lastGrounded = false;
92+
float jumpEndTime = 0;
93+
bool jumpInterrupt = false;
94+
float forceCrouchEndTime;
95+
Quaternion flippedRotation = Quaternion.Euler(0, 180, 0);
96+
97+
void Awake () {
98+
controller = GetComponent<CharacterController>();
10599
}
106100

107-
void Start(){
101+
void Start () {
108102
//register a callback for Spine Events (in this case, Footstep)
109103
skeletonAnimation.state.Event += HandleEvent;
110104
}
111105

112-
void HandleEvent (Spine.AnimationState state, int trackIndex, Spine.Event e)
113-
{
106+
void HandleEvent (Spine.AnimationState state, int trackIndex, Spine.Event e) {
114107
//play some sound if footstep event fired
115-
if(e.Data.Name == footstepEventName){
108+
if (e.Data.Name == footstepEventName) {
116109
footstepAudioSource.Stop();
117110
footstepAudioSource.Play();
118111
}
119-
}
120-
121-
void Update()
122-
{
123-
//control inputs
124-
float x = Input.GetAxis(XAxis);
125-
float y = Input.GetAxis(YAxis);
126-
//check for force crouch
127-
bool crouching = (controller.isGrounded && y < -0.5f) || (forceCrouchEndTime > Time.time);
128-
velocity.x = 0;
129-
130-
//Calculate control velocity
131-
if (!crouching) {
132-
if (Input.GetButtonDown(JumpButton) && controller.isGrounded)
133-
{
134-
//jump
112+
}
113+
114+
void Update () {
115+
//control inputs
116+
float x = Input.GetAxis(XAxis);
117+
float y = Input.GetAxis(YAxis);
118+
//check for force crouch
119+
bool crouching = (controller.isGrounded && y < -0.5f) || (forceCrouchEndTime > Time.time);
120+
velocity.x = 0;
121+
122+
//Calculate control velocity
123+
if (!crouching) {
124+
if (Input.GetButtonDown(JumpButton) && controller.isGrounded) {
125+
//jump
135126
jumpAudioSource.Stop();
136127
jumpAudioSource.Play();
137-
velocity.y = jumpSpeed;
138-
jumpEndTime = Time.time + jumpDuration;
139-
}
140-
else if (Time.time < jumpEndTime && Input.GetButtonUp(JumpButton))
141-
{
142-
jumpInterrupt = true;
143-
}
128+
velocity.y = jumpSpeed;
129+
jumpEndTime = Time.time + jumpDuration;
130+
} else if (Time.time < jumpEndTime && Input.GetButtonUp(JumpButton)) {
131+
jumpInterrupt = true;
132+
}
144133

145134

146-
if (x != 0)
147-
{
148-
//walk or run
149-
velocity.x = Mathf.Abs(x) > 0.6f ? runSpeed : walkSpeed;
150-
velocity.x *= Mathf.Sign(x);
151-
}
152-
153-
if (jumpInterrupt)
154-
{
155-
//interrupt jump and smoothly cut Y velocity
156-
if (velocity.y > 0)
157-
{
158-
velocity.y = Mathf.MoveTowards(velocity.y, 0, Time.deltaTime * 100);
159-
}
160-
else
161-
{
162-
jumpInterrupt = false;
163-
}
164-
}
165-
}
166-
167-
//apply gravity F = mA (Learn it, love it, live it)
168-
velocity.y -= gravity * Time.deltaTime;
169-
170-
//move
171-
controller.Move(new Vector3(velocity.x, velocity.y, 0) * Time.deltaTime);
135+
if (x != 0) {
136+
//walk or run
137+
velocity.x = Mathf.Abs(x) > 0.6f ? runSpeed : walkSpeed;
138+
velocity.x *= Mathf.Sign(x);
139+
}
140+
141+
if (jumpInterrupt) {
142+
//interrupt jump and smoothly cut Y velocity
143+
if (velocity.y > 0) {
144+
velocity.y = Mathf.MoveTowards(velocity.y, 0, Time.deltaTime * 100);
145+
} else {
146+
jumpInterrupt = false;
147+
}
148+
}
149+
}
150+
151+
//apply gravity F = mA (Learn it, love it, live it)
152+
velocity.y -= gravity * Time.deltaTime;
153+
154+
//move
155+
controller.Move(new Vector3(velocity.x, velocity.y, 0) * Time.deltaTime);
172156

173-
if (controller.isGrounded)
174-
{
175-
//cancel out Y velocity if on ground
176-
velocity.y = -gravity * Time.deltaTime;
177-
jumpInterrupt = false;
178-
}
157+
if (controller.isGrounded) {
158+
//cancel out Y velocity if on ground
159+
velocity.y = -gravity * Time.deltaTime;
160+
jumpInterrupt = false;
161+
}
179162

180163

181-
Vector2 deltaVelocity = lastVelocity - velocity;
182-
183-
if (!lastGrounded && controller.isGrounded)
184-
{
185-
//detect hard fall
186-
if ((gravity*Time.deltaTime) - deltaVelocity.y > forceCrouchVelocity)
187-
{
188-
forceCrouchEndTime = Time.time + forceCrouchDuration;
164+
Vector2 deltaVelocity = lastVelocity - velocity;
165+
166+
if (!lastGrounded && controller.isGrounded) {
167+
//detect hard fall
168+
if ((gravity * Time.deltaTime) - deltaVelocity.y > forceCrouchVelocity) {
169+
forceCrouchEndTime = Time.time + forceCrouchDuration;
189170
hardfallAudioSource.Play();
190-
}
191-
else{
171+
} else {
192172
//play footstep audio if light fall because why not
193173
footstepAudioSource.Play();
194174
}
195175

196-
}
197-
198-
//graphics updates
199-
if (controller.isGrounded)
200-
{
201-
if (crouching) //crouch
202-
{
203-
skeletonAnimation.AnimationName = crouchName;
204-
}
205-
else
206-
{
207-
208-
if (x == 0) //idle
209-
skeletonAnimation.AnimationName = idleName;
210-
else //move
211-
skeletonAnimation.AnimationName = Mathf.Abs(x) > 0.6f ? runName : walkName;
212-
}
213-
}
214-
else
215-
{
216-
if (velocity.y > 0) //jump
217-
skeletonAnimation.AnimationName = jumpName;
218-
else //fall
219-
skeletonAnimation.AnimationName = fallName;
220-
221-
}
176+
}
222177

223-
//flip left or right
224-
if (x > 0)
225-
graphicsRoot.localRotation = Quaternion.identity;
226-
else if (x < 0)
227-
graphicsRoot.localRotation = flippedRotation;
178+
//graphics updates
179+
if (controller.isGrounded) {
180+
if (crouching) { //crouch
181+
skeletonAnimation.AnimationName = crouchName;
182+
} else {
183+
if (x == 0) //idle
184+
skeletonAnimation.AnimationName = idleName;
185+
else //move
186+
skeletonAnimation.AnimationName = Mathf.Abs(x) > 0.6f ? runName : walkName;
187+
}
188+
} else {
189+
if (velocity.y > 0) //jump
190+
skeletonAnimation.AnimationName = jumpName;
191+
else //fall
192+
skeletonAnimation.AnimationName = fallName;
193+
}
228194

195+
//flip left or right
196+
if (x > 0)
197+
graphicsRoot.localRotation = Quaternion.identity;
198+
else if (x < 0)
199+
graphicsRoot.localRotation = flippedRotation;
229200

230-
//store previous state
231-
lastVelocity = velocity;
232-
lastGrounded = controller.isGrounded;
233-
}
201+
202+
//store previous state
203+
lastVelocity = velocity;
204+
lastGrounded = controller.isGrounded;
205+
}
234206
}

‎spine-unity/Assets/Examples/Scripts/ConstrainedCamera.cs

-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@
3939
public class ConstrainedCamera : MonoBehaviour {
4040
public Transform target;
4141
public Vector3 offset;
42-
4342
public Vector3 min;
4443
public Vector3 max;
45-
4644
public float smoothing = 5f;
4745

4846
// Use this for initialization

0 commit comments

Comments
 (0)
Please sign in to comment.