浏览代码

[as3][c][cpp][csharp][libgdx][ts] Fixed SkeletonBinary scale not being applied to some timelines.

closes #1928
Nathan Sweet 4 年之前
父节点
当前提交
0b01c0036e

+ 1 - 1
spine-as3/spine-as3/src/spine/SkeletonBinary.as

@@ -1040,7 +1040,7 @@ package spine {
 					timeline.setStepped(frame);
 					timeline.setStepped(frame);
 					break;
 					break;
 				case CURVE_BEZIER:
 				case CURVE_BEZIER:
-					setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
+					setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
 				}
 				}
 				time = time2;
 				time = time2;
 				value = value2;
 				value = value2;

+ 1 - 1
spine-c/spine-c/src/spine/SkeletonBinary.c

@@ -239,7 +239,7 @@ static spTimeline *readTimeline(_dataInput *input, spCurveTimeline1 *timeline, f
 				spCurveTimeline_setStepped(timeline, frame);
 				spCurveTimeline_setStepped(timeline, frame);
 				break;
 				break;
 			case CURVE_BEZIER:
 			case CURVE_BEZIER:
-				setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, 1);
+				setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, scale);
 		}
 		}
 		time = time2;
 		time = time2;
 		value = value2;
 		value = value2;

+ 1 - 1
spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp

@@ -707,7 +707,7 @@ Timeline *SkeletonBinary::readTimeline(DataInput *input, CurveTimeline1 *timelin
 				timeline->setStepped(frame);
 				timeline->setStepped(frame);
 				break;
 				break;
 			case CURVE_BEZIER:
 			case CURVE_BEZIER:
-				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
+				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
 		}
 		}
 		time = time2;
 		time = time2;
 		value = value2;
 		value = value2;

+ 1 - 1
spine-csharp/src/SkeletonBinary.cs

@@ -1031,7 +1031,7 @@ namespace Spine {
 					timeline.SetStepped(frame);
 					timeline.SetStepped(frame);
 					break;
 					break;
 				case CURVE_BEZIER:
 				case CURVE_BEZIER:
-					SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
+					SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
 						break;
 						break;
 				}
 				}
 				time = time2;
 				time = time2;

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

@@ -1016,7 +1016,7 @@ public class SkeletonBinary extends SkeletonLoader {
 				timeline.setStepped(frame);
 				timeline.setStepped(frame);
 				break;
 				break;
 			case CURVE_BEZIER:
 			case CURVE_BEZIER:
-				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
+				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
 			}
 			}
 			time = time2;
 			time = time2;
 			value = value2;
 			value = value2;

+ 1 - 1
spine-ts/core/src/SkeletonBinary.ts

@@ -1070,7 +1070,7 @@ module spine {
 				timeline.setStepped(frame);
 				timeline.setStepped(frame);
 				break;
 				break;
 			case CURVE_BEZIER:
 			case CURVE_BEZIER:
-				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
+				setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
 			}
 			}
 			time = time2;
 			time = time2;
 			value = value2;
 			value = value2;