[ts] Undo fixup in TextureAtlas. The change prevented multi-page atlas parsing from working due to !""==null in JS.

This commit is contained in:
Mario Zechner 2021-06-07 13:27:47 +02:00
parent d856ece2f2
commit c76cdccf88
19 changed files with 3819 additions and 5061 deletions

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ declare module spine {
timelineIds: StringSet; timelineIds: StringSet;
duration: number; duration: number;
constructor(name: string, timelines: Array<Timeline>, duration: number); constructor(name: string, timelines: Array<Timeline>, duration: number);
setTimelines(timelines: Array<Timeline>): void;
hasTimeline(ids: string[]): boolean; hasTimeline(ids: string[]): boolean;
apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
@ -27,8 +28,8 @@ declare module spine {
getFrameCount(): number; getFrameCount(): number;
getDuration(): number; getDuration(): number;
abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
static search(frames: ArrayLike<number>, time: number): number; static search1(frames: ArrayLike<number>, time: number): number;
static search2(values: ArrayLike<number>, time: number, step: number): number; static search(frames: ArrayLike<number>, time: number, step: number): number;
} }
interface BoneTimeline { interface BoneTimeline {
boneIndex: number; boneIndex: number;
@ -46,18 +47,13 @@ declare module spine {
getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number; getBezierValue(time: number, frameIndex: number, valueOffset: number, i: number): number;
} }
abstract class CurveTimeline1 extends CurveTimeline { abstract class CurveTimeline1 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId: string);
static VALUE: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value: number): void; setFrame(frame: number, time: number, value: number): void;
getCurveValue(time: number): number; getCurveValue(time: number): number;
} }
abstract class CurveTimeline2 extends CurveTimeline { abstract class CurveTimeline2 extends CurveTimeline {
static ENTRIES: number; constructor(frameCount: number, bezierCount: number, propertyId1: string, propertyId2: string);
static VALUE1: number;
static VALUE2: number;
constructor(frameCount: number, bezierCount: number, propertyIds: string[]);
getFrameEntries(): number; getFrameEntries(): number;
setFrame(frame: number, time: number, value1: number, value2: number): void; setFrame(frame: number, time: number, value1: number, value2: number): void;
} }
@ -112,11 +108,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBATimeline extends CurveTimeline implements SlotTimeline { class RGBATimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -124,10 +115,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBTimeline extends CurveTimeline implements SlotTimeline { class RGBTimeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -140,14 +127,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGBA2Timeline extends CurveTimeline implements SlotTimeline { class RGBA2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static A: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -155,13 +134,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class RGB2Timeline extends CurveTimeline implements SlotTimeline { class RGB2Timeline extends CurveTimeline implements SlotTimeline {
static ENTRIES: number;
static R: number;
static G: number;
static B: number;
static R2: number;
static G2: number;
static B2: number;
slotIndex: number; slotIndex: number;
constructor(frameCount: number, bezierCount: number, slotIndex: number); constructor(frameCount: number, bezierCount: number, slotIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -205,12 +177,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class IkConstraintTimeline extends CurveTimeline { class IkConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static MIX: number;
static SOFTNESS: number;
static BEND_DIRECTION: number;
static COMPRESS: number;
static STRETCH: number;
ikConstraintIndex: number; ikConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number); constructor(frameCount: number, bezierCount: number, ikConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -218,13 +184,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class TransformConstraintTimeline extends CurveTimeline { class TransformConstraintTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
static SCALEX: number;
static SCALEY: number;
static SHEARY: number;
transformConstraintIndex: number; transformConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number); constructor(frameCount: number, bezierCount: number, transformConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -242,10 +201,6 @@ declare module spine {
apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void; apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
} }
class PathConstraintMixTimeline extends CurveTimeline { class PathConstraintMixTimeline extends CurveTimeline {
static ENTRIES: number;
static ROTATE: number;
static X: number;
static Y: number;
pathConstraintIndex: number; pathConstraintIndex: number;
constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number); constructor(frameCount: number, bezierCount: number, pathConstraintIndex: number);
getFrameEntries(): number; getFrameEntries(): number;
@ -273,7 +228,7 @@ declare module spine {
applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number; applyMixingFrom(to: TrackEntry, skeleton: Skeleton, blend: MixBlend): number;
applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void; applyAttachmentTimeline(timeline: AttachmentTimeline, skeleton: Skeleton, time: number, blend: MixBlend, attachments: boolean): void;
setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void; setAttachment(skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean): void;
applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void; applyRotateTimeline(timeline: RotateTimeline, skeleton: Skeleton, time: number, alpha: number, blend: MixBlend, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
queueEvents(entry: TrackEntry, animationTime: number): void; queueEvents(entry: TrackEntry, animationTime: number): void;
clearTracks(): void; clearTracks(): void;
clearTrack(trackIndex: number): void; clearTrack(trackIndex: number): void;
@ -779,7 +734,6 @@ declare module spine {
findIkConstraint(constraintName: string): IkConstraintData; findIkConstraint(constraintName: string): IkConstraintData;
findTransformConstraint(constraintName: string): TransformConstraintData; findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData; findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
} }
} }
declare module spine { declare module spine {
@ -924,7 +878,6 @@ declare module spine {
x: number; x: number;
y: number; y: number;
index: number; index: number;
rotate: boolean;
degrees: number; degrees: number;
texture: Texture; texture: Texture;
names: string[]; names: string[];

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -119,8 +119,7 @@ module spine {
let names: string[] = null; let names: string[] = null;
let values: number[][] = null; let values: number[][] = null;
while (true) { while (true) {
if (line === null) break;
if (!line) break;
if (line.trim().length == 0) { if (line.trim().length == 0) {
page = null; page = null;
line = reader.readLine(); line = reader.readLine();