UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
smaren 2014-05-08 12:27:48 +02:00
commit 2a8327d6b1
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-tk2d/Assets/Spine/Editor/SkeletonAnimationInspector.cs
View File

@ -72,5 +72,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
} }
EditorGUILayout.PropertyField(loop); EditorGUILayout.PropertyField(loop);
EditorGUILayout.PropertyField(timeScale);
component.timeScale = Math.Max(component.timeScale, 0);
} }
} }

2
spine-tk2d/Assets/Spine/SkeletonAnimation.cs
View File

@ -81,7 +81,7 @@ public class SkeletonAnimation : SkeletonRenderer {
deltaTime *= timeScale; deltaTime *= timeScale;
skeleton.Update(deltaTime); skeleton.Update(deltaTime);
state.Update(deltaTime * timeScale); state.Update(deltaTime);
state.Apply(skeleton); state.Apply(skeleton);
if (UpdateBones != null) UpdateBones(this); if (UpdateBones != null) UpdateBones(this);
skeleton.UpdateWorldTransform(); skeleton.UpdateWorldTransform();

2
spine-unity/Assets/Spine/Editor/SkeletonAnimationInspector.cs
View File

@ -72,5 +72,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
} }
EditorGUILayout.PropertyField(loop); EditorGUILayout.PropertyField(loop);
EditorGUILayout.PropertyField(timeScale);
component.timeScale = Math.Max(component.timeScale, 0);
} }
} }

2
spine-unity/Assets/Spine/SkeletonAnimation.cs
View File

@ -81,7 +81,7 @@ public class SkeletonAnimation : SkeletonRenderer {
deltaTime *= timeScale; deltaTime *= timeScale;
skeleton.Update(deltaTime); skeleton.Update(deltaTime);
state.Update(deltaTime * timeScale); state.Update(deltaTime);
state.Apply(skeleton); state.Apply(skeleton);
if (UpdateBones != null) UpdateBones(this); if (UpdateBones != null) UpdateBones(this);
skeleton.UpdateWorldTransform(); skeleton.UpdateWorldTransform();