2
0
Эх сурвалжийг харах

Controls: Remove usage of changedTouches. (#21959)

Michael Herzog 4 жил өмнө
parent
commit
5bd6f6d9a4

+ 7 - 5
examples/js/controls/DragControls.js

@@ -65,11 +65,12 @@
 
 			function onPointerMove( event ) {
 
+				if ( scope.enabled === false ) return;
 				updatePointer( event );
 
 				_raycaster.setFromCamera( _pointer, _camera );
 
-				if ( _selected && scope.enabled ) {
+				if ( _selected ) {
 
 					if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
 
@@ -143,6 +144,7 @@
 
 			function onPointerDown() {
 
+				if ( scope.enabled === false ) return;
 				_domElement.style.touchAction = 'none';
 				updatePointer( event );
 				_intersections.length = 0;
@@ -177,6 +179,8 @@
 
 			function onPointerCancel() {
 
+				if ( scope.enabled === false ) return;
+
 				if ( _selected ) {
 
 					scope.dispatchEvent( {
@@ -194,12 +198,10 @@
 
 			function updatePointer( event ) {
 
-				const e = event.changedTouches ? event.changedTouches[ 0 ] : event;
-
 				const rect = _domElement.getBoundingClientRect();
 
-				_pointer.x = ( e.clientX - rect.left ) / rect.width * 2 - 1;
-				_pointer.y = - ( e.clientY - rect.top ) / rect.height * 2 + 1;
+				_pointer.x = ( event.clientX - rect.left ) / rect.width * 2 - 1;
+				_pointer.y = - ( event.clientY - rect.top ) / rect.height * 2 + 1;
 
 			}
 

+ 2 - 3
examples/js/controls/TransformControls.js

@@ -617,11 +617,10 @@
 
 		} else {
 
-			const pointer = event.changedTouches ? event.changedTouches[ 0 ] : event;
 			const rect = this.domElement.getBoundingClientRect();
 			return {
-				x: ( pointer.clientX - rect.left ) / rect.width * 2 - 1,
-				y: - ( pointer.clientY - rect.top ) / rect.height * 2 + 1,
+				x: ( event.clientX - rect.left ) / rect.width * 2 - 1,
+				y: - ( event.clientY - rect.top ) / rect.height * 2 + 1,
 				button: event.button
 			};
 

+ 2 - 4
examples/jsm/controls/DragControls.js

@@ -188,12 +188,10 @@ class DragControls extends EventDispatcher {
 
 		function updatePointer( event ) {
 
-			const e = event.changedTouches ? event.changedTouches[ 0 ] : event;
-
 			const rect = _domElement.getBoundingClientRect();
 
-			_pointer.x = ( e.clientX - rect.left ) / rect.width * 2 - 1;
-			_pointer.y = - ( e.clientY - rect.top ) / rect.height * 2 + 1;
+			_pointer.x = ( event.clientX - rect.left ) / rect.width * 2 - 1;
+			_pointer.y = - ( event.clientY - rect.top ) / rect.height * 2 + 1;
 
 		}
 

+ 2 - 4
examples/jsm/controls/TransformControls.js

@@ -654,13 +654,11 @@ function getPointer( event ) {
 
 	} else {
 
-		const pointer = event.changedTouches ? event.changedTouches[ 0 ] : event;
-
 		const rect = this.domElement.getBoundingClientRect();
 
 		return {
-			x: ( pointer.clientX - rect.left ) / rect.width * 2 - 1,
-			y: - ( pointer.clientY - rect.top ) / rect.height * 2 + 1,
+			x: ( event.clientX - rect.left ) / rect.width * 2 - 1,
+			y: - ( event.clientY - rect.top ) / rect.height * 2 + 1,
 			button: event.button
 		};