mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-20 17:26:01 +08:00
[as3] Scale IK constraint and timeline data. See #1383.
This commit is contained in:
parent
9643a27dce
commit
355097821a
Binary file not shown.
@ -169,7 +169,7 @@ package spine {
|
||||
ikData.bones.push(skeletonData.bones[input.readInt(true)]);
|
||||
ikData.target = skeletonData.bones[input.readInt(true)];
|
||||
ikData.mix = input.readFloat();
|
||||
ikData.softness = input.readFloat();
|
||||
ikData.softness = input.readFloat() * scale;
|
||||
ikData.bendDirection = input.readByte();
|
||||
ikData.compress = input.readBoolean();
|
||||
ikData.stretch = input.readBoolean();
|
||||
@ -657,7 +657,7 @@ package spine {
|
||||
frameIndex = 0;
|
||||
ikConstraintTimeline.ikConstraintIndex = index;
|
||||
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());
|
||||
if (frameIndex < frameCount - 1) this.readCurve(input, frameIndex, ikConstraintTimeline);
|
||||
}
|
||||
|
||||
@ -169,7 +169,7 @@ package spine {
|
||||
ikConstraintData.compress = (constraintMap.hasOwnProperty("compress") && constraintMap["compress"]);
|
||||
ikConstraintData.stretch = (constraintMap.hasOwnProperty("stretch") && constraintMap["stretch"]);
|
||||
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;
|
||||
|
||||
skeletonData.ikConstraints.push(ikConstraintData);
|
||||
@ -589,7 +589,7 @@ package spine {
|
||||
var bendDirection : int = (!valueMap.hasOwnProperty("bendPositive") || valueMap["bendPositive"]) ? 1 : -1;
|
||||
var compress : Boolean = (valueMap.hasOwnProperty("compress") && valueMap["compress"]);
|
||||
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);
|
||||
readCurve(valueMap, ikTimeline, frameIndex);
|
||||
frameIndex++;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user