Browse Source

Editor: More controls tweaks.
Not perfect yet. But good for now.

Mr.doob 12 years ago
parent
commit
ce1bb232b7
2 changed files with 5 additions and 5 deletions
  1. 4 4
      editor/js/Viewport.js
  2. 1 1
      examples/js/controls/EditorControls.js

+ 4 - 4
editor/js/Viewport.js

@@ -99,6 +99,8 @@ var Viewport = function ( signals ) {
 
 		onMouseDownPosition.set( event.layerX, event.layerY );
 
+		controls.enabled = true;
+
 		document.addEventListener( 'mousemove', onMouseMove, false );
 		document.addEventListener( 'mouseup', onMouseUp, false );
 
@@ -132,20 +134,18 @@ var Viewport = function ( signals ) {
 
 			} else {
 
-				controls.enabled = true;
-
 				selected = camera;
 
 				signals.objectSelected.dispatch( selected );
 
 			}
 
-			controls.enabled = false;
-
 			render();
 
 		}
 
+		controls.enabled = false;
+
 		document.removeEventListener( 'mousemove', onMouseMove );
 		document.removeEventListener( 'mouseup', onMouseUp );
 

+ 1 - 1
examples/js/controls/EditorControls.js

@@ -159,7 +159,7 @@ THREE.EditorControls = function ( object, domElement ) {
 
 	function onMouseWheel( event ) {
 
-		if ( scope.enabled === false ) return;
+		// if ( scope.enabled === false ) return;
 
 		var delta = 0;