Browse Source

DragControls/OrbitControls/TrackballControls: wheel/touchmove/touchstart add { passive: false } (#21642)

* DragControls: touchmove/touchstart add { passive: false }

* OrbitControls: wheel/touchmove/touchstart add { passive: false }

* TrackballControls: wheel/touchmove/touchstart add { passive: false }
puxiao 4 years ago
parent
commit
4036a220bd

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

@@ -36,8 +36,8 @@ class DragControls extends EventDispatcher {
 			_domElement.addEventListener( 'pointerdown', onPointerDown );
 			_domElement.addEventListener( 'pointerup', onPointerCancel );
 			_domElement.addEventListener( 'pointerleave', onPointerCancel );
-			_domElement.addEventListener( 'touchmove', onTouchMove );
-			_domElement.addEventListener( 'touchstart', onTouchStart );
+			_domElement.addEventListener( 'touchmove', onTouchMove, { passive: false } );
+			_domElement.addEventListener( 'touchstart', onTouchStart, { passive: false } );
 			_domElement.addEventListener( 'touchend', onTouchEnd );
 
 		}

+ 3 - 3
examples/jsm/controls/OrbitControls.js

@@ -1187,11 +1187,11 @@ class OrbitControls extends EventDispatcher {
 		scope.domElement.addEventListener( 'contextmenu', onContextMenu );
 
 		scope.domElement.addEventListener( 'pointerdown', onPointerDown );
-		scope.domElement.addEventListener( 'wheel', onMouseWheel );
+		scope.domElement.addEventListener( 'wheel', onMouseWheel, { passive: false } );
 
-		scope.domElement.addEventListener( 'touchstart', onTouchStart );
+		scope.domElement.addEventListener( 'touchstart', onTouchStart, { passive: false } );
 		scope.domElement.addEventListener( 'touchend', onTouchEnd );
-		scope.domElement.addEventListener( 'touchmove', onTouchMove );
+		scope.domElement.addEventListener( 'touchmove', onTouchMove, { passive: false } );
 
 		// force an update at start
 

+ 3 - 3
examples/jsm/controls/TrackballControls.js

@@ -725,11 +725,11 @@ class TrackballControls extends EventDispatcher {
 		this.domElement.addEventListener( 'contextmenu', contextmenu );
 
 		this.domElement.addEventListener( 'pointerdown', onPointerDown );
-		this.domElement.addEventListener( 'wheel', mousewheel );
+		this.domElement.addEventListener( 'wheel', mousewheel, { passive: false } );
 
-		this.domElement.addEventListener( 'touchstart', touchstart );
+		this.domElement.addEventListener( 'touchstart', touchstart, { passive: false } );
 		this.domElement.addEventListener( 'touchend', touchend );
-		this.domElement.addEventListener( 'touchmove', touchmove );
+		this.domElement.addEventListener( 'touchmove', touchmove, { passive: false } );
 
 		this.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove );
 		this.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp );