From 2e1a0d887421e610f6290884487e149914236c3a Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Thu, 11 Dec 2014 17:43:43 +0000 Subject: [PATCH 01/12] - start updating the easeljs definitions, for the 0.8 release --- easeljs/easeljs.d.ts | 240 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 226 insertions(+), 14 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 08378828a..e55213729 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -68,6 +68,8 @@ declare module createjs { export class BitmapText extends DisplayObject { constructor(text?:string, spriteSheet?:SpriteSheet); + static maxPoolSize: number; + // properties letterSpacing: number; lineHeight: number; @@ -102,6 +104,7 @@ declare module createjs { overLabel: any; // String or Number play: boolean; target: DisplayObject; // MovieClip or Sprite + enabled: boolean; // methods setEnabled(value: boolean): void; @@ -137,9 +140,10 @@ declare module createjs { clone(): ColorMatrix; concat(...matrix: number[]): ColorMatrix; concat(matrix: ColorMatrix): ColorMatrix; - copyMatrix(...matrix: number[]): ColorMatrix; - copyMatrix(matrix: ColorMatrix): ColorMatrix; + copy(...matrix: number[]): ColorMatrix; + copy(matrix: ColorMatrix): ColorMatrix; reset(): ColorMatrix; + setColor( brightness: number, contrast: number, saturation: number, hue: number ): ColorMatrix; toArray(): number[]; toString(): string; } @@ -148,6 +152,9 @@ declare module createjs { constructor(matrix: number[]); constructor(matrix: ColorMatrix); + // properties + matrix: ColorMatrix; // or array + // methods clone(): ColorMatrixFilter; } @@ -164,6 +171,7 @@ declare module createjs { // properties children: DisplayObject[]; mouseChildren: boolean; + numChildren: number; tickChildren: boolean; // methods @@ -175,7 +183,7 @@ declare module createjs { getChildAt(index: number): DisplayObject; getChildByName(name: string): DisplayObject; getChildIndex(child: DisplayObject): number; - getNumChildren(): number; + getNumChildren(): number; // deprecated - use numChildren property instead. getObjectsUnderPoint(x: number, y: number): DisplayObject[]; getObjectUnderPoint(x: number, y: number): DisplayObject; removeAllChildren(): void; @@ -217,8 +225,10 @@ declare module createjs { * @deprecated */ snapToPixel: boolean; + stage: Stage; static suppressCrossDomainErrors: boolean; tickEnabled: boolean; + transformMatrix: Matrix2D; visible: boolean; x: number; y: number; @@ -229,9 +239,10 @@ declare module createjs { draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getBounds(): Rectangle; getCacheDataURL(): string; + getConcatenatedDisplayProps(props?: DisplayProps): DisplayProps; getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D; getMatrix(matrix?: Matrix2D): Matrix2D; - getStage(): Stage; + getStage(): Stage; // deprecated getTransformedBounds(): Rectangle; globalToLocal(x: number, y: number): Point; hitTest(x: number, y: number): boolean; @@ -247,6 +258,25 @@ declare module createjs { } + export class DisplayProps { + constructor(visible?: number, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number); + + // properties + alpha: number; + compositeOperation: string; + matrix: Matrix2D; + shadow: Shadow; + visible: boolean; + + // methods + append(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps; + clone(): DisplayProps; + identity(): DisplayProps; + prepend(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps; + setValues(visible?: boolean, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number): DisplayProps; + } + + export class DOMElement extends DisplayObject { constructor(htmlElement: HTMLElement); @@ -279,13 +309,33 @@ declare module createjs { export class Graphics { constructor(); + // Graphics commands + static Arc: GraphicsArc; + static ArcTo: GraphicsArcTo; + static BeginPath: GraphicsBeginPath; + static BezierCurveTo: GraphicsBezierCurveTo; + static Circle: GraphicsCircle; + static ClosePath: GraphicsClosePath; + static Fill: GraphicsFill; + static LineTo: GraphicsLineTo; + static MoveTo: GraphicsMoveTo; + static PolyStar: GraphicsPolyStar; + static QuadraticCurveTo: GraphicsQuadraticCurveTo; + static Rect: GraphicsRect; + static RoundRect: GraphicsRoundRect; + static Stroke: GraphicsStroke; + static StrokeStyle: GraphicsStrokeStyle; + // properties static BASE_64: Object; - static Command: any; + static beginCmd: GraphicsBeginPath; + command: Object; + instructions: Object[]; // array of graphics command objects (Graphics.Fill, etc) static STROKE_CAPS_MAP: string[]; static STROKE_JOINTS_MAP: string[]; // methods + append(command: Object, clean: boolean): Graphics; arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics; arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics; beginBitmapFill(image: Object, repetition?: string, matrix?: Matrix2D): Graphics; @@ -300,7 +350,7 @@ declare module createjs { clear(): Graphics; clone(): Graphics; closePath(): Graphics; - curveTo (cpx: number, cpy: number, x: number, y: number): Graphics; + curveTo(cpx: number, cpy: number, x: number, y: number): Graphics; decodePath(str: string): Graphics; draw(ctx: CanvasRenderingContext2D): void; drawAsPath(ctx: CanvasRenderingContext2D): void; @@ -314,7 +364,7 @@ declare module createjs { endStroke(): Graphics; static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string; static getRGB(r: number, g: number, b: number, alpha?: number): string; - inject(callback: (data: any) => any, data: any): Graphics; + inject(callback: (data: any) => any, data: any): Graphics; // deprecated isEmpty(): boolean; lineTo(x: number, y: number): Graphics; moveTo(x: number, y: number): Graphics; @@ -324,7 +374,9 @@ declare module createjs { setStrokeStyle(thickness: number, caps?: number, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; setStrokeStyle(thickness: number, caps?: string, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; setStrokeStyle(thickness: number, caps?: number, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; + store(): Graphics; toString(): string; + unstore(): Graphics; // tiny API - short forms of methods above @@ -360,42 +412,202 @@ declare module createjs { ss(thickness: number, caps?: number, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; } + + export class GraphicsArc + { + constructor(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: number); + + // properties + anticlockwise: number; + endAngle: number; + radius: number; + startAngle: number; + x: number; + y: number; + } + + export class GraphicsArcTo + { + constructor(x1: number, y1: number, x2: number, y2: number, radius: number); + + // properties + x1: number; + y1: number; + x2: number; + y2: number; + radius: number; + } + + export class GraphicsBeginPath + { + + } + + export class GraphicsBezierCurveTo + { + constructor(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number); + + // properties + cp1x: number; + cp1y: number; + cp2x: number; + cp2y: number; + x: number; + y: number; + } + + export class GraphicsCircle + { + constructor(x: number, y: number, radius: number); + + // properties + x: number; + y: number; + radius: number; + } + + export class GraphicsClosePath + { + + } + + export class GraphicsFill + { + constructor(style: Object, matrix: Matrix2D); + + // properties + style: Object; + matrix: Matrix2D; + + // methods + bitmap(image: HTMLImageElement, repetition?: string): GraphicsFill; + linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): GraphicsFill; + radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): GraphicsFill; + } + + export class GraphicsLineTo + { + constructor(x: number, y: number); + + // properties + x: number; + y: number; + } + + export class GraphicsMoveTo + { + constructor(x: number, y: number); + + x: number; + y: number; + } + + export class GraphicsPolyStar + { + constructor(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number); + + // properties + angle: number; + pointSize: number; + radius: number; + sides: number; + x: number; + y: number; + } + + export class GraphicsQuadraticCurveTo + { + constructor(cpx: number, cpy: number, x: number, y: number); + + // properties + cpx: number; + cpy: number; + x: number; + y: number; + } + + export class GraphicsRect + { + constructor(x: number, y: number, w: number, h: number); + + // properties + x: number; + y: number; + w: number; + h: number; + } + + export class GraphicsRoundRect + { + constructor(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radiusBL: number); + + // properties + x: number; + y: number; + w: number; + h: number; + radiusTL: number; + radiusTR: number; + radiusBR: number; + radiusBL: number; + } + + export class GraphicsStroke + { + constructor(style: Object, ignoreScale: boolean); + + // properties + style: Object; + ignoreScale: boolean; + + // methods + bitmap(image: HTMLImageElement, repetition?: string): GraphicsStroke; + linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): GraphicsStroke; + radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): GraphicsStroke; + } + + export class GraphicsStrokeStyle + { + constructor(width: number, caps: string, joints: number, miterLimit: number); + + // properties + caps: string; + joints: string; + miterLimit: number; + width: number; + } + export class Matrix2D { constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number); // properties a: number; - alpha: number; b: number; c: number; - compositeOperation: string; d: number; static DEG_TO_RAD: number; static identity: Matrix2D; - shadow: Shadow; tx: number; ty: number; // methods append(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D; appendMatrix(matrix: Matrix2D): Matrix2D; - appendProperties(alpha: number, shadow: Shadow, compositeOperation: string): Matrix2D; appendTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D; clone(): Matrix2D; copy(matrix: Matrix2D): Matrix2D; decompose(): {x: number; y: number; scaleX: number; scaleY: number; rotation: number; skewX: number; skewY: number}; decompose(target: Object): Matrix2D; + equals(matrix: Matrix2D): boolean; identity(): Matrix2D; - initialize(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D; invert(): Matrix2D; isIdentity(): boolean; prepend(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D; prependMatrix(matrix: Matrix2D): Matrix2D; - prependProperties(alpha: number, shadow: Shadow, compositeOperation: string): Matrix2D; prependTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D; - reinitialize(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number, alpha?: number, shadow?: Shadow, compositeOperation?: string): Matrix2D; rotate(angle: number): Matrix2D; scale(x: number, y: number): Matrix2D; + setValues(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D; skew(skewX: number, skewY: number): Matrix2D; toString(): string; transformPoint(x: number, y: number, pt?: Point): Point; From 4af0cd55b05f785d7ddc20e8c6497e97d21ac5d9 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Thu, 11 Dec 2014 18:37:57 +0000 Subject: [PATCH 02/12] - complete the update of easeljs v0.8 --- easeljs/easeljs.d.ts | 65 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index e55213729..3c07efb2e 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -670,8 +670,11 @@ declare module createjs { autoReset: boolean; static buildDate: string; currentFrame: number; + currentLabel: string; frameBounds: Rectangle[]; + framerate: number; static INDEPENDENT: string; + labels: Object[]; loop: boolean; mode: string; paused: boolean; @@ -682,9 +685,10 @@ declare module createjs { static version: string; // methods + advance(time?: number); clone(): MovieClip; // not supported - getCurrentLabel(): string; - getLabels(): Object[]; + getCurrentLabel(): string; // deprecated + getLabels(): Object[]; // deprecated gotoAndPlay(positionOrLabel: string): void; gotoAndPlay(positionOrLabel: number): void; gotoAndStop(positionOrLabel: string): void; @@ -710,7 +714,7 @@ declare module createjs { // methods clone(): Point; copy(point: Point): Point; - initialize (x?: number, y?: number): Point; + setValues(x?: number, y?: number): Point; toString(): string; } @@ -725,9 +729,15 @@ declare module createjs { // methods clone(): Rectangle; + contains(x: number, y: number, width?: number, height?: number): boolean; copy(rectangle: Rectangle): Rectangle; - initialize(x?: number, y?: number, width?: number, height?: number): Rectangle; + extend(x: number, y: number, width?: number, height?: number): Rectangle; + intersection(rect: Rectangle): Rectangle; + intersects(rect: Rectangle): boolean; + isEmpty(): boolean; + setValues(x?: number, y?: number, width?: number, height?: number): Rectangle; toString(): string; + union(rect: Rectangle): Rectangle; } @@ -791,6 +801,13 @@ declare module createjs { } + export class SpriteContainer extends Container + { + constructor(spriteSheet?: SpriteSheet); + + spriteSheet: SpriteSheet; + } + // what is returned from SpriteSheet.getAnimation(string) interface SpriteSheetAnimation { frames: number[]; @@ -809,6 +826,7 @@ declare module createjs { constructor(data: Object); // properties + animations: string[]; complete: boolean; framerate: number; @@ -842,8 +860,6 @@ declare module createjs { buildAsync(timeSlice?: number): void; clone(): void; // throw error stopAsync(): void; - - } export class SpriteSheetUtils { @@ -859,6 +875,25 @@ declare module createjs { static mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; // deprecated } + export class SpriteStage extends Stage + { + constructor(canvas: HTMLCanvasElement, preserveDrawingBuffer?: boolean, antialias?: boolean); + constructor(canvas: string, preserveDrawingBuffer?: boolean, antialias?: boolean); + + // properties + static INDICES_PER_BOX: number; + isWebGL: boolean; + static MAX_BOXES_POINTS_INCREMENT: number; + static MAX_INDEX_SIZE: number; + static NUM_VERTEX_PROPERTIES: number; + static NUM_VERTEX_PROPERTIES_PER_BOX: number; + static POINTS_PER_BOX: number; + + // methods + clearImageTexture(image); + updateViewport(width: number, height: number); + } + export class Stage extends Container { constructor(canvas: HTMLCanvasElement); constructor(canvas: string); @@ -867,6 +902,7 @@ declare module createjs { // properties autoClear: boolean; canvas: any; // HTMLCanvasElement or Object + drawRect: Rectangle; handleEvent: Function; mouseInBounds: boolean; mouseMoveOutside: boolean; @@ -876,6 +912,7 @@ declare module createjs { /** * @deprecated */ + preventSelection: boolean; snapToPixelEnabled: boolean; // deprecated tickOnUpdate: boolean; @@ -909,13 +946,17 @@ declare module createjs { getMeasuredHeight(): number; getMeasuredLineHeight(): number; getMeasuredWidth(): number; + getMetrics(): Object; set(props: Object): Text; setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Text; } export class Ticker { // properties + static framerate: number; + static interval: number; static maxDelta: number; + static paused: number; static RAF: string; static RAF_SYNCHED: string; static TIMEOUT: string; @@ -927,18 +968,18 @@ declare module createjs { // methods static getEventTime(runTime?: boolean): number; - static getFPS(): number; - static getInterval(): number; + static getFPS(): number; // deprecated + static getInterval(): number; // deprecated static getMeasuredFPS(ticks?: number): number; static getMeasuredTickTime(ticks?: number): number; - static getPaused(): boolean; + static getPaused(): boolean; // deprecated static getTicks(pauseable?: boolean): number; static getTime(runTime?: boolean): number; static init(): void; static reset(): void; - static setFPS(value: number): void; - static setInterval(interval: number): void; - static setPaused(value: boolean): void; + static setFPS(value: number): void; // deprecated + static setInterval(interval: number): void; // deprecated + static setPaused(value: boolean): void; // deprecated // EventDispatcher mixins static addEventListener(type: string, listener: Stage, useCapture?: boolean): Stage; From ee9f36443f843286512cf7de902d4edf9910cdb4 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Thu, 11 Dec 2014 23:44:32 +0000 Subject: [PATCH 03/12] - update soundjs definitions --- soundjs/soundjs.d.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index b67408af2..9fb9382f8 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -43,7 +43,7 @@ declare module createjs { // properties defaultNumChannels: number; - enableIOS: boolean; + enableIOS: boolean; // deprecated static MAX_INSTANCES: number; // methods @@ -131,8 +131,10 @@ declare module createjs { // properties gainNode: any; + loop: number; pan: number; panNode: any; + paused: boolean; playState: string; sourceNode: any; src: string; @@ -177,7 +179,7 @@ declare module createjs { isPreloadComplete(src: string): boolean; isPreloadStarted(src: string): boolean; static isSupported(): boolean; - playEmptySound(): void; + static playEmptySound(): void; preload(src: string, instance: Object): void; register(src: string, instances: number): Object; removeAllSounds(src: string): void; From e003f566192e708b50ab5cc29e7eaa4d2bce8d72 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Fri, 12 Dec 2014 00:02:44 +0000 Subject: [PATCH 04/12] - update preloadjs definitions --- preloadjs/preloadjs.d.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 0a4a4db85..0bd162ac8 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -17,9 +17,12 @@ declare module createjs { export class AbstractLoader extends EventDispatcher { // properties + static ABSOLUTE_PATH: RegExp; canceled: boolean; + static EXTENSION_PATT: RegExp; loaded: boolean; progress: number; + static RELATIVE_PATH: RegExp; // methods buildPath(src: string, data?: Object): string; From 17d36657b89ab615ece6425b7d6555ff8855ad24 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Sat, 13 Dec 2014 03:34:01 +0000 Subject: [PATCH 05/12] - add new utilities functions (extend / promote) - add missing properties to some classes for easel 0.8 --- createjs-lib/createjs-lib.d.ts | 3 ++ easeljs/easeljs.d.ts | 71 ++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/createjs-lib/createjs-lib.d.ts b/createjs-lib/createjs-lib.d.ts index a61679aa7..cfd77e20a 100644 --- a/createjs-lib/createjs-lib.d.ts +++ b/createjs-lib/createjs-lib.d.ts @@ -56,6 +56,7 @@ declare module createjs { clone(): Event; preventDefault(): void; remove(): void; + set(props: Object): Event; stopImmediatePropagation(): void; stopPropagation(): void; toString(): string; @@ -93,7 +94,9 @@ declare module createjs { willTrigger(type: string): boolean; } + export function extend(subclass: () => any, superclass: () => any): () => any; // returns the subclass prototype export function indexOf(array: any[], searchElement: Object): number; + export function promote(subclass: () => any, prefix: string): () => any; export function proxy(method: (eventObj: Object) => boolean, scope: Object, ...arg: any[]): (eventObj: Object) => any; export function proxy(method: (eventObj: Object) => void, scope: Object, ...arg: any[]): (eventObj: Object) => any; diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 3c07efb2e..27dd9aec2 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -183,9 +183,12 @@ declare module createjs { getChildAt(index: number): DisplayObject; getChildByName(name: string): DisplayObject; getChildIndex(child: DisplayObject): number; - getNumChildren(): number; // deprecated - use numChildren property instead. - getObjectsUnderPoint(x: number, y: number): DisplayObject[]; - getObjectUnderPoint(x: number, y: number): DisplayObject; + /** + * @deprecated - use numChildren property instead. + */ + getNumChildren(): number; + getObjectsUnderPoint(x: number, y: number, mode: number): DisplayObject[]; + getObjectUnderPoint(x: number, y: number, mode: number): DisplayObject; removeAllChildren(): void; removeChild(...child: DisplayObject[]): boolean; removeChildAt(...index: number[]): boolean; @@ -242,13 +245,16 @@ declare module createjs { getConcatenatedDisplayProps(props?: DisplayProps): DisplayProps; getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D; getMatrix(matrix?: Matrix2D): Matrix2D; - getStage(): Stage; // deprecated + /** + * @deprecated + */ + getStage(): Stage; getTransformedBounds(): Rectangle; - globalToLocal(x: number, y: number): Point; + globalToLocal(x: number, y: number, pt?: Object): Point; // 'pt' is Point or Object hitTest(x: number, y: number): boolean; isVisible(): boolean; - localToGlobal(x: number, y: number): Point; - localToLocal(x: number, y: number, target: DisplayObject): Point; + localToGlobal(x: number, y: number, pt?: Object): Point; // 'pt' is Point or Object + localToLocal(x: number, y: number, target: DisplayObject, pt?: Object): Point; // 'pt' is Point or Object set(props: Object): DisplayObject; setBounds(x: number, y: number, width: number, height: number): void; setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DisplayObject; @@ -363,6 +369,10 @@ declare module createjs { endFill(): Graphics; endStroke(): Graphics; static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string; + /** + * @deprecated - use the instructions property instead + */ + getInstructions(); static getRGB(r: number, g: number, b: number, alpha?: number): string; inject(callback: (data: any) => any, data: any): Graphics; // deprecated isEmpty(): boolean; @@ -620,6 +630,7 @@ declare module createjs { constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number); // properties + isTouch: boolean; localX: number; localY: number; nativeEvent: NativeMouseEvent; @@ -687,8 +698,14 @@ declare module createjs { // methods advance(time?: number); clone(): MovieClip; // not supported + /** + * @deprecated - use 'currentLabel' property instead + */ getCurrentLabel(): string; // deprecated - getLabels(): Object[]; // deprecated + /** + * @deprecated - use 'labels' property instead + */ + getLabels(): Object[]; gotoAndPlay(positionOrLabel: string): void; gotoAndPlay(positionOrLabel: number): void; gotoAndStop(positionOrLabel: string): void; @@ -833,6 +850,9 @@ declare module createjs { // methods clone(): SpriteSheet; getAnimation(name: string): SpriteSheetAnimation; + /** + * @deprecated - use the 'animations' property instead + */ getAnimations(): string[]; getFrame(frameIndex: number): SpriteSheetFrame; getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle; @@ -854,8 +874,8 @@ declare module createjs { // methods addAnimation(name: string, frames: number[], next?: string, frequency?: number): void; - addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupParams?: any[], setupScope?: Object): number; - addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number): void; + addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object): number; + addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object, labelFunction?: () => any): void; build(): SpriteSheet; buildAsync(timeSlice?: number): void; clone(): void; // throw error @@ -921,6 +941,7 @@ declare module createjs { clone(): Stage; enableDOMEvents(enable?: boolean): void; enableMouseOver(frequency?: number): void; + tick(props?: Object); toDataURL(backgroundColor: string, mimeType: string): string; update(...arg: any[]): void; @@ -968,18 +989,36 @@ declare module createjs { // methods static getEventTime(runTime?: boolean): number; - static getFPS(): number; // deprecated - static getInterval(): number; // deprecated + /** + * @deprecated - use the 'framerate' property instead + */ + static getFPS(): number; + /** + * @deprecated - use the 'interval' property instead + */ + static getInterval(): number; static getMeasuredFPS(ticks?: number): number; static getMeasuredTickTime(ticks?: number): number; - static getPaused(): boolean; // deprecated + /** + * @deprecated - use the 'paused' property instead + */ + static getPaused(): boolean; static getTicks(pauseable?: boolean): number; static getTime(runTime?: boolean): number; static init(): void; static reset(): void; - static setFPS(value: number): void; // deprecated - static setInterval(interval: number): void; // deprecated - static setPaused(value: boolean): void; // deprecated + /** + * @deprecated - use the 'framerate' property instead + */ + static setFPS(value: number): void; + /** + * @deprecated - use the 'interval' property instead + */ + static setInterval(interval: number): void; + /** + * @deprecated - use the 'paused' property instead + */ + static setPaused(value: boolean): void; // EventDispatcher mixins static addEventListener(type: string, listener: Stage, useCapture?: boolean): Stage; From 6434a9b18717569aedfae86b7b2d3c887496fd40 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Sat, 13 Dec 2014 04:27:19 +0000 Subject: [PATCH 06/12] - update preloadjs to v0.6 --- easeljs/easeljs.d.ts | 2 +- preloadjs/preloadjs.d.ts | 296 +++++++++++++++++++++++++++++++-------- 2 files changed, 242 insertions(+), 56 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 27dd9aec2..22cf386a8 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for EaselJS 0.7.1 +// Type definitions for EaselJS 0.8.0 // Project: http://www.createjs.com/#!/EaselJS // Definitions by: Pedro Ferreira , Chris Smith // Definitions: https://github.com/borisyankov/DefinitelyTyped diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 0bd162ac8..b91a164ac 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for PreloadJS 0.4.1 +// Type definitions for PreloadJS 0.6.0 // Project: http://www.createjs.com/#!/PreloadJS // Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -16,91 +16,277 @@ declare module createjs { export class AbstractLoader extends EventDispatcher { - // properties - static ABSOLUTE_PATH: RegExp; - canceled: boolean; - static EXTENSION_PATT: RegExp; - loaded: boolean; - progress: number; - static RELATIVE_PATH: RegExp; - - // methods - buildPath(src: string, data?: Object): string; - close(): void; - load(): void; - } - - export class LoadQueue extends AbstractLoader { - constructor(useXHR?: boolean, basePath?: string, crossOrigin?: string); - constructor(useXHR?: boolean, basePath?: string, crossOrigin?: boolean); - // properties static BINARY: string; + canceled: boolean; static CSS: string; + GET: string; static IMAGE: string; static JAVASCRIPT: string; static JSON: string; static JSONP: string; - static loadTimeout: number; - maintainScriptOrder: boolean; + loaded: boolean; static MANIFEST: string; - next: LoadQueue; + POST: string; + progress: number; + resultFormatter: () => any; static SOUND: string; - stopOnError: boolean; + static SPRITESHEET: string; static SVG: string; static TEXT: string; - useXHR: boolean; + type: string; + static VIDEO: string; static XML: string; - + // methods - getItem(value: string): Object; - getResult(value: string, rawResult?: boolean): Object; - installPlugin(plugin: any): void; + cancel(); + destroy(); + getItem(): Object; + getLoadedItems(): Object[]; + getResult(raw?: boolean): Object; + getTag(): Object; + load(): void; + setTag(tag: Object); + toString(): string; + } + + export class AbstractMediaLoader + { + constructor(loadItem: Object, preferXHR: boolean, type: string); + } + + export class AbstractRequest + { + constructor(item: LoadItem); + + cancel(); + destroy(); + load(); + } + + export class BinaryLoader + { + constructor(loadItem: Object); + + // methods + static canLoadItem(item: Object): boolean; + } + + export class CSSLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + // methods + canLoadItem(item: Object): boolean; + } + + export module DataUtils + { + export function parseJSON(value: string): Object; + export function parseXML(text: string, type: string): XMLDocument; + } + + export class ErrorEvent + { + constructor(title?: string, message?: string, data?: Object); + + // properties + data: Object; + message: string; + title: string; + } + + export class ImageLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + static canLoadItem(item: Object): boolean; + } + + export class JavaScriptLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + static canLoadItem(item: Object): boolean; + } + + export class JSONLoader + { + constructor(loadItem: Object); + + static canLoadItem(item: Object): boolean; + } + + export class JSONPLoader + { + constructor(loadItem: Object); + + static canLoadItem(item: Object): boolean; + } + + export class LoadItem + { + // properties + callback: string; + crossOrigin: boolean; + data: Object; + headers: Object; + id: string; + loadTimeout: number; + maintainOrder: boolean; + method: string; + mimeType: string; + src: string; + type: string; + values: Object; + withCredentials: boolean; + + // methods + static create(value: Object): Object; // 'value' is a LoadItem, string or Object. Returns Object or LoadItem + set(props: Object): LoadItem; + } + + export class LoadQueue extends AbstractLoader + { + constructor(preferXHR?: boolean, basePath?: string, crossOrigin?: string); + constructor(preferXHR?: boolean, basePath?: string, crossOrigin?: boolean); + + // properties + maintainScriptOrder: boolean; + next: LoadQueue; + stopOnError: boolean; + + // methods + close(); + getItems(loaded: boolean): Object[]; + installPlugin(plugin: () => any): void; loadFile(file: Object, loadNow?: boolean, basePath?: string): void; loadFile(file: string, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: Object, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: string, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: any[], loadNow?: boolean, basePath?: string): void; + registerLoader(loader); remove(idsOrUrls: string): void; remove(idsOrUrls: any[]): void; removeAll(): void; reset(): void; setMaxConnections(value: number): void; setPaused(value: boolean): void; + setPreferXHR(value: boolean): boolean; + /** + * @deprecated - use 'preferXHR' property instead (or setUseXHR()) + */ setUseXHR(value: boolean): void; + unregisterLoader(loader); } - - export class PreloadJS { + + export class ManifestLoader + { + constructor(loadItem: Object); // 'loadItem' Object or LoadItem + + // methods + static canLoadItem(item: Object): boolean; // 'item' Object or LoadItem + } + + export class MediaTagRequest + { + constructor(loadItem: LoadItem, tag: HTMLAudioElement, srcAttribute: string); + constructor(loadItem: LoadItem, tag: HTMLVideoElement, srcAttribute: string); + } + + export class PreloadJS + { static buildDate: string; static version: string; - } - - /* - NOTE: It is commented out because it conflicts with SamplePlugin class of TweenJS. - this class is mainly for documentation purposes. - http://www.createjs.com/Docs/PreloadJS/classes/SamplePlugin.html - */ - /* - export class SamplePlugin { - static fileLoadHandler(event: Object): void; - static getPreloadHandlers(): Object; - static preloadHandler(src: string, type: string, id: string, data: any, basePath: string, queue: LoadQueue): any; - } - */ + } + + export class ProgressEvent + { + constructor(loaded: number, total?: number); + + // properties + loaded: number; + progress: number; + total: number; - export class TagLoader extends AbstractLoader { - constructor (item: Object); - // methods - getResult(): any; - } - - export class XHRLoader extends AbstractLoader { - constructor (item: Object, crossOrigin?: string); - + clone(): ProgressEvent; + } + + export class RequestUtils + { + // properties + static ABSOLUTE_PATH: RegExp; + static EXTENSION_PATT: RegExp; + static RELATIVE_PATH: RegExp; + + // methods + static buildPath(src: string, data?: Object): string; + static formatQueryString(data: Object, query?: Object[]): string; + static getTypeByExtension(extension: string): string; + static isAudioTag(item: Object): boolean; + static isBinary(type: string): boolean; + static isCrossDomain(item: Object): boolean; + static isImageTag(item: Object): boolean; + static isLocal(item: Object): boolean; + static isText(type: string): boolean; + static isVideoTag(item: Object): boolean; + static parseURI(path: string): Object; + } + + export class SoundLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + static canLoadItem(item: Object): boolean; + } + + export class SpriteSheetLoader + { + constructor(loadItem: Object); + + static canLoadItem(item: Object): boolean; + } + + export class SVGLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + static canLoadItem(item: Object): boolean; + } + + export class TagRequest + { + + } + + export class TextLoader + { + constructor(loadItem: Object); + + static canLoadItem(item: Object): boolean; + } + + export class VideoLoader + { + constructor(loadItem: Object, preferXHR: boolean); + + static canLoadItem(item: Object): boolean; + } + + export class XHRRequest extends AbstractLoader + { + constructor(item: Object); + // methods getAllResponseHeaders(): string; getResponseHeader(header: string): string; - getResult (rawResult?: boolean): Object; - } + } + + export class XMLLoader + { + constructor(loadItem: Object); + + static canLoadItem(item: Object): boolean; + } } From d986f2fbf433dc6cd7be6e5554aaa7a932cc0249 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Sat, 13 Dec 2014 16:07:36 +0000 Subject: [PATCH 07/12] - update soundjs definitions to v0.6 --- soundjs/soundjs.d.ts | 195 ++++++++++++++++++++++++++++--------------- 1 file changed, 129 insertions(+), 66 deletions(-) diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index 9fb9382f8..511d13ad1 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for SoundJS 0.5.2 +// Type definitions for SoundJS 0.6.0 // Project: http://www.createjs.com/#!/SoundJS // Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -15,6 +15,89 @@ /// declare module createjs { + + export class AbstractPlugin + { + // methods + create(src: string, startTime: number, duration: number): AbstractSoundInstance; + getVolume(): number; + isPreloadComplete(src: string): boolean; + isPreloadStarted(src: string): boolean; + isSupported(): boolean; + preload(loader); + register(loadItem: string, instances: number): Object; + removeAllSounds(src: string); + removeSound(src: string); + setMute(value: boolean): boolean; + setVolume(value: number): boolean; + } + + export class AbstractSoundInstance extends EventDispatcher + { + constructor(src: string, startTime: number, duration: number, playbackResource: Object); + + // properties + duration: number; + loop: number; + muted: boolean; + pan: number; + paused: boolean; + playbackResource: Object; + playState: string; + position: number; + src: string; + uniqueId: any; // number or string + volume: number; + + // methods + destroy(); + getDuration(): number; + getLoop(): number; + getMute(): boolean; + getPan(): number; + getPaused(): boolean; + getPosition(): number; + getVolume(): number; + play(interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance; + play(interrupt?: Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance; + setDuration(value: number): AbstractSoundInstance; + setLoop(value: number); + setMute(value: boolean): AbstractSoundInstance; + setPan(value: number): AbstractSoundInstance; + setPlayback(value: Object): AbstractSoundInstance; + setPosition(value: number): AbstractSoundInstance; + setVolume(value: number): AbstractSoundInstance; + stop(): AbstractSoundInstance; + } + + export class FlashAudioLoader //extends AbstractLoader + { + // properties + flashId: string; + + // methods + setFlash(flash: Object); + } + + export class FlashAudioPlugin extends AbstractPlugin + { + // properties + flashReady: boolean; + showOutput: boolean; + static swfPath: string; + + // methods + static isSupported(): boolean; + } + + export class FlashAudioSoundInstance extends AbstractSoundInstance + { + constructor(src: string, startTime: number, duration: number, playbackResource: Object); + } + + /** + * @deprecated - use FlashAudioPlugin + */ export class FlashPlugin { constructor(); @@ -26,7 +109,7 @@ declare module createjs { static version: string; // methods - create(src: string): SoundInstance; + create(src: string): AbstractSoundInstance; getVolume(): number; isPreloadStarted(src: string): boolean; static isSupported(): boolean; @@ -38,7 +121,8 @@ declare module createjs { setVolume(value: number): boolean; } - export class HTMLAudioPlugin { + export class HTMLAudioPlugin extends AbstractPlugin + { constructor(); // properties @@ -47,16 +131,21 @@ declare module createjs { static MAX_INSTANCES: number; // methods - create(src: string): SoundInstance; - isPreloadStarted(src: string): boolean; static isSupported(): boolean; - preload(src: string, instance: Object): void; - register(src: string, instances: number): Object; - removeAllSounds(): void; - removeSound(src: string): void; - } + } + + export class HTMLAudioSoundInstance extends AbstractSoundInstance + { + constructor(src: string, startTime: number, duration: number, playbackResource: Object); + } + + export class HTMLAudioTagPool + { + + } - export class Sound { + export class Sound extends EventDispatcher + { // properties static activePlugin: Object; static alternateExtensions: any[]; @@ -75,7 +164,7 @@ declare module createjs { // methods - static createInstance(src: string): SoundInstance; + static createInstance(src: string): AbstractSoundInstance; static getCapabilities(): Object; static getCapability(key: string): any; //HERE can return string | number | bool; static getMute(): boolean; @@ -83,13 +172,13 @@ declare module createjs { static initializeDefaultPlugins(): boolean; static isReady(): boolean; static loadComplete(src: string): boolean; - static play(src: string, interrupt?: any, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): SoundInstance; - static registerManifest(manifest: any[], basePath: string): Object; + static play(src: string, interrupt?: any, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance; + static registerManifest(manifest: Object[], basePath: string): Object; static registerPlugins(plugins: any[]): boolean; - static registerSound(src: string, id?: string, data?: number, preload?: boolean, basePath?: string): Object; - static registerSound(src: string, id?: string, data?: Object, preload?: boolean, basePath?: string): Object; - static registerSound(src: Object, id?: string, data?: number, preload?: boolean, basePath?: string): Object; - static registerSound(src: Object, id?: string, data?: Object, preload?: boolean, basePath?: string): Object; + static registerSound(src: string, id?: string, data?: number, basePath?: string): Object; + static registerSound(src: string, id?: string, data?: Object, basePath?: string): Object; + static registerSound(src: Object, id?: string, data?: number, basePath?: string): Object; + static registerSound(src: Object, id?: string, data?: Object, basePath?: string): Object; static removeAllSounds(): void; static removeManifest(manifest: any[], basePath: string): Object; static removeSound(src: string, basePath: string): boolean; @@ -125,46 +214,19 @@ declare module createjs { static toString(): string; static willTrigger(type: string): boolean; } - - export class SoundInstance extends EventDispatcher { - constructor(src: string, owner: Object); - - // properties - gainNode: any; - loop: number; - pan: number; - panNode: any; - paused: boolean; - playState: string; - sourceNode: any; - src: string; - uniqueId: any; //HERE string or number - volume: number; - // methods - getDuration(): number; - getMute(): boolean; - getPan(): number; - getPosition(): number; - getVolume(): number; - pause(): boolean; - play(interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): void; - play(interrupt?: Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): void; - resume(): boolean; - setMute(value: boolean): boolean; - setPan(value: number): number; - setPosition(value: number): void; - setVolume(value: number): boolean; - stop(): boolean; - - } - export class SoundJS { static buildDate: string; static version: string; } - - export class WebAudioPlugin { + + export class WebAudioLoader + { + static context; // AudioContext; + } + + export class WebAudioPlugin extends AbstractPlugin + { constructor(); // properties @@ -173,18 +235,19 @@ declare module createjs { gainNode: any; // methods - addPreloadResults(src: string): boolean; - create(src: string): SoundInstance; - getVolume(): number; - isPreloadComplete(src: string): boolean; - isPreloadStarted(src: string): boolean; static isSupported(): boolean; - static playEmptySound(): void; - preload(src: string, instance: Object): void; - register(src: string, instances: number): Object; - removeAllSounds(src: string): void; - removeSound(src: string): void; - setMute(value: boolean): boolean; - setVolume(value: number): boolean; - } + static playEmptySound(); + } + + export class WebAudioSoundInstance extends AbstractSoundInstance + { + constructor(src: string, startTime: number, duration: number, playbackResource: Object); + + // properties + static context; // AudioContext; + static destinationNode; // AudioNode; + gainNode; // AudioGainNode; + panNode; // AudioPannerNode; + sourceNode; // AudioNode; + } } From 0e1ce7b8479ad93bc5b2058bdf7ccb5298e614d8 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Sat, 13 Dec 2014 17:28:33 +0000 Subject: [PATCH 08/12] - update the version number tweenjs (to v0.6) - fix, add the Graphics commands to a module with the same name (Graphics) --- easeljs/easeljs.d.ts | 342 +++++++++++++++++++++---------------------- tweenjs/tweenjs.d.ts | 2 +- 2 files changed, 166 insertions(+), 178 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 22cf386a8..68291a915 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -315,33 +315,16 @@ declare module createjs { export class Graphics { constructor(); - // Graphics commands - static Arc: GraphicsArc; - static ArcTo: GraphicsArcTo; - static BeginPath: GraphicsBeginPath; - static BezierCurveTo: GraphicsBezierCurveTo; - static Circle: GraphicsCircle; - static ClosePath: GraphicsClosePath; - static Fill: GraphicsFill; - static LineTo: GraphicsLineTo; - static MoveTo: GraphicsMoveTo; - static PolyStar: GraphicsPolyStar; - static QuadraticCurveTo: GraphicsQuadraticCurveTo; - static Rect: GraphicsRect; - static RoundRect: GraphicsRoundRect; - static Stroke: GraphicsStroke; - static StrokeStyle: GraphicsStrokeStyle; - // properties static BASE_64: Object; - static beginCmd: GraphicsBeginPath; + static beginCmd: Graphics.BeginPath; command: Object; instructions: Object[]; // array of graphics command objects (Graphics.Fill, etc) static STROKE_CAPS_MAP: string[]; static STROKE_JOINTS_MAP: string[]; // methods - append(command: Object, clean: boolean): Graphics; + append(command: Object, clean?: boolean): Graphics; arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics; arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics; beginBitmapFill(image: Object, repetition?: string, matrix?: Matrix2D): Graphics; @@ -423,169 +406,174 @@ declare module createjs { } - export class GraphicsArc + module Graphics { - constructor(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: number); + export class Arc + { + constructor(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: number); - // properties - anticlockwise: number; - endAngle: number; - radius: number; - startAngle: number; - x: number; - y: number; + // properties + anticlockwise: number; + endAngle: number; + radius: number; + startAngle: number; + x: number; + y: number; + } + + export class ArcTo + { + constructor(x1: number, y1: number, x2: number, y2: number, radius: number); + + // properties + x1: number; + y1: number; + x2: number; + y2: number; + radius: number; + } + + export class BeginPath + { + + } + + export class BezierCurveTo + { + constructor(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number); + + // properties + cp1x: number; + cp1y: number; + cp2x: number; + cp2y: number; + x: number; + y: number; + } + + export class Circle + { + constructor(x: number, y: number, radius: number); + + // properties + x: number; + y: number; + radius: number; + } + + export class ClosePath + { + + } + + export class Fill + { + constructor(style: Object, matrix?: Matrix2D); + + // properties + style: Object; + matrix: Matrix2D; + + // methods + bitmap(image: HTMLImageElement, repetition?: string): Fill; + linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Fill; + radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Fill; + } + + export class LineTo + { + constructor(x: number, y: number); + + // properties + x: number; + y: number; + } + + export class MoveTo + { + constructor(x: number, y: number); + + x: number; + y: number; + } + + export class PolyStar + { + constructor(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number); + + // properties + angle: number; + pointSize: number; + radius: number; + sides: number; + x: number; + y: number; + } + + export class QuadraticCurveTo + { + constructor(cpx: number, cpy: number, x: number, y: number); + + // properties + cpx: number; + cpy: number; + x: number; + y: number; + } + + export class Rect + { + constructor(x: number, y: number, w: number, h: number); + + // properties + x: number; + y: number; + w: number; + h: number; + } + + export class RoundRect + { + constructor(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radiusBL: number); + + // properties + x: number; + y: number; + w: number; + h: number; + radiusTL: number; + radiusTR: number; + radiusBR: number; + radiusBL: number; + } + + export class Stroke + { + constructor(style: Object, ignoreScale: boolean); + + // properties + style: Object; + ignoreScale: boolean; + + // methods + bitmap(image: HTMLImageElement, repetition?: string): Stroke; + linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Stroke; + radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Stroke; + } + + export class StrokeStyle + { + constructor(width: number, caps: string, joints: number, miterLimit: number); + + // properties + caps: string; + joints: string; + miterLimit: number; + width: number; + } } - export class GraphicsArcTo - { - constructor(x1: number, y1: number, x2: number, y2: number, radius: number); - // properties - x1: number; - y1: number; - x2: number; - y2: number; - radius: number; - } - - export class GraphicsBeginPath - { - - } - - export class GraphicsBezierCurveTo - { - constructor(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number); - - // properties - cp1x: number; - cp1y: number; - cp2x: number; - cp2y: number; - x: number; - y: number; - } - - export class GraphicsCircle - { - constructor(x: number, y: number, radius: number); - - // properties - x: number; - y: number; - radius: number; - } - - export class GraphicsClosePath - { - - } - - export class GraphicsFill - { - constructor(style: Object, matrix: Matrix2D); - - // properties - style: Object; - matrix: Matrix2D; - - // methods - bitmap(image: HTMLImageElement, repetition?: string): GraphicsFill; - linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): GraphicsFill; - radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): GraphicsFill; - } - - export class GraphicsLineTo - { - constructor(x: number, y: number); - - // properties - x: number; - y: number; - } - - export class GraphicsMoveTo - { - constructor(x: number, y: number); - - x: number; - y: number; - } - - export class GraphicsPolyStar - { - constructor(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number); - - // properties - angle: number; - pointSize: number; - radius: number; - sides: number; - x: number; - y: number; - } - - export class GraphicsQuadraticCurveTo - { - constructor(cpx: number, cpy: number, x: number, y: number); - - // properties - cpx: number; - cpy: number; - x: number; - y: number; - } - - export class GraphicsRect - { - constructor(x: number, y: number, w: number, h: number); - - // properties - x: number; - y: number; - w: number; - h: number; - } - - export class GraphicsRoundRect - { - constructor(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radiusBL: number); - - // properties - x: number; - y: number; - w: number; - h: number; - radiusTL: number; - radiusTR: number; - radiusBR: number; - radiusBL: number; - } - - export class GraphicsStroke - { - constructor(style: Object, ignoreScale: boolean); - - // properties - style: Object; - ignoreScale: boolean; - - // methods - bitmap(image: HTMLImageElement, repetition?: string): GraphicsStroke; - linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): GraphicsStroke; - radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): GraphicsStroke; - } - - export class GraphicsStrokeStyle - { - constructor(width: number, caps: string, joints: number, miterLimit: number); - - // properties - caps: string; - joints: string; - miterLimit: number; - width: number; - } export class Matrix2D { constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number); diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts index 69b2948fa..a3e04cd86 100644 --- a/tweenjs/tweenjs.d.ts +++ b/tweenjs/tweenjs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for TweenJS 0.5.1 +// Type definitions for TweenJS 0.6.0 // Project: http://www.createjs.com/#!/TweenJS // Definitions by: Pedro Ferreira , Chris Smith // Definitions: https://github.com/borisyankov/DefinitelyTyped From e703cb120846ef59e022251dbc9676ee82682504 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Thu, 18 Dec 2014 16:38:54 +0000 Subject: [PATCH 09/12] - fix, add missing types to some methods/properties of createjs definitions --- easeljs/easeljs.d.ts | 10 +++++----- preloadjs/preloadjs.d.ts | 18 +++++++++--------- soundjs/soundjs.d.ts | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 68291a915..a4ee843bd 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -355,7 +355,7 @@ declare module createjs { /** * @deprecated - use the instructions property instead */ - getInstructions(); + getInstructions(): Object[]; static getRGB(r: number, g: number, b: number, alpha?: number): string; inject(callback: (data: any) => any, data: any): Graphics; // deprecated isEmpty(): boolean; @@ -684,7 +684,7 @@ declare module createjs { static version: string; // methods - advance(time?: number); + advance(time?: number): void; clone(): MovieClip; // not supported /** * @deprecated - use 'currentLabel' property instead @@ -898,8 +898,8 @@ declare module createjs { static POINTS_PER_BOX: number; // methods - clearImageTexture(image); - updateViewport(width: number, height: number); + clearImageTexture(image: Object): void; + updateViewport(width: number, height: number): void; } export class Stage extends Container { @@ -929,7 +929,7 @@ declare module createjs { clone(): Stage; enableDOMEvents(enable?: boolean): void; enableMouseOver(frequency?: number): void; - tick(props?: Object); + tick(props?: Object): void; toDataURL(backgroundColor: string, mimeType: string): string; update(...arg: any[]): void; diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index b91a164ac..9bdc879b8 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -39,14 +39,14 @@ declare module createjs { static XML: string; // methods - cancel(); - destroy(); + cancel(): void; + destroy(): void; getItem(): Object; getLoadedItems(): Object[]; getResult(raw?: boolean): Object; getTag(): Object; load(): void; - setTag(tag: Object); + setTag(tag: Object): void; toString(): string; } @@ -59,9 +59,9 @@ declare module createjs { { constructor(item: LoadItem); - cancel(); - destroy(); - load(); + cancel(): void; + destroy(): void; + load(): void; } export class BinaryLoader @@ -157,7 +157,7 @@ declare module createjs { stopOnError: boolean; // methods - close(); + close(): void; getItems(loaded: boolean): Object[]; installPlugin(plugin: () => any): void; loadFile(file: Object, loadNow?: boolean, basePath?: string): void; @@ -165,7 +165,7 @@ declare module createjs { loadManifest(manifest: Object, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: string, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: any[], loadNow?: boolean, basePath?: string): void; - registerLoader(loader); + registerLoader(loader: AbstractLoader): void; remove(idsOrUrls: string): void; remove(idsOrUrls: any[]): void; removeAll(): void; @@ -177,7 +177,7 @@ declare module createjs { * @deprecated - use 'preferXHR' property instead (or setUseXHR()) */ setUseXHR(value: boolean): void; - unregisterLoader(loader); + unregisterLoader(loader: AbstractLoader): void; } export class ManifestLoader diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index 511d13ad1..e555b2b67 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -24,10 +24,10 @@ declare module createjs { isPreloadComplete(src: string): boolean; isPreloadStarted(src: string): boolean; isSupported(): boolean; - preload(loader); + preload(loader: Object): void; register(loadItem: string, instances: number): Object; - removeAllSounds(src: string); - removeSound(src: string); + removeAllSounds(src: string): void; + removeSound(src: string): void; setMute(value: boolean): boolean; setVolume(value: number): boolean; } @@ -50,7 +50,7 @@ declare module createjs { volume: number; // methods - destroy(); + destroy(): void; getDuration(): number; getLoop(): number; getMute(): boolean; @@ -61,7 +61,7 @@ declare module createjs { play(interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance; play(interrupt?: Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance; setDuration(value: number): AbstractSoundInstance; - setLoop(value: number); + setLoop(value: number): void; setMute(value: boolean): AbstractSoundInstance; setPan(value: number): AbstractSoundInstance; setPlayback(value: Object): AbstractSoundInstance; @@ -76,7 +76,7 @@ declare module createjs { flashId: string; // methods - setFlash(flash: Object); + setFlash(flash: Object): void; } export class FlashAudioPlugin extends AbstractPlugin @@ -222,7 +222,7 @@ declare module createjs { export class WebAudioLoader { - static context; // AudioContext; + static context: Object; // AudioContext; } export class WebAudioPlugin extends AbstractPlugin @@ -236,7 +236,7 @@ declare module createjs { // methods static isSupported(): boolean; - static playEmptySound(); + static playEmptySound(): void; } export class WebAudioSoundInstance extends AbstractSoundInstance @@ -244,10 +244,10 @@ declare module createjs { constructor(src: string, startTime: number, duration: number, playbackResource: Object); // properties - static context; // AudioContext; - static destinationNode; // AudioNode; - gainNode; // AudioGainNode; - panNode; // AudioPannerNode; - sourceNode; // AudioNode; + static context: Object; // AudioContext; + static destinationNode: Object; // AudioNode; + gainNode: Object; // AudioGainNode; + panNode: Object; // AudioPannerNode; + sourceNode: Object; // AudioNode; } } From a3c0dad9b2c438dd841feb9bacf103916cf3abc4 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Sun, 21 Dec 2014 18:11:50 +0000 Subject: [PATCH 10/12] - fix preloadjs AbstractLoader's getItem() method definitions - add missing static context property to soundjs WebAudioPlugin - use the web audio api definitions in soundjs (AudioContext, AudioNode, etc) --- preloadjs/preloadjs.d.ts | 2 +- soundjs/soundjs.d.ts | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 9bdc879b8..c5f974b7e 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -41,7 +41,7 @@ declare module createjs { // methods cancel(): void; destroy(): void; - getItem(): Object; + getItem(value?: string): Object; getLoadedItems(): Object[]; getResult(raw?: boolean): Object; getTag(): Object; diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index e555b2b67..943756302 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -13,6 +13,7 @@ // Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html /// +/// declare module createjs { @@ -222,7 +223,7 @@ declare module createjs { export class WebAudioLoader { - static context: Object; // AudioContext; + static context: AudioContext; } export class WebAudioPlugin extends AbstractPlugin @@ -230,9 +231,10 @@ declare module createjs { constructor(); // properties - context: any; - dynamicsCompressorNode: any; - gainNode: any; + static context: AudioContext; + context: AudioContext; + dynamicsCompressorNode: DynamicsCompressorNode; + gainNode: GainNode; // methods static isSupported(): boolean; @@ -244,10 +246,10 @@ declare module createjs { constructor(src: string, startTime: number, duration: number, playbackResource: Object); // properties - static context: Object; // AudioContext; - static destinationNode: Object; // AudioNode; - gainNode: Object; // AudioGainNode; - panNode: Object; // AudioPannerNode; - sourceNode: Object; // AudioNode; + static context: AudioContext; + static destinationNode: AudioNode; + gainNode: GainNode; + panNode: PannerNode; + sourceNode: AudioNode; } } From fa9bb4caf29f427b517a8cfdd4028b404789325d Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Mon, 22 Dec 2014 04:03:20 +0000 Subject: [PATCH 11/12] - remove deprecated classes definitions (BitmapAnimation / Command) - remove set() and setTransform() from BitmapText since they're defined in the base class DisplayObject --- easeljs/easeljs.d.ts | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index a4ee843bd..b2beb8b8b 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -59,12 +59,7 @@ declare module createjs { setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Bitmap; } - /** - * @deprecated renamed to Sprite, here for backwards compatibility - */ - export class BitmapAnimation extends Sprite { - } - + export class BitmapText extends DisplayObject { constructor(text?:string, spriteSheet?:SpriteSheet); @@ -76,10 +71,6 @@ declare module createjs { spaceWidth: number; spriteSheet: SpriteSheet; text: string; - - // methods - set(props: Object): BitmapText; - setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): BitmapText; } export class BlurFilter extends Filter { @@ -159,12 +150,7 @@ declare module createjs { clone(): ColorMatrixFilter; } - export class Command { - // methods - constructor(f: any, params: any, path?: any); - exec(scope: any): void; - } - + export class Container extends DisplayObject { constructor(); From 72588a609f02e623442e3a896780f4317851ae13 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Tue, 23 Dec 2014 18:26:15 +0000 Subject: [PATCH 12/12] - fix preloadjs getResult() method from AbstractLoader class --- preloadjs/preloadjs.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index c5f974b7e..12545369c 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -43,7 +43,7 @@ declare module createjs { destroy(): void; getItem(value?: string): Object; getLoadedItems(): Object[]; - getResult(raw?: boolean): Object; + getResult(value?: any, rawResult?: boolean): Object; getTag(): Object; load(): void; setTag(tag: Object): void;