Browse Source

[ts] Fixed resolving transform and path constraints when loading skin bones and constraints.

badlogic 6 years ago
parent
commit
a4f92ccf21

BIN
examples/mix-and-match/mix-and-match-pro.spine


+ 2 - 2
spine-ts/build/spine-all.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 2 - 2
spine-ts/build/spine-canvas.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 2 - 2
spine-ts/build/spine-core.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 2 - 2
spine-ts/build/spine-player.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 2 - 2
spine-ts/build/spine-threejs.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 2 - 2
spine-ts/build/spine-webgl.js

@@ -5635,7 +5635,7 @@ var spine;
 					}
 					if (skinMap.transform) {
 						for (var ii = 0; ii < skinMap.transform.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							var constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null)
 								throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
@@ -5643,7 +5643,7 @@ var spine;
 					}
 					if (skinMap.path) {
 						for (var ii = 0; ii < skinMap.path.length; ii++) {
-							var constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							var constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null)
 								throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 2 - 2
spine-ts/core/src/SkeletonJson.ts

@@ -232,7 +232,7 @@ module spine {
 
 					if (skinMap.transform) {
 						for (let ii = 0; ii < skinMap.transform.length; ii++) {
-							let constraint = skeletonData.findIkConstraint(skinMap.transform[ii]);
+							let constraint = skeletonData.findTransformConstraint(skinMap.transform[ii]);
 							if (constraint == null) throw new Error("Skin transform constraint not found: " + skinMap.transform[i]);
 							skin.constraints.push(constraint);
 						}
@@ -240,7 +240,7 @@ module spine {
 
 					if (skinMap.path) {
 						for (let ii = 0; ii < skinMap.path.length; ii++) {
-							let constraint = skeletonData.findIkConstraint(skinMap.path[ii]);
+							let constraint = skeletonData.findPathConstraint(skinMap.path[ii]);
 							if (constraint == null) throw new Error("Skin path constraint not found: " + skinMap.path[i]);
 							skin.constraints.push(constraint);
 						}

Some files were not shown because too many files changed in this diff