Pārlūkot izejas kodu

[libgdx] Fixed AlphaTimeline and loading RGB timelines in skeleton data.

Nathan Sweet 4 gadi atpakaļ
vecāks
revīzija
391917d37b

+ 2 - 6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java

@@ -1294,14 +1294,10 @@ public class Animation {
 				Color color = slot.color, setup = slot.data.color;
 				Color color = slot.color, setup = slot.data.color;
 				switch (blend) {
 				switch (blend) {
 				case setup:
 				case setup:
-					color.r = setup.r;
-					color.g = setup.g;
-					color.b = setup.b;
+					color.a = setup.a;
 					return;
 					return;
 				case first:
 				case first:
-					color.r += (setup.r - color.r) * alpha;
-					color.g += (setup.g - color.g) * alpha;
-					color.b += (setup.b - color.b) * alpha;
+					color.a += (setup.a - color.a) * alpha;
 				}
 				}
 				return;
 				return;
 			}
 			}

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

@@ -704,9 +704,9 @@ public class SkeletonBinary extends SkeletonLoader {
 							setBezier(input, timeline, bezier++, frame, 0, time, time2, r, nr, 1);
 							setBezier(input, timeline, bezier++, frame, 0, time, time2, r, nr, 1);
 							setBezier(input, timeline, bezier++, frame, 1, time, time2, g, ng, 1);
 							setBezier(input, timeline, bezier++, frame, 1, time, time2, g, ng, 1);
 							setBezier(input, timeline, bezier++, frame, 2, time, time2, b, nb, 1);
 							setBezier(input, timeline, bezier++, frame, 2, time, time2, b, nb, 1);
-							setBezier(input, timeline, bezier++, frame, 4, time, time2, r2, nr2, 1);
-							setBezier(input, timeline, bezier++, frame, 5, time, time2, g2, ng2, 1);
-							setBezier(input, timeline, bezier++, frame, 6, time, time2, b2, nb2, 1);
+							setBezier(input, timeline, bezier++, frame, 3, time, time2, r2, nr2, 1);
+							setBezier(input, timeline, bezier++, frame, 4, time, time2, g2, ng2, 1);
+							setBezier(input, timeline, bezier++, frame, 5, time, time2, b2, nb2, 1);
 						}
 						}
 						time = time2;
 						time = time2;
 						r = nr;
 						r = nr;

+ 3 - 3
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java

@@ -666,9 +666,9 @@ public class SkeletonJson extends SkeletonLoader {
 							bezier = readCurve(curve, timeline, bezier, frame, 0, time, time2, r, nr, 1);
 							bezier = readCurve(curve, timeline, bezier, frame, 0, time, time2, r, nr, 1);
 							bezier = readCurve(curve, timeline, bezier, frame, 1, time, time2, g, ng, 1);
 							bezier = readCurve(curve, timeline, bezier, frame, 1, time, time2, g, ng, 1);
 							bezier = readCurve(curve, timeline, bezier, frame, 2, time, time2, b, nb, 1);
 							bezier = readCurve(curve, timeline, bezier, frame, 2, time, time2, b, nb, 1);
-							bezier = readCurve(curve, timeline, bezier, frame, 4, time, time2, r2, nr2, 1);
-							bezier = readCurve(curve, timeline, bezier, frame, 5, time, time2, g2, ng2, 1);
-							bezier = readCurve(curve, timeline, bezier, frame, 6, time, time2, b2, nb2, 1);
+							bezier = readCurve(curve, timeline, bezier, frame, 3, time, time2, r2, nr2, 1);
+							bezier = readCurve(curve, timeline, bezier, frame, 4, time, time2, g2, ng2, 1);
+							bezier = readCurve(curve, timeline, bezier, frame, 5, time, time2, b2, nb2, 1);
 						}
 						}
 						time = time2;
 						time = time2;
 						r = nr;
 						r = nr;