Jelajahi Sumber

Code clean up.

Mr.doob 12 tahun lalu
induk
melakukan
e27236b781
2 mengubah file dengan 26 tambahan dan 18 penghapusan
  1. 21 13
      editor/js/Viewport.js
  2. 5 5
      examples/js/controls/TransformControls.js

+ 21 - 13
editor/js/Viewport.js

@@ -41,11 +41,19 @@ var Viewport = function ( editor ) {
 	var transformControls = new THREE.TransformControls( camera, container.dom );
 	transformControls.addEventListener( 'change', function () {
 
-        controls.enabled = true;
+		controls.enabled = true;
 
-        if ( transformControls.axis ) controls.enabled = false;
-        
-		if ( editor.selected ) signals.objectChanged.dispatch( editor.selected );
+		if ( transformControls.axis !== undefined ) {
+
+			controls.enabled = false;
+
+		}
+
+		if ( editor.selected !== null ) {
+
+			signals.objectChanged.dispatch( editor.selected );
+
+		}
 
 	} );
 	sceneHelpers.add( transformControls );
@@ -67,9 +75,9 @@ var Viewport = function ( editor ) {
 
 	var getIntersects = function ( event, object ) {
 
-	    var rect = container.dom.getBoundingClientRect();
-	    x = (event.clientX - rect.left) / rect.width;
-	    y = (event.clientY - rect.top) / rect.height;
+		var rect = container.dom.getBoundingClientRect();
+		x = (event.clientX - rect.left) / rect.width;
+		y = (event.clientY - rect.top) / rect.height;
 		var vector = new THREE.Vector3( ( x ) * 2 - 1, - ( y ) * 2 + 1, 0.5 );
 
 		projector.unprojectVector( vector, camera );
@@ -93,9 +101,9 @@ var Viewport = function ( editor ) {
 
 		event.preventDefault();
 
-	    var rect = container.dom.getBoundingClientRect();
-	    x = (event.clientX - rect.left) / rect.width;
-	    y = (event.clientY - rect.top) / rect.height;
+		var rect = container.dom.getBoundingClientRect();
+		x = (event.clientX - rect.left) / rect.width;
+		y = (event.clientY - rect.top) / rect.height;
 		onMouseDownPosition.set( x, y );
 
 		document.addEventListener( 'mouseup', onMouseUp, false );
@@ -104,9 +112,9 @@ var Viewport = function ( editor ) {
 
 	var onMouseUp = function ( event ) {
 
-	    var rect = container.dom.getBoundingClientRect();
-	    x = (event.clientX - rect.left) / rect.width;
-	    y = (event.clientY - rect.top) / rect.height;
+		var rect = container.dom.getBoundingClientRect();
+		x = (event.clientX - rect.left) / rect.width;
+		y = (event.clientY - rect.top) / rect.height;
 		onMouseUpPosition.set( x, y );
 
 		if ( onMouseDownPosition.distanceTo( onMouseUpPosition ) == 0 ) {

+ 5 - 5
examples/js/controls/TransformControls.js

@@ -740,7 +740,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 		event.preventDefault();
 
-		var pointer = event.touches? event.touches[0] : event;
+		var pointer = event.touches ? event.touches[ 0 ] : event;
 
 		var intersect = intersectObjects( pointer, scope.gizmo[_mode].pickers.children );
 
@@ -767,7 +767,7 @@ THREE.TransformControls = function ( camera, domElement ) {
 		event.preventDefault();
 		event.stopPropagation();
 
-		var pointer = event.touches? event.touches[0] : event;
+		var pointer = event.touches ? event.touches[ 0 ] : event;
 
 		if ( pointer.button === 0 || pointer.button === undefined ) {
 
@@ -981,9 +981,9 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 	function intersectObjects( pointer, objects ) {
 
-	    var rect = domElement.getBoundingClientRect();
-	    var x = (pointer.clientX - rect.left) / rect.width;
-	    var y = (pointer.clientY - rect.top) / rect.height;
+		var rect = domElement.getBoundingClientRect();
+		var x = (pointer.clientX - rect.left) / rect.width;
+		var y = (pointer.clientY - rect.top) / rect.height;
 		pointerVector.set( ( x ) * 2 - 1, - ( y ) * 2 + 1, 0.5 );
 
 		projector.unprojectVector( pointerVector, camera );