OrbitControls: Removed isMouseDown logic.

mrdoob · Aug 30, 2020 · f7455b8 · f7455b8
1 parent 2b477f0
commit f7455b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/examples/js/controls/OrbitControls.js b/examples/js/controls/OrbitControls.js
@@ -814,8 +814,6 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 	}
 
-	var isMouseDown = false;
-
 	function onMouseDown( event ) {
 
 		// Prevent the browser from scrolling.
@@ -915,7 +913,8 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		if ( state !== STATE.NONE ) {
 
-			isMouseDown = true;
+			scope.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
+			scope.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
 
 			scope.dispatchEvent( startEvent );
 
@@ -925,7 +924,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 	function onMouseMove( event ) {
 
-		if ( isMouseDown === false ) return;
+		if ( scope.enabled === false ) return;
 
 		event.preventDefault();
 
@@ -961,16 +960,17 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 	function onMouseUp( event ) {
 
-		if ( isMouseDown === false ) return;
+		if ( scope.enabled === false ) return;
 
 		handleMouseUp( event );
 
+		scope.domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove, false );
+		scope.domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp, false );
+
 		scope.dispatchEvent( endEvent );
 
 		state = STATE.NONE;
 
-		isMouseDown = false;
-
 	}
 
 	function onMouseWheel( event ) {
@@ -1170,9 +1170,6 @@ THREE.OrbitControls = function ( object, domElement ) {
 	scope.domElement.addEventListener( 'touchend', onTouchEnd, false );
 	scope.domElement.addEventListener( 'touchmove', onTouchMove, false );
 
-	scope.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
-	scope.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
-
 	scope.domElement.addEventListener( 'keydown', onKeyDown, false );
 
 	// make sure element can receive keys.

diff --git a/examples/jsm/controls/OrbitControls.js b/examples/jsm/controls/OrbitControls.js
@@ -822,8 +822,6 @@ var OrbitControls = function ( object, domElement ) {
 
 	}
 
-	var isMouseDown = false;
-
 	function onMouseDown( event ) {
 
 		// Prevent the browser from scrolling.
@@ -923,7 +921,8 @@ var OrbitControls = function ( object, domElement ) {
 
 		if ( state !== STATE.NONE ) {
 
-			isMouseDown = true;
+			scope.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
+			scope.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
 
 			scope.dispatchEvent( startEvent );
 
@@ -933,7 +932,7 @@ var OrbitControls = function ( object, domElement ) {
 
 	function onMouseMove( event ) {
 
-		if ( isMouseDown === false ) return;
+		if ( scope.enabled === false ) return;
 
 		event.preventDefault();
 
@@ -969,16 +968,17 @@ var OrbitControls = function ( object, domElement ) {
 
 	function onMouseUp( event ) {
 
-		if ( isMouseDown === false ) return;
+		if ( scope.enabled === false ) return;
 
 		handleMouseUp( event );
 
+		scope.domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove, false );
+		scope.domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp, false );
+
 		scope.dispatchEvent( endEvent );
 
 		state = STATE.NONE;
 
-		isMouseDown = false;
-
 	}
 
 	function onMouseWheel( event ) {
@@ -1178,9 +1178,6 @@ var OrbitControls = function ( object, domElement ) {
 	scope.domElement.addEventListener( 'touchend', onTouchEnd, false );
 	scope.domElement.addEventListener( 'touchmove', onTouchMove, false );
 
-	scope.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
-	scope.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
-
 	scope.domElement.addEventListener( 'keydown', onKeyDown, false );
 
 	// make sure element can receive keys.