UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[as3] Scale IK constraint and timeline data. See #1383.

Browse Source
This commit is contained in:
badlogic 2019-06-20 10:35:39 +02:00
parent 9643a27dce
commit 355097821a
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
spine-as3/spine-as3-example/lib/spine-as3.swc
View File

Binary file not shown.

4
spine-as3/spine-as3/src/spine/SkeletonBinary.as
View File

@ -169,7 +169,7 @@ package spine {
ikData.bones.push(skeletonData.bones[input.readInt(true)]); ikData.bones.push(skeletonData.bones[input.readInt(true)]);
ikData.target = skeletonData.bones[input.readInt(true)]; ikData.target = skeletonData.bones[input.readInt(true)];
ikData.mix = input.readFloat(); ikData.mix = input.readFloat();
ikData.softness = input.readFloat(); ikData.softness = input.readFloat() * scale;
ikData.bendDirection = input.readByte(); ikData.bendDirection = input.readByte();
ikData.compress = input.readBoolean(); ikData.compress = input.readBoolean();
ikData.stretch = input.readBoolean(); ikData.stretch = input.readBoolean();
@ -657,7 +657,7 @@ package spine {
frameIndex = 0; frameIndex = 0;
ikConstraintTimeline.ikConstraintIndex = index; ikConstraintTimeline.ikConstraintIndex = index;
for (frameIndex = 0; frameIndex < frameCount; frameIndex++) { for (frameIndex = 0; frameIndex < frameCount; frameIndex++) {
ikConstraintTimeline.setFrame(frameIndex, input.readFloat(), input.readFloat(), input.readFloat(), input.readByte(), input.readBoolean(), ikConstraintTimeline.setFrame(frameIndex, input.readFloat(), input.readFloat(), input.readFloat() * scale, input.readByte(), input.readBoolean(),
input.readBoolean()); input.readBoolean());
if (frameIndex < frameCount - 1) this.readCurve(input, frameIndex, ikConstraintTimeline); if (frameIndex < frameCount - 1) this.readCurve(input, frameIndex, ikConstraintTimeline);
} }

4
spine-as3/spine-as3/src/spine/SkeletonJson.as
View File

@ -169,7 +169,7 @@ package spine {
ikConstraintData.compress = (constraintMap.hasOwnProperty("compress") && constraintMap["compress"]); ikConstraintData.compress = (constraintMap.hasOwnProperty("compress") && constraintMap["compress"]);
ikConstraintData.stretch = (constraintMap.hasOwnProperty("stretch") && constraintMap["stretch"]); ikConstraintData.stretch = (constraintMap.hasOwnProperty("stretch") && constraintMap["stretch"]);
ikConstraintData.uniform = (constraintMap.hasOwnProperty("uniform") && constraintMap["uniform"]); ikConstraintData.uniform = (constraintMap.hasOwnProperty("uniform") && constraintMap["uniform"]);
ikConstraintData.softness = constraintMap.hasOwnProperty("softness") ? constraintMap["softness"] : 0; ikConstraintData.softness = (constraintMap.hasOwnProperty("softness") ? constraintMap["softness"] : 0) * scale;
ikConstraintData.mix = constraintMap.hasOwnProperty("mix") ? constraintMap["mix"] : 1; ikConstraintData.mix = constraintMap.hasOwnProperty("mix") ? constraintMap["mix"] : 1;
skeletonData.ikConstraints.push(ikConstraintData); skeletonData.ikConstraints.push(ikConstraintData);
@ -589,7 +589,7 @@ package spine {
var bendDirection : int = (!valueMap.hasOwnProperty("bendPositive") || valueMap["bendPositive"]) ? 1 : -1; var bendDirection : int = (!valueMap.hasOwnProperty("bendPositive") || valueMap["bendPositive"]) ? 1 : -1;
var compress : Boolean = (valueMap.hasOwnProperty("compress") && valueMap["compress"]); var compress : Boolean = (valueMap.hasOwnProperty("compress") && valueMap["compress"]);
var stretch : Boolean = (valueMap.hasOwnProperty("stretch") && valueMap["stretch"]); var stretch : Boolean = (valueMap.hasOwnProperty("stretch") && valueMap["stretch"]);
var softness : Number = valueMap.hasOwnProperty("softness") ? valueMap["softness"] : 0; var softness : Number = (valueMap.hasOwnProperty("softness") ? valueMap["softness"] : 0) * scale;
ikTimeline.setFrame(frameIndex, Number(valueMap["time"] || 0), mix, softness, bendDirection, compress, stretch); ikTimeline.setFrame(frameIndex, Number(valueMap["time"] || 0), mix, softness, bendDirection, compress, stretch);
readCurve(valueMap, ikTimeline, frameIndex); readCurve(valueMap, ikTimeline, frameIndex);
frameIndex++; frameIndex++;

BIN
spine-starling/spine-starling-example/lib/spine-as3.swc
View File

Binary file not shown.

BIN
spine-starling/spine-starling/lib/spine-as3.swc
View File

Binary file not shown.