DragControls: Add mouseButtons

mrdoob · Aug 6, 2024 · 66a3704 · 66a3704
1 parent 364f90e
commit 66a3704
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/docs/examples/en/controls/DragControls.html b/docs/examples/en/controls/DragControls.html
@@ -95,6 +95,13 @@ <h3>hoveroff</h3>
 
 		<h2>Properties</h2>
 
+		<h3>[property:Array mouseButtons]</h3>
+		<p>
+			The array of allowed MouseEvent.button values for drag interactions. 
+			<br>
+			Default is [ THREE.MOUSE.LEFT, THREE.MOUSE.RIGHT, THREE.MOUSE.MIDDLE ].
+		</p>
+
 		<h3>[property:Boolean enabled]</h3>
 		<p>
 			Whether or not the controls are enabled.

diff --git a/docs/examples/zh/controls/DragControls.html b/docs/examples/zh/controls/DragControls.html
@@ -97,6 +97,13 @@ <h3>hoveroff</h3>
 
 		<h2>属性</h2>
 
+		<h3>[property:Array mouseButtons]</h3>
+		<p>
+			鼠标事件中允许响应的按键值数组。 
+			<br>
+			默认值为 [ THREE.MOUSE.LEFT, THREE.MOUSE.RIGHT, THREE.MOUSE.MIDDLE ]。
+		</p>
+
 		<h3>[property:Boolean enabled]</h3>
 		<p>
 			是否启用控制器。
@@ -109,7 +116,7 @@ <h3>[property:Boolean transformGroup]</h3>
 
 		<h3>[property:String mode]</h3>
 		<p>
-			The current transformation mode. Possible values are `translate`, and `rotate`. Default is `translate`.
+			当前的变换模式，该值可以是 `translate` 或 `rotate`。 默认值为 `translate`。
 		</p>
 
 		<h2>方法</h2>
@@ -143,7 +150,7 @@ <h3>[method:Raycaster getRaycaster] ()</h3>
 
 		<h3>[method:undefined setObjects] ( [param:Array objects] )</h3>
 		<p>
-			Sets an array of draggable objects by overwriting the existing one.
+			通过覆盖现有数组来设置可拖动对象数组。
 		</p>
 
 		<h2>源代码</h2>

diff --git a/examples/jsm/controls/DragControls.js b/examples/jsm/controls/DragControls.js
@@ -1,6 +1,7 @@
 import {
 	EventDispatcher,
 	Matrix4,
+	MOUSE,
 	Plane,
 	Raycaster,
 	Vector2,
@@ -21,6 +22,9 @@ const _inverseMatrix = new Matrix4();
 const _up = new Vector3();
 const _right = new Vector3();
 
+const _mouseButtons = [ MOUSE.LEFT, MOUSE.RIGHT, MOUSE.MIDDLE ];
+const _mouseMoveButtons = [ 0, 1, 2, 4 ];
+
 class DragControls extends EventDispatcher {
 
 	constructor( _objects, _camera, _domElement ) {
@@ -89,6 +93,8 @@ class DragControls extends EventDispatcher {
 
 			if ( scope.enabled === false ) return;
 
+			if ( event.pointerType === 'mouse' && _mouseMoveButtons.includes( event.buttons ) === false ) return;
+
 			updatePointer( event );
 
 			_raycaster.setFromCamera( _pointer, _camera );
@@ -175,6 +181,8 @@ class DragControls extends EventDispatcher {
 
 			if ( scope.enabled === false ) return;
 
+			if ( event.pointerType === 'mouse' && _mouseButtons.includes( event.button ) === false ) return;
+
 			updatePointer( event );
 
 			_intersections.length = 0;
@@ -277,6 +285,28 @@ class DragControls extends EventDispatcher {
 
 	}
 
+	get mouseButtons() {
+
+		return _mouseButtons;
+
+	}
+
+	set mouseButtons( arr ) {
+
+		_mouseButtons.length = 0;
+		arr.forEach( item => _mouseButtons.push( item ) );
+
+		_mouseMoveButtons.length = 0;
+		_mouseMoveButtons.push( 0 );
+
+		if ( _mouseButtons.includes( MOUSE.LEFT ) ) _mouseMoveButtons.push( 1 );
+
+		if ( _mouseButtons.includes( MOUSE.RIGHT ) ) _mouseMoveButtons.push( 2 );
+
+		if ( _mouseButtons.includes( MOUSE.MIDDLE ) ) _mouseMoveButtons.push( 4 );
+
+	}
+
 }
 
 export { DragControls };