From 55a25048a85c50e52c46706154dc3144d378dd9a Mon Sep 17 00:00:00 2001 From: Kasidit Iamthong Date: Mon, 4 Jul 2016 04:05:48 +0700 Subject: [PATCH 1/2] Fix THREE.FirstPersonControls and THREE.OrbitControls definition. --- threejs/three-FirstPersonControls.d.ts | 9 +++++---- threejs/three-orbitcontrols.d.ts | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/threejs/three-FirstPersonControls.d.ts b/threejs/three-FirstPersonControls.d.ts index fc13ca8ed9..3bc4f65237 100644 --- a/threejs/three-FirstPersonControls.d.ts +++ b/threejs/three-FirstPersonControls.d.ts @@ -11,6 +11,7 @@ declare namespace THREE { object: THREE.Object3D; target: THREE.Vector3; domElement: HTMLCanvasElement; + enabled: boolean; movementSpeed: number; lookSpeed: number; noFly: boolean; @@ -18,14 +19,13 @@ declare namespace THREE { autoForward: boolean; activeLook: boolean; heightSpeed: boolean; - heightCoef: boolean; - heightMin: boolean; + heightCoef: number; + heightMin: number; + heightMax: number; constrainVertical: boolean; verticalMin: number; verticalMax: number; autoSpeedFactor: number; - mouseX: number; - mouseY: number; lat: number; lon: number; phi: number; @@ -37,5 +37,6 @@ declare namespace THREE { freeze: boolean; mouseDragOn: boolean; update(delta?: number): void; + dispose(): void; } } diff --git a/threejs/three-orbitcontrols.d.ts b/threejs/three-orbitcontrols.d.ts index 910a658334..2813c615db 100644 --- a/threejs/three-orbitcontrols.d.ts +++ b/threejs/three-orbitcontrols.d.ts @@ -49,6 +49,7 @@ declare namespace THREE { dollyOut(dollyScale: number): void; update(): void; reset(): void; + dispose(): void; getPolarAngle(): number; getAzimuthalAngle(): number; From 4d586d46ce710874d7a6a12caf8d985eb2ff8c4c Mon Sep 17 00:00:00 2001 From: Kasidit Iamthong Date: Mon, 4 Jul 2016 08:07:34 +0700 Subject: [PATCH 2/2] Revert removal of `mouseX` and `mouseY`. Correct `domElement` type and `update` parameter. --- threejs/three-FirstPersonControls.d.ts | 6 ++++-- threejs/three-orbitcontrols.d.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/threejs/three-FirstPersonControls.d.ts b/threejs/three-FirstPersonControls.d.ts index 3bc4f65237..9f6db3ec6c 100644 --- a/threejs/three-FirstPersonControls.d.ts +++ b/threejs/three-FirstPersonControls.d.ts @@ -10,7 +10,7 @@ declare namespace THREE { constructor(object: Camera, domElement?: HTMLElement); object: THREE.Object3D; target: THREE.Vector3; - domElement: HTMLCanvasElement; + domElement: HTMLCanvasElement | HTMLDocument; enabled: boolean; movementSpeed: number; lookSpeed: number; @@ -26,6 +26,8 @@ declare namespace THREE { verticalMin: number; verticalMax: number; autoSpeedFactor: number; + mouseX: number; + mouseY: number; lat: number; lon: number; phi: number; @@ -36,7 +38,7 @@ declare namespace THREE { moveRight: boolean; freeze: boolean; mouseDragOn: boolean; - update(delta?: number): void; + update(delta: number): void; dispose(): void; } } diff --git a/threejs/three-orbitcontrols.d.ts b/threejs/three-orbitcontrols.d.ts index 2813c615db..cb1ffd21d5 100644 --- a/threejs/three-orbitcontrols.d.ts +++ b/threejs/three-orbitcontrols.d.ts @@ -10,7 +10,7 @@ declare namespace THREE { constructor(object: Camera, domElement?: HTMLElement); object: Camera; - domElement: HTMLElement; + domElement: HTMLElement | HTMLDocument; // API enabled: boolean;