From d70c76ffdcd61121c235f390f94e4fd863835944 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 30 Sep 2014 22:13:27 +0100 Subject: [PATCH 1/2] Fix incorrect signature of JSONLoader.parse(...) --- threejs/three.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threejs/three.d.ts b/threejs/three.d.ts index a9c33693c..240db3c93 100644 --- a/threejs/three.d.ts +++ b/threejs/three.d.ts @@ -1782,7 +1782,7 @@ declare module THREE { loadAjaxJSON(context: JSONLoader, url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string, callbackProgress?: (progress: Progress) => void ): void; - parse(json:string, texturePath:string): any; + parse(json: Object, texturePath?: string): { geometry: Geometry; materials?: Material[] }; } export interface JSonLoaderResultGeometry extends Geometry { From 995b145b1ad5410f42d604464cd97f0428c516c4 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 1 Oct 2014 17:58:08 +0100 Subject: [PATCH 2/2] Change 'Object' to 'any'. --- threejs/three.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threejs/three.d.ts b/threejs/three.d.ts index 240db3c93..798c1c360 100644 --- a/threejs/three.d.ts +++ b/threejs/three.d.ts @@ -1782,7 +1782,7 @@ declare module THREE { loadAjaxJSON(context: JSONLoader, url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string, callbackProgress?: (progress: Progress) => void ): void; - parse(json: Object, texturePath?: string): { geometry: Geometry; materials?: Material[] }; + parse(json: any, texturePath?: string): { geometry: Geometry; materials?: Material[] }; } export interface JSonLoaderResultGeometry extends Geometry {