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

This commit is contained in:
badlogic 2019-07-16 18:36:46 +02:00
parent 346a48a4a9
commit a4f92ccf21
14 changed files with 20 additions and 20 deletions

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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