Merge pull request mrdoob#11174 from WestLangley/dev-orbit

OrbitControls: clean up
apple01150525 · Apr 13, 2017 · 4020010 · 4020010
2 parents 3831f6f + 501c06b
commit 4020010
Showing 1 changed file with 37 additions and 21 deletions.
diff --git a/examples/js/controls/OrbitControls.js b/examples/js/controls/OrbitControls.js
@@ -662,29 +662,37 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		event.preventDefault();
 
-		if ( event.button === scope.mouseButtons.ORBIT ) {
+		switch ( event.button ) {
 
-			if ( scope.enableRotate === false ) return;
+			case scope.mouseButtons.ORBIT:
 
-			handleMouseDownRotate( event );
+				if ( scope.enableRotate === false ) return;
+
+				handleMouseDownRotate( event );
+
+				state = STATE.ROTATE;
+
+				break;
 
-			state = STATE.ROTATE;
+			case scope.mouseButtons.ZOOM:
 
-		} else if ( event.button === scope.mouseButtons.ZOOM ) {
+				if ( scope.enableZoom === false ) return;
 
-			if ( scope.enableZoom === false ) return;
+				handleMouseDownDolly( event );
 
-			handleMouseDownDolly( event );
+				state = STATE.DOLLY;
 
-			state = STATE.DOLLY;
+				break;
 
-		} else if ( event.button === scope.mouseButtons.PAN ) {
+			case scope.mouseButtons.PAN:
 
-			if ( scope.enablePan === false ) return;
+				if ( scope.enablePan === false ) return;
 
-			handleMouseDownPan( event );
+				handleMouseDownPan( event );
 
-			state = STATE.PAN;
+				state = STATE.PAN;
+
+				break;
 
 		}
 
@@ -705,23 +713,31 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		event.preventDefault();
 
-		if ( state === STATE.ROTATE ) {
+		switch ( state ) {
 
-			if ( scope.enableRotate === false ) return;
+			case STATE.ROTATE:
 
-			handleMouseMoveRotate( event );
+				if ( scope.enableRotate === false ) return;
+
+				handleMouseMoveRotate( event );
+
+				break;
+
+			case STATE.DOLLY:
 
-		} else if ( state === STATE.DOLLY ) {
+				if ( scope.enableZoom === false ) return;
 
-			if ( scope.enableZoom === false ) return;
+				handleMouseMoveDolly( event );
 
-			handleMouseMoveDolly( event );
+				break;
 
-		} else if ( state === STATE.PAN ) {
+			case STATE.PAN:
 
-			if ( scope.enablePan === false ) return;
+				if ( scope.enablePan === false ) return;
 
-			handleMouseMovePan( event );
+				handleMouseMovePan( event );
+
+				break;
 
 		}