Przeglądaj źródła

Merge pull request #3093 from Kesshi/strictFunctionTypes

fixed TypeScript error in babylon.d.ts if strictFunctionTypes option is enabled (TypeScript 2.6)
David Catuhe 7 lat temu
rodzic
commit
0c2ba69ea3

+ 1 - 1
src/Cameras/Inputs/babylon.arcRotateCameraGamepadInput.ts

@@ -32,7 +32,7 @@ module BABYLON {
             this.gamepad = manager.getGamepadByType(Gamepad.XBOX);
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             this.camera.getScene().gamepadManager.onGamepadConnectedObservable.remove(this._onGamepadConnectedObserver);            
             this.camera.getScene().gamepadManager.onGamepadDisconnectedObservable.remove(this._onGamepadDisconnectedObserver);
             this.gamepad = null;

+ 1 - 1
src/Cameras/Inputs/babylon.arcRotateCameraKeyboardMoveInput.ts

@@ -93,7 +93,7 @@ module BABYLON {
             });    
         }
 
-        public detachControl(element: HTMLElement) {
+        public detachControl(element: Nullable<HTMLElement>) {
             if (this._scene) {
                 if (this._onKeyboardObserver) {
                     this._scene.onKeyboardObservable.remove(this._onKeyboardObserver);

+ 1 - 1
src/Cameras/Inputs/babylon.arcRotateCameraMouseWheelInput.ts

@@ -41,7 +41,7 @@ module BABYLON {
             this._observer = this.camera.getScene().onPointerObservable.add(this._wheel, PointerEventTypes.POINTERWHEEL);
         }
 
-        public detachControl(element: HTMLElement) {
+        public detachControl(element: Nullable<HTMLElement>) {
             if (this._observer && element) {
                 this.camera.getScene().onPointerObservable.remove(this._observer);
                 this._observer = null;

+ 1 - 1
src/Cameras/Inputs/babylon.arcRotateCameraPointersInput.ts

@@ -314,7 +314,7 @@ module BABYLON {
             ]);
         }
 
-        public detachControl(element: HTMLElement) {
+        public detachControl(element: Nullable<HTMLElement>) {
             if (this._onLostFocus) {
                 Tools.UnregisterTopRootEvents([
                     { name: "blur", handler: this._onLostFocus }

+ 1 - 1
src/Cameras/Inputs/babylon.arcRotateCameraVRDeviceOrientationInput.ts

@@ -50,7 +50,7 @@ module BABYLON {
             }
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             window.removeEventListener("deviceorientation", this._deviceOrientationHandler);
         }
 

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraDeviceOrientationInput.ts

@@ -47,7 +47,7 @@ module BABYLON {
             this._gamma = evt.gamma !== null ? evt.gamma : 0;
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             window.removeEventListener("orientationchange", this._orientationChanged);
             window.removeEventListener("deviceorientation", this._deviceOrientation);
         }

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraGamepadInput.ts

@@ -38,7 +38,7 @@ module BABYLON {
             this.gamepad = manager.getGamepadByType(Gamepad.XBOX);
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             this.camera.getScene().gamepadManager.onGamepadConnectedObservable.remove(this._onGamepadConnectedObserver);
             this.camera.getScene().gamepadManager.onGamepadDisconnectedObservable.remove(this._onGamepadDisconnectedObserver);
             this.gamepad = null;

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraKeyboardMoveInput.ts

@@ -66,7 +66,7 @@ module BABYLON {
             });     
         }
 
-        detachControl(element : HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             if (this._scene) {
                 if (this._onKeyboardObserver) {
                     this._scene.onKeyboardObservable.remove(this._onKeyboardObserver);

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraMouseInput.ts

@@ -128,7 +128,7 @@ module BABYLON {
 
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             if (this._observer && element) {
                 this.camera.getScene().onPointerObservable.remove(this._observer);
 

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraTouchInput.ts

@@ -98,7 +98,7 @@ module BABYLON {
             }
         }
 
-        detachControl(element: HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             if (this._pointerInput && element) {
                 if (this._observer) {
                     this.camera.getScene().onPointerObservable.remove(this._observer);

+ 1 - 1
src/Cameras/Inputs/babylon.freeCameraVirtualJoystickInput.ts

@@ -44,7 +44,7 @@ module BABYLON {
             this._rightjoystick.setJoystickColor("yellow");
         }
 
-        detachControl(element : HTMLElement) {
+        detachControl(element: Nullable<HTMLElement>) {
             this._leftjoystick.releaseCanvas();
             this._rightjoystick.releaseCanvas();
         }

+ 0 - 2
src/Tools/babylon.assetsManager.ts

@@ -186,8 +186,6 @@ module BABYLON {
     }
 
     export interface ITextureAssetTask extends IAssetTask {
-        onSuccess: (task: ITextureAssetTask) => void;
-        onError: (task: ITextureAssetTask, ) => void;
         texture: Texture;
     }