- changes accrording to review

This commit is contained in:
Flur
2017-07-09 16:41:18 +03:00
parent 2d0f4f99e2
commit 8158a75e87
5 changed files with 16 additions and 8 deletions
+3 -3
View File
@@ -10,11 +10,14 @@ export * from "./three-colladaLoader";
export * from "./three-copyshader";
export * from "./three-css3drenderer";
export * from "./three-ctmloader";
export * from "./three-ddsloader";
export * from "./three-editorcontrols";
export * from "./three-effectcomposer";
export * from "./three-examples";
export * from "./three-FirstPersonControls";
export * from "./three-maskpass";
export * from "./three-mtlloader";
export * from "./three-objloader";
export * from "./three-octree";
export * from "./three-orbitcontrols";
export * from "./three-orthographictrackballcontrols";
@@ -25,8 +28,5 @@ export * from "./three-trackballcontrols";
export * from "./three-transformcontrols";
export * from "./three-vrcontrols";
export * from "./three-vreffect";
export * from "./three-objloader";
export * from "./three-mtlloader";
export * from "./three-ddsloader";
export as namespace THREE;
+2 -2
View File
@@ -1609,13 +1609,13 @@ export class Object3D extends EventDispatcher {
* Calls before rendering object
*/
onBeforeRender: (renderer: THREE.WebGLRenderer, scene: THREE.Scene, camera: THREE.Camera, geometry: THREE.Geometry | THREE.BufferGeometry,
material: THREE.Material, group: THREE.Group) => any;
material: THREE.Material, group: THREE.Group) => void;
/**
* Calls after rendering object
*/
onAfterRender: (renderer: THREE.WebGLRenderer, scene: THREE.Scene, camera: THREE.Camera, geometry: THREE.Geometry | THREE.BufferGeometry,
material: THREE.Material, group: THREE.Group) => any;
material: THREE.Material, group: THREE.Group) => void;
/**
*
+9 -1
View File
@@ -2,10 +2,18 @@
import {CompressedPixelFormat, CompressedTextureLoader} from "./three-core";
export interface Dds {
mipmaps: ImageData[],
width: number,
height: number,
format: CompressedPixelFormat,
mipmapCount: number
}
export class DDSLoader extends CompressedTextureLoader {
constructor();
parse(buffer: string, loadMipmaps: boolean) : { mipmaps: { data: Uint8Array, width: number, height: number }[], width: number, height: number, format: CompressedPixelFormat, mipmapCount: number };
parse(buffer: string, loadMipmaps: boolean) : Dds;
}
+1 -1
View File
@@ -49,6 +49,6 @@ export class MaterialCreator {
create( materialName: string ) : Material;
createMaterial_( materialName: string ) : Material;
getTextureParams( value: string, matParams: any ) : any;
loadTexture(url: string, mapping: any, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): Texture;
loadTexture(url: string, mapping: any, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): Texture;
}
+1 -1
View File
@@ -13,7 +13,7 @@ export class OBJLoader {
materials: Material[];
path: string;
load(url: string, onLoad: (group: Group) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
load(url: string, onLoad: (group: Group) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
parse(data: string) : Group;
setPath(value: string) : void;
setMaterials(materials: MaterialCreator) : void;