|
@@ -75,30 +75,38 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
var object = transformControls.object;
|
|
|
|
|
|
- if ( object != null ) {
|
|
|
+ if ( object !== null ) {
|
|
|
|
|
|
switch ( transformControls.getMode() ) {
|
|
|
|
|
|
case 'translate':
|
|
|
- if (!objectPositionOnDown.equals(object.position)) {
|
|
|
|
|
|
- editor.execute(new SetPositionCommand( object, object.position, objectPositionOnDown ));
|
|
|
+ if ( ! objectPositionOnDown.equals( object.position ) ) {
|
|
|
+
|
|
|
+ editor.execute( new SetPositionCommand( object, object.position, objectPositionOnDown ) );
|
|
|
|
|
|
}
|
|
|
+
|
|
|
break;
|
|
|
+
|
|
|
case 'rotate':
|
|
|
- if (!objectRotationOnDown.equals(object.rotation)) {
|
|
|
|
|
|
- editor.execute(new SetRotationCommand( object, object.rotation, objectRotationOnDown ));
|
|
|
+ if ( ! objectRotationOnDown.equals( object.rotation ) ) {
|
|
|
+
|
|
|
+ editor.execute( new SetRotationCommand( object, object.rotation, objectRotationOnDown ) );
|
|
|
|
|
|
}
|
|
|
+
|
|
|
break;
|
|
|
+
|
|
|
case 'scale':
|
|
|
- if (!objectScaleOnDown.equals(object.scale)) {
|
|
|
|
|
|
- editor.execute(new SetScaleCommand( object, object.scale, objectScaleOnDown ));
|
|
|
+ if ( ! objectScaleOnDown.equals( object.scale ) ) {
|
|
|
+
|
|
|
+ editor.execute( new SetScaleCommand( object, object.scale, objectScaleOnDown ) );
|
|
|
|
|
|
}
|
|
|
+
|
|
|
break;
|
|
|
|
|
|
}
|
|
@@ -134,7 +142,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
return raycaster.intersectObjects( objects );
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
var onDownPosition = new THREE.Vector2();
|
|
|
var onUpPosition = new THREE.Vector2();
|
|
@@ -145,11 +153,11 @@ var Viewport = function ( editor ) {
|
|
|
var rect = dom.getBoundingClientRect();
|
|
|
return [ ( x - rect.left ) / rect.width, ( y - rect.top ) / rect.height ];
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function handleClick() {
|
|
|
|
|
|
- if ( onDownPosition.distanceTo( onUpPosition ) == 0 ) {
|
|
|
+ if ( onDownPosition.distanceTo( onUpPosition ) === 0 ) {
|
|
|
|
|
|
var intersects = getIntersects( onUpPosition, objects );
|
|
|
|
|
@@ -179,7 +187,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function onMouseDown( event ) {
|
|
|
|
|
@@ -190,7 +198,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
document.addEventListener( 'mouseup', onMouseUp, false );
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function onMouseUp( event ) {
|
|
|
|
|
@@ -201,7 +209,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
document.removeEventListener( 'mouseup', onMouseUp, false );
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function onTouchStart( event ) {
|
|
|
|
|
@@ -212,7 +220,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
document.addEventListener( 'touchend', onTouchEnd, false );
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function onTouchEnd( event ) {
|
|
|
|
|
@@ -225,7 +233,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
document.removeEventListener( 'touchend', onTouchEnd, false );
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
function onDoubleClick( event ) {
|
|
|
|
|
@@ -242,7 +250,7 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
container.dom.addEventListener( 'mousedown', onMouseDown, false );
|
|
|
container.dom.addEventListener( 'touchstart', onTouchStart, false );
|
|
@@ -587,4 +595,4 @@ var Viewport = function ( editor ) {
|
|
|
|
|
|
return container;
|
|
|
|
|
|
-}
|
|
|
+};
|