Some bug fixes.

This commit is contained in:
satoru kimura
2014-10-20 00:31:23 +09:00
parent 4dd796bb15
commit a1e4a81479
2 changed files with 7 additions and 7 deletions
@@ -6,7 +6,7 @@
() => {
// ------- variable definitions that does not exist in the original code. These are for typescript.
var material: THREE.SpriteMaterial;
var geometry: THREE.JSonLoaderResultGeometry;
var geometry: THREE.Geometry;
var dat:any;
// -------
+6 -6
View File
@@ -923,6 +923,10 @@ declare module THREE {
*/
dispose(): void;
//These properties does not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
bones: Bone[];
animation: AnimationData;
animations: AnimationData[];
// EventDispatcher mixins
addEventListener(type: string, listener: (event: any) => void ): void;
@@ -1778,17 +1782,13 @@ declare module THREE {
* @param callback. This function will be called with the loaded model as an instance of geometry when the load is completed.
* @param texturePath If not specified, textures will be assumed to be in the same folder as the Javascript model file.
*/
load(url: string, callback: (geometry: JSonLoaderResultGeometry, materials: Material[]) => void , texturePath?: string): void;
load(url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string): void;
loadAjaxJSON(context: JSONLoader, url: string, callback: (geometry: Geometry, materials: Material[]) => void , texturePath?: string, callbackProgress?: (progress: Progress) => void ): void;
parse(json: any, texturePath?: string): { geometry: Geometry; materials?: Material[] };
}
export interface JSonLoaderResultGeometry extends Geometry {
animation: AnimationData;
}
/**
* Handles and keeps track of loaded and pending data.
*/
@@ -5018,7 +5018,7 @@ declare module THREE {
animations: any[];
init(data: Animation): void;
init(data: AnimationData): void;
parse(root: Mesh): Object3D[];
play(animation: Animation): void;
stop(animation: Animation): void;