Skip to content

Commit dca79e4

Browse files
committed
[ts] Fix SkeletonBinary read sequence. Fix Animation ScaleYTimeline.
1 parent 9b5dcda commit dca79e4

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

spine-ts/spine-core/src/Animation.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ export class ScaleYTimeline extends CurveTimeline1 implements BoneTimeline {
708708

709709
apply (skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection) {
710710
let bone = skeleton.bones[this.boneIndex];
711-
if (bone.active) bone.scaleY = this.getScaleValue(time, alpha, blend, direction, bone.scaleX, bone.data.scaleY);
711+
if (bone.active) bone.scaleY = this.getScaleValue(time, alpha, blend, direction, bone.scaleY, bone.data.scaleY);
712712
}
713713
}
714714

@@ -1694,7 +1694,7 @@ export class DrawOrderTimeline extends Timeline {
16941694
/** Changes an IK constraint's {@link IkConstraint#mix}, {@link IkConstraint#softness},
16951695
* {@link IkConstraint#bendDirection}, {@link IkConstraint#stretch}, and {@link IkConstraint#compress}. */
16961696
export class IkConstraintTimeline extends CurveTimeline {
1697-
/** The index of the IK constraint in {@link Skeleton#getIkConstraints()} that will be changed when this timeline is */
1697+
/** The index of the IK constraint in {@link Skeleton#getIkConstraints()} that will be changed when this timeline is applied */
16981698
constraintIndex: number = 0;
16991699

17001700
constructor (frameCount: number, bezierCount: number, ikConstraintIndex: number) {

spine-ts/spine-core/src/SkeletonBinary.ts

-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ export class SkeletonBinary {
531531
}
532532

533533
private readSequence (input: BinaryInput) {
534-
if (!input.readBoolean()) return null;
535534
let sequence = new Sequence(input.readInt(true));
536535
sequence.start = input.readInt(true);
537536
sequence.digits = input.readInt(true);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ export class SkeletonJson {
246246
}
247247
}
248248

249+
// Physics constraints.
249250
if (root.physics) {
250-
// Physics constraints.
251251
for (let i = 0; i < root.physics.length; i++) {
252252
const constraintMap = root.physics[i];
253253
const data = new PhysicsConstraintData(constraintMap.name);

0 commit comments

Comments
 (0)