Controls: Move into core. (#29136)

mrdoob · Aug 14, 2024 · bf6dfd5 · bf6dfd5
1 parent 3ce950f
commit bf6dfd5
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 11 deletions.
diff --git a/docs/examples/en/controls/Controls.html → docs/api/en/extras/Controls.html b/docs/examples/en/controls/Controls.html → docs/api/en/extras/Controls.html
@@ -110,7 +110,7 @@ <h3>[method:undefined update] ( [param:Number delta] )</h3>
 		<h2>Source</h2>
 
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/Controls.js examples/jsm/controls/Controls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 		</p>
 	</body>
 </html>
diff --git a/docs/examples/zh/controls/Controls.html → docs/api/zh/extras/Controls.html b/docs/examples/zh/controls/Controls.html → docs/api/zh/extras/Controls.html
@@ -110,7 +110,7 @@ <h3>[method:undefined update] ( [param:Number delta] )</h3>
 		<h2>源代码</h2>
 
 		<p>
-			[link:https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/Controls.js examples/jsm/controls/Controls.js]
+			[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 		</p>
 	</body>
 </html>
diff --git a/docs/list.json b/docs/list.json
@@ -99,6 +99,7 @@
 			},
 
 			"Extras": {
+				"Controls": "api/en/extras/Controls",
 				"DataUtils": "api/en/extras/DataUtils",
 				"Earcut": "api/en/extras/Earcut",
 				"ImageUtils": "api/en/extras/ImageUtils",
@@ -331,7 +332,6 @@
 
 			"Controls": {
 				"ArcballControls": "examples/en/controls/ArcballControls",
-				"Controls": "examples/en/controls/Controls",
 				"DragControls": "examples/en/controls/DragControls",
 				"FirstPersonControls": "examples/en/controls/FirstPersonControls",
 				"FlyControls": "examples/en/controls/FlyControls",
@@ -854,6 +854,7 @@
 			},
 
 			"附件": {
+				"Controls": "api/zh/extras/Controls",
 				"DataUtils": "api/zh/extras/DataUtils",
 				"Earcut": "api/zh/extras/Earcut",
 				"ImageUtils": "api/zh/extras/ImageUtils",
@@ -1084,7 +1085,6 @@
 
 			"控制": {
 				"ArcballControls": "examples/zh/controls/ArcballControls",
-				"Controls": "examples/zh/controls/Controls",
 				"DragControls": "examples/zh/controls/DragControls",
 				"FirstPersonControls": "examples/zh/controls/FirstPersonControls",
 				"FlyControls": "examples/zh/controls/FlyControls",

diff --git a/examples/jsm/controls/ArcballControls.js b/examples/jsm/controls/ArcballControls.js
@@ -1,4 +1,5 @@
 import {
+	Controls,
 	GridHelper,
 	EllipseCurve,
 	BufferGeometry,
@@ -14,7 +15,6 @@ import {
 	Matrix4,
 	MathUtils
 } from 'three';
-import { Controls } from './Controls.js';
 
 //trackball state
 const STATE = {

diff --git a/examples/jsm/controls/DragControls.js b/examples/jsm/controls/DragControls.js
@@ -1,4 +1,5 @@
 import {
+	Controls,
 	Matrix4,
 	Plane,
 	Raycaster,
@@ -7,7 +8,6 @@ import {
 	MOUSE,
 	TOUCH
 } from 'three';
-import { Controls } from './Controls.js';
 
 const _plane = new Plane();
 

diff --git a/examples/jsm/controls/FirstPersonControls.js b/examples/jsm/controls/FirstPersonControls.js
@@ -1,9 +1,9 @@
 import {
+	Controls,
 	MathUtils,
 	Spherical,
 	Vector3
 } from 'three';
-import { Controls } from './Controls.js';
 
 const _lookDirection = new Vector3();
 const _spherical = new Spherical();

diff --git a/examples/jsm/controls/FlyControls.js b/examples/jsm/controls/FlyControls.js
@@ -1,8 +1,8 @@
 import {
+	Controls,
 	Quaternion,
 	Vector3
 } from 'three';
-import { Controls } from './Controls.js';
 
 const _changeEvent = { type: 'change' };
 

diff --git a/examples/jsm/controls/PointerLockControls.js b/examples/jsm/controls/PointerLockControls.js
@@ -1,8 +1,8 @@
 import {
+	Controls,
 	Euler,
 	Vector3
 } from 'three';
-import { Controls } from './Controls.js';
 
 const _euler = new Euler( 0, 0, 0, 'YXZ' );
 const _vector = new Vector3();

diff --git a/examples/jsm/controls/TrackballControls.js b/examples/jsm/controls/TrackballControls.js
@@ -1,11 +1,11 @@
 import {
+	Controls,
 	MathUtils,
 	MOUSE,
 	Quaternion,
 	Vector2,
 	Vector3
 } from 'three';
-import { Controls } from './Controls.js';
 
 const _changeEvent = { type: 'change' };
 const _startEvent = { type: 'start' };

diff --git a/src/Three.WebGPU.js b/src/Three.WebGPU.js
@@ -152,6 +152,7 @@ export { Path } from './extras/core/Path.js';
 export { ShapePath } from './extras/core/ShapePath.js';
 export { CurvePath } from './extras/core/CurvePath.js';
 export { Curve } from './extras/core/Curve.js';
+export { Controls } from './extras/Controls.js';
 export { DataUtils } from './extras/DataUtils.js';
 export { ImageUtils } from './extras/ImageUtils.js';
 export { ShapeUtils } from './extras/ShapeUtils.js';

diff --git a/src/Three.js b/src/Three.js
@@ -151,6 +151,7 @@ export { Path } from './extras/core/Path.js';
 export { ShapePath } from './extras/core/ShapePath.js';
 export { CurvePath } from './extras/core/CurvePath.js';
 export { Curve } from './extras/core/Curve.js';
+export { Controls } from './extras/Controls.js';
 export { DataUtils } from './extras/DataUtils.js';
 export { ImageUtils } from './extras/ImageUtils.js';
 export { ShapeUtils } from './extras/ShapeUtils.js';

diff --git a/examples/jsm/controls/Controls.js → src/extras/Controls.js b/examples/jsm/controls/Controls.js → src/extras/Controls.js
@@ -1,4 +1,4 @@
-import { EventDispatcher } from 'three';
+import { EventDispatcher } from '../core/EventDispatcher.js';
 
 class Controls extends EventDispatcher {