Controls: Move into core. (#1192)

* Controls: Move into core. * Update three.js
three-types · Aug 25, 2024 · 1d9fa7a · 1d9fa7a
1 parent 7f03b0f
commit 1d9fa7a
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 15 deletions.
diff --git a/three.js b/three.js
diff --git a/types/three/examples/jsm/controls/ArcballControls.d.ts b/types/three/examples/jsm/controls/ArcballControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera, Raycaster, Scene } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls, Raycaster, Scene } from "three";
 
 export type ArcballControlsMouseActionOperation = "PAN" | "ROTATE" | "ZOOM" | "FOV";
 

diff --git a/types/three/examples/jsm/controls/DragControls.d.ts b/types/three/examples/jsm/controls/DragControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera, MOUSE, Object3D, Raycaster, TOUCH } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls, MOUSE, Object3D, Raycaster, TOUCH } from "three";
 
 export interface DragControlsEventMap {
     /**

diff --git a/types/three/examples/jsm/controls/FirstPersonControls.d.ts b/types/three/examples/jsm/controls/FirstPersonControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera, Vector3 } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls, Vector3 } from "three";
 
 /**
  * This class is an alternative implementation of {@link FlyControls}.

diff --git a/types/three/examples/jsm/controls/FlyControls.d.ts b/types/three/examples/jsm/controls/FlyControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls } from "three";
 
 export interface FlyControlsEventMap {
     /**

diff --git a/types/three/examples/jsm/controls/PointerLockControls.d.ts b/types/three/examples/jsm/controls/PointerLockControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera, Vector3 } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls, Vector3 } from "three";
 
 export interface PointerLockControlsEventMap {
     /**

diff --git a/types/three/examples/jsm/controls/TrackballControls.d.ts b/types/three/examples/jsm/controls/TrackballControls.d.ts
@@ -1,5 +1,4 @@
-import { Camera, MOUSE, Vector3 } from "three";
-import { Controls } from "./Controls.js";
+import { Camera, Controls, MOUSE, Vector3 } from "three";
 
 export interface TrackballControlsEventMap {
     /**

diff --git a/types/three/src/Three.WebGPU.d.ts b/types/three/src/Three.WebGPU.d.ts
@@ -40,6 +40,7 @@ export * from "./core/Raycaster.js";
 export * from "./core/RenderTarget.js";
 export * from "./core/Uniform.js";
 export * from "./core/UniformsGroup.js";
+export * from "./extras/Controls.js";
 export * from "./extras/core/Curve.js";
 export * from "./extras/core/CurvePath.js";
 export * from "./extras/core/Path.js";

diff --git a/types/three/src/Three.d.ts b/types/three/src/Three.d.ts
@@ -40,6 +40,7 @@ export * from "./core/Raycaster.js";
 export * from "./core/RenderTarget.js";
 export * from "./core/Uniform.js";
 export * from "./core/UniformsGroup.js";
+export * from "./extras/Controls.js";
 export * from "./extras/core/Curve.js";
 export * from "./extras/core/CurvePath.js";
 export * from "./extras/core/Path.js";

diff --git a/...three/examples/jsm/controls/Controls.d.ts → types/three/src/extras/Controls.d.ts b/...three/examples/jsm/controls/Controls.d.ts → types/three/src/extras/Controls.d.ts
@@ -1,5 +1,5 @@
-import { Camera } from "../../../src/cameras/Camera.js";
-import { EventDispatcher } from "../../../src/core/EventDispatcher.js";
+import { Camera } from "../cameras/Camera.js";
+import { EventDispatcher } from "../core/EventDispatcher.js";
 
 /**
  * Abstract base class for controls.
+30 −0		build/three.cjs
+30 −1		build/three.module.js
+1 −1		build/three.module.min.js
+89 −27		build/three.webgpu.js
+1 −1		build/three.webgpu.min.js
+1 −1		docs/api/en/extras/Controls.html
+1 −1		docs/api/zh/extras/Controls.html
+2 −2		docs/list.json
+1 −1		examples/jsm/controls/ArcballControls.js
+1 −1		examples/jsm/controls/DragControls.js
+1 −1		examples/jsm/controls/FirstPersonControls.js
+1 −1		examples/jsm/controls/FlyControls.js
+1 −1		examples/jsm/controls/PointerLockControls.js
+1 −1		examples/jsm/controls/TrackballControls.js
+1 −0		package.json
+1 −0		src/Three.WebGPU.js
+1 −0		src/Three.js
+1 −1		src/extras/Controls.js
+11 −7		src/nodes/accessors/InstanceNode.js
+11 −4		src/nodes/accessors/SkinningNode.js
+16 −15		src/renderers/webgl-fallback/WebGLBackend.js
+21 −0		src/renderers/webgl-fallback/utils/WebGLState.js
+21 −2		test/e2e/puppeteer.js