Преглед на файлове

[ts] Fix up for compression IK timeline keys.

badlogic преди 7 години
родител
ревизия
d079555f84
променени са 3 файла, в които са добавени 16 реда и са изтрити 0 реда
  1. 8 0
      spine-ts/build/spine-webgl.js
  2. 0 0
      spine-ts/build/spine-webgl.js.map
  3. 8 0
      spine-ts/core/src/Animation.ts

+ 8 - 0
spine-ts/build/spine-webgl.js

@@ -981,11 +981,13 @@ var spine;
                     case MixBlend.setup:
                         constraint.mix = constraint.data.mix;
                         constraint.bendDirection = constraint.data.bendDirection;
+                        constraint.compress = constraint.data.compress;
                         constraint.stretch = constraint.data.stretch;
                         return;
                     case MixBlend.first:
                         constraint.mix += (constraint.data.mix - constraint.mix) * alpha;
                         constraint.bendDirection = constraint.data.bendDirection;
+                        constraint.compress = constraint.data.compress;
                         constraint.stretch = constraint.data.stretch;
                 }
                 return;
@@ -995,10 +997,12 @@ var spine;
                     constraint.mix = constraint.data.mix + (frames[frames.length + IkConstraintTimeline.PREV_MIX] - constraint.data.mix) * alpha;
                     if (direction == MixDirection.out) {
                         constraint.bendDirection = constraint.data.bendDirection;
+                        constraint.compress = constraint.data.compress;
                         constraint.stretch = constraint.data.stretch;
                     }
                     else {
                         constraint.bendDirection = frames[frames.length + IkConstraintTimeline.PREV_BEND_DIRECTION];
+                        constraint.compress = frames[frames.length + IkConstraintTimeline.PREV_COMPRESS] != 0;
                         constraint.stretch = frames[frames.length + IkConstraintTimeline.PREV_STRETCH] != 0;
                     }
                 }
@@ -1006,6 +1010,7 @@ var spine;
                     constraint.mix += (frames[frames.length + IkConstraintTimeline.PREV_MIX] - constraint.mix) * alpha;
                     if (direction == MixDirection["in"]) {
                         constraint.bendDirection = frames[frames.length + IkConstraintTimeline.PREV_BEND_DIRECTION];
+                        constraint.compress = frames[frames.length + IkConstraintTimeline.PREV_COMPRESS] != 0;
                         constraint.stretch = frames[frames.length + IkConstraintTimeline.PREV_STRETCH] != 0;
                     }
                 }
@@ -1019,10 +1024,12 @@ var spine;
                 constraint.mix = constraint.data.mix + (mix + (frames[frame + IkConstraintTimeline.MIX] - mix) * percent - constraint.data.mix) * alpha;
                 if (direction == MixDirection.out) {
                     constraint.bendDirection = constraint.data.bendDirection;
+                    constraint.compress = constraint.data.compress;
                     constraint.stretch = constraint.data.stretch;
                 }
                 else {
                     constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
+                    constraint.compress = frames[frame + IkConstraintTimeline.PREV_COMPRESS] != 0;
                     constraint.stretch = frames[frame + IkConstraintTimeline.PREV_STRETCH] != 0;
                 }
             }
@@ -1030,6 +1037,7 @@ var spine;
                 constraint.mix += (mix + (frames[frame + IkConstraintTimeline.MIX] - mix) * percent - constraint.mix) * alpha;
                 if (direction == MixDirection["in"]) {
                     constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
+                    constraint.compress = frames[frame + IkConstraintTimeline.PREV_COMPRESS] != 0;
                     constraint.stretch = frames[frame + IkConstraintTimeline.PREV_STRETCH] != 0;
                 }
             }

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 8 - 0
spine-ts/core/src/Animation.ts

@@ -1071,11 +1071,13 @@ module spine {
 				case MixBlend.setup:
 					constraint.mix = constraint.data.mix;
 					constraint.bendDirection = constraint.data.bendDirection;
+					constraint.compress = constraint.data.compress;
 					constraint.stretch = constraint.data.stretch;
 					return;
 				case MixBlend.first:
 					constraint.mix += (constraint.data.mix - constraint.mix) * alpha;
 					constraint.bendDirection = constraint.data.bendDirection;
+					constraint.compress = constraint.data.compress;
 					constraint.stretch = constraint.data.stretch;
 				}
 				return;
@@ -1086,15 +1088,18 @@ module spine {
 					constraint.mix = constraint.data.mix + (frames[frames.length + IkConstraintTimeline.PREV_MIX] - constraint.data.mix) * alpha;
 					if (direction == MixDirection.out) {
 						constraint.bendDirection = constraint.data.bendDirection;
+						constraint.compress = constraint.data.compress;
 						constraint.stretch = constraint.data.stretch;
 					} else {
 						constraint.bendDirection = frames[frames.length + IkConstraintTimeline.PREV_BEND_DIRECTION]
+						constraint.compress = frames[frames.length + IkConstraintTimeline.PREV_COMPRESS] != 0;
 						constraint.stretch = frames[frames.length + IkConstraintTimeline.PREV_STRETCH] != 0;
 					}
 				} else {
 					constraint.mix += (frames[frames.length + IkConstraintTimeline.PREV_MIX] - constraint.mix) * alpha;
 					if (direction == MixDirection.in) {
 						constraint.bendDirection = frames[frames.length + IkConstraintTimeline.PREV_BEND_DIRECTION];
+						constraint.compress = frames[frames.length + IkConstraintTimeline.PREV_COMPRESS] != 0;
 						constraint.stretch = frames[frames.length + IkConstraintTimeline.PREV_STRETCH] != 0;
 					}
 				}
@@ -1112,15 +1117,18 @@ module spine {
 				constraint.mix = constraint.data.mix + (mix + (frames[frame + IkConstraintTimeline.MIX] - mix) * percent - constraint.data.mix) * alpha;
 				if (direction == MixDirection.out) {
 					constraint.bendDirection = constraint.data.bendDirection;
+					constraint.compress = constraint.data.compress;
 					constraint.stretch = constraint.data.stretch;
 				} else {
 					constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
+					constraint.compress = frames[frame + IkConstraintTimeline.PREV_COMPRESS] != 0;
 					constraint.stretch = frames[frame + IkConstraintTimeline.PREV_STRETCH] != 0;
 				}
 			} else {
 				constraint.mix += (mix + (frames[frame + IkConstraintTimeline.MIX] - mix) * percent - constraint.mix) * alpha;
 				if (direction == MixDirection.in) {
 					constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
+					constraint.compress = frames[frame + IkConstraintTimeline.PREV_COMPRESS] != 0;
 					constraint.stretch = frames[frame + IkConstraintTimeline.PREV_STRETCH] != 0;
 				}
 			}

Някои файлове не бяха показани, защото твърде много файлове са промени