From eb712dee7ada682359c1674de75676200e5930c7 Mon Sep 17 00:00:00 2001 From: SirKhepre Date: Fri, 17 Feb 2017 10:50:06 -0500 Subject: [PATCH 1/3] Added definition for ColladaLoader --- three/index.d.ts | 1 + three/three-colladaLoader.d.ts | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 three/three-colladaLoader.d.ts diff --git a/three/index.d.ts b/three/index.d.ts index 100e3ecf8c..7b76100c17 100644 --- a/three/index.d.ts +++ b/three/index.d.ts @@ -22,6 +22,7 @@ /// /// /// +/// declare namespace THREE { export const REVISION: string; diff --git a/three/three-colladaLoader.d.ts b/three/three-colladaLoader.d.ts new file mode 100644 index 0000000000..25f4903c4b --- /dev/null +++ b/three/three-colladaLoader.d.ts @@ -0,0 +1,17 @@ +// Type definitions for three.js (ColladaLoader2.js) +// NOTE : These typings are for the loader named ColladaLoader2.js +// supplied by the npm package @types/three 0.81. +// Definitions by: Emilio Rivera + +declare namespace THREE { + export class ColladaModel { + animations: any[];//[]; + kinematics: any;// { joints: []}; + scene: THREE.Scene; + } + export class ColladaLoader { + constructor(); + + load(url: string, onLoad: (model: ColladaModel) => void): void; + } +} \ No newline at end of file From 6939f956514d8b9bd900822a07ce557f1554fc75 Mon Sep 17 00:00:00 2001 From: SirKhepre Date: Fri, 17 Feb 2017 10:51:09 -0500 Subject: [PATCH 2/3] Fixed comments --- three/three-colladaLoader.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/three/three-colladaLoader.d.ts b/three/three-colladaLoader.d.ts index 25f4903c4b..f512d73cd9 100644 --- a/three/three-colladaLoader.d.ts +++ b/three/three-colladaLoader.d.ts @@ -1,7 +1,7 @@ // Type definitions for three.js (ColladaLoader2.js) // NOTE : These typings are for the loader named ColladaLoader2.js // supplied by the npm package @types/three 0.81. -// Definitions by: Emilio Rivera +// Definitions by: Brandon Roberge declare namespace THREE { export class ColladaModel { From ad602b106a4921787eba784ea8a3c86ad8ae7f2a Mon Sep 17 00:00:00 2001 From: SirKhepre Date: Fri, 17 Feb 2017 13:10:05 -0500 Subject: [PATCH 3/3] Added missing methods --- three/three-colladaLoader.d.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/three/three-colladaLoader.d.ts b/three/three-colladaLoader.d.ts index f512d73cd9..6bdec6a9da 100644 --- a/three/three-colladaLoader.d.ts +++ b/three/three-colladaLoader.d.ts @@ -4,14 +4,20 @@ // Definitions by: Brandon Roberge declare namespace THREE { + export interface ColladaLoaderReturnType { + + } export class ColladaModel { - animations: any[];//[]; - kinematics: any;// { joints: []}; + animations: any[]; + kinematics: any; scene: THREE.Scene; + library: any; } export class ColladaLoader { constructor(); - load(url: string, onLoad: (model: ColladaModel) => void): void; + load(url: string, onLoad: (model: ColladaModel) => void, onProgress?: (request: ProgressEvent) => void, onError?:(event: ErrorEvent) => void): void; + setCrossOrigin(value: any): void; + parse(text: string): ColladaModel; } } \ No newline at end of file