From 8158a75e87bcd55b83147cf8f3af210d12cb2fb6 Mon Sep 17 00:00:00 2001
From: Flur <superflur@gmail.com>
Date: Sun, 9 Jul 2017 16:41:18 +0300
Subject: [PATCH] - changes accrording to review

---
 types/three/index.d.ts           |  6 +++---
 types/three/three-core.d.ts      |  4 ++--
 types/three/three-ddsloader.d.ts | 10 +++++++++-
 types/three/three-mtlloader.d.ts |  2 +-
 types/three/three-objloader.d.ts |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 2df7c306ed..afe64c399e 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -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;
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 3b89456ba9..a666411d24 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -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;
 
     /**
      *
diff --git a/types/three/three-ddsloader.d.ts b/types/three/three-ddsloader.d.ts
index 7f2587adcc..8d8f85bd0e 100644
--- a/types/three/three-ddsloader.d.ts
+++ b/types/three/three-ddsloader.d.ts
@@ -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;
 
 }
diff --git a/types/three/three-mtlloader.d.ts b/types/three/three-mtlloader.d.ts
index 8cac40cef2..a795a293de 100644
--- a/types/three/three-mtlloader.d.ts
+++ b/types/three/three-mtlloader.d.ts
@@ -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;
 
 }
diff --git a/types/three/three-objloader.d.ts b/types/three/three-objloader.d.ts
index b98a00f9c5..62403eeebb 100644
--- a/types/three/three-objloader.d.ts
+++ b/types/three/three-objloader.d.ts
@@ -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;