Эх сурвалжийг харах

[libgdx] Physics timeline skeleton scale fixes.

Nathan Sweet 1 жил өмнө
parent
commit
a70fb6c521

+ 2 - 2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java

@@ -1004,10 +1004,10 @@ public class SkeletonBinary extends SkeletonLoader {
 					readTimeline(input, timelines, new PhysicsConstraintMassTimeline(frameCount, bezierCount, index), 1);
 					break;
 				case PHYSICS_WIND:
-					readTimeline(input, timelines, new PhysicsConstraintWindTimeline(frameCount, bezierCount, index), scale);
+					readTimeline(input, timelines, new PhysicsConstraintWindTimeline(frameCount, bezierCount, index), 1);
 					break;
 				case PHYSICS_GRAVITY:
-					readTimeline(input, timelines, new PhysicsConstraintGravityTimeline(frameCount, bezierCount, index), scale);
+					readTimeline(input, timelines, new PhysicsConstraintGravityTimeline(frameCount, bezierCount, index), 1);
 					break;
 				case PHYSICS_MIX:
 					readTimeline(input, timelines, new PhysicsConstraintMixTimeline(frameCount, bezierCount, index), 1);

+ 4 - 7
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java

@@ -966,7 +966,6 @@ public class SkeletonJson extends SkeletonLoader {
 				}
 
 				CurveTimeline1 timeline;
-				float timelineScale = 1.0f;
 				if (timelineName.equals("inertia"))
 					timeline = new PhysicsConstraintInertiaTimeline(frames, frames, index);
 				else if (timelineName.equals("strength"))
@@ -975,17 +974,15 @@ public class SkeletonJson extends SkeletonLoader {
 					timeline = new PhysicsConstraintDampingTimeline(frames, frames, index);
 				else if (timelineName.equals("mass"))
 					timeline = new PhysicsConstraintMassTimeline(frames, frames, index);
-				else if (timelineName.equals("wind")) {
+				else if (timelineName.equals("wind"))
 					timeline = new PhysicsConstraintWindTimeline(frames, frames, index);
-					timelineScale = scale;
-				} else if (timelineName.equals("gravity")) {
+				else if (timelineName.equals("gravity"))
 					timeline = new PhysicsConstraintGravityTimeline(frames, frames, index);
-					timelineScale = scale;
-				} else if (timelineName.equals("mix")) //
+				else if (timelineName.equals("mix"))
 					timeline = new PhysicsConstraintMixTimeline(frames, frames, index);
 				else
 					continue;
-				timelines.add(readTimeline(keyMap, timeline, 0, timelineScale));
+				timelines.add(readTimeline(keyMap, timeline, 0, 1));
 			}
 		}