From 9171dc3ff640eba4bda2c0422dd43dee2777f773 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 19 Sep 2014 21:22:03 -0400 Subject: [PATCH] TransformControls: Removed objectChange event. MouseUp event makes it redundant. --- editor/js/Viewport.js | 8 ++------ examples/js/controls/TransformControls.js | 21 ++++++++++----------- examples/misc_controls_transform.html | 3 +-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/editor/js/Viewport.js b/editor/js/Viewport.js index 4e3069ffb5..c389b171fb 100644 --- a/editor/js/Viewport.js +++ b/editor/js/Viewport.js @@ -36,11 +36,6 @@ var Viewport = function ( editor ) { render(); - } ); - transformControls.addEventListener( 'objectChange', function () { - - signals.objectChanged.dispatch( transformControls.object ); - } ); transformControls.addEventListener( 'mouseDown', function () { @@ -49,6 +44,7 @@ var Viewport = function ( editor ) { } ); transformControls.addEventListener( 'mouseUp', function () { + signals.objectChanged.dispatch( transformControls.object ); controls.enabled = true; } ); @@ -193,7 +189,7 @@ var Viewport = function ( editor ) { break; } - + renderer.setClearColor( clearColor ); render(); diff --git a/examples/js/controls/TransformControls.js b/examples/js/controls/TransformControls.js index 7afa23ae91..0ae05ef968 100644 --- a/examples/js/controls/TransformControls.js +++ b/examples/js/controls/TransformControls.js @@ -125,7 +125,7 @@ for ( var name in gizmoMap ) { for ( i = gizmoMap[name].length; i--;) { - + var object = gizmoMap[name][i][0]; var position = gizmoMap[name][i][1]; var rotation = gizmoMap[name][i][2]; @@ -134,7 +134,7 @@ if ( position ) object.position.set( position[0], position[1], position[2] ); if ( rotation ) object.rotation.set( rotation[0], rotation[1], rotation[2] ); - + parent.add( object ); } @@ -221,7 +221,7 @@ mesh.updateMatrix(); arrowGeometry.merge( mesh.geometry, mesh.matrix ); - + var lineXGeometry = new THREE.Geometry(); lineXGeometry.vertices.push( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ) ); @@ -562,7 +562,7 @@ this.axis = null; var scope = this; - + var _dragging = false; var _mode = "translate"; var _plane = "XY"; @@ -570,7 +570,6 @@ var changeEvent = { type: "change" }; var mouseDownEvent = { type: "mouseDown" }; var mouseUpEvent = { type: "mouseUp", mode: _mode }; - var objectChangeEvent = { type: "objectChange" }; var ray = new THREE.Raycaster(); var projector = new THREE.Projector(); @@ -659,7 +658,7 @@ this.gizmo["translate"].hide(); this.gizmo["rotate"].hide(); - this.gizmo["scale"].hide(); + this.gizmo["scale"].hide(); this.gizmo[_mode].show(); this.update(); @@ -678,7 +677,7 @@ scope.size = size; this.update(); scope.dispatchEvent( changeEvent ); - + }; this.setSpace = function ( space ) { @@ -836,13 +835,13 @@ scope.object.position.add( point ); } - + if ( scope.snap !== null ) { - + if ( scope.axis.search("X") != -1 ) scope.object.position.x = Math.round( scope.object.position.x / scope.snap ) * scope.snap; if ( scope.axis.search("Y") != -1 ) scope.object.position.y = Math.round( scope.object.position.y / scope.snap ) * scope.snap; if ( scope.axis.search("Z") != -1 ) scope.object.position.z = Math.round( scope.object.position.z / scope.snap ) * scope.snap; - + } } else if ( _mode == "scale" ) { @@ -955,7 +954,7 @@ } scope.update(); - scope.dispatchEvent( objectChangeEvent ); + scope.dispatchEvent( changeEvent ); } diff --git a/examples/misc_controls_transform.html b/examples/misc_controls_transform.html index 930a01db2c..bbfa7bd3aa 100644 --- a/examples/misc_controls_transform.html +++ b/examples/misc_controls_transform.html @@ -68,7 +68,6 @@ control = new THREE.TransformControls( camera, renderer.domElement ); control.addEventListener( 'change', render ); - control.addEventListener( 'objectChange', render ); var mesh = new THREE.Mesh( geometry, material ); scene.add( mesh ); @@ -101,7 +100,7 @@ case 10: // -,_,num- control.setSize( Math.max(control.size - 0.1, 0.1 ) ); break; - } + } }); } -- GitLab