浏览代码

removed unnecessary signal-calls

renamed ‚updateSidebar‘ to ‚refreshSidebarObject3D‘
Daniel 9 年之前
父节点
当前提交
3c281b2c6a

+ 2 - 2
editor/js/CmdSetGeometryValue.js

@@ -22,8 +22,8 @@ CmdSetGeometryValue.prototype = {
 
 		this.object.geometry[ this.attributeName ] = this.newValue;
 		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.geometryChanged.dispatch();
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 
@@ -31,8 +31,8 @@ CmdSetGeometryValue.prototype = {
 
 		this.object.geometry[ this.attributeName ] = this.oldValue;
 		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.geometryChanged.dispatch();
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 

+ 0 - 2
editor/js/CmdSetUuid.js

@@ -23,7 +23,6 @@ CmdSetUuid.prototype = {
 		this.object.uuid = this.newUuid;
 		this.editor.signals.objectChanged.dispatch( this.object );
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 
@@ -32,7 +31,6 @@ CmdSetUuid.prototype = {
 		this.object.uuid = this.oldUuid;
 		this.editor.signals.objectChanged.dispatch( this.object );
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 

+ 0 - 2
editor/js/CmdSetValue.js

@@ -24,7 +24,6 @@ CmdSetValue.prototype = {
 		this.object[ this.attributeName ] = this.newValue;
 		this.editor.signals.objectChanged.dispatch( this.object );
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 
@@ -33,7 +32,6 @@ CmdSetValue.prototype = {
 		this.object[ this.attributeName ] = this.oldValue;
 		this.editor.signals.objectChanged.dispatch( this.object );
 		this.editor.signals.sceneGraphChanged.dispatch();
-		this.editor.signals.updateSidebar.dispatch();
 
 	},
 

+ 1 - 1
editor/js/Editor.js

@@ -63,7 +63,7 @@ var Editor = function () {
 		windowResize: new SIGNALS.Signal(),
 
 		showGridChanged: new SIGNALS.Signal(),
-		updateSidebar: new SIGNALS.Signal(),
+		refreshSidebarObject3D: new SIGNALS.Signal(),
 		historyChanged: new SIGNALS.Signal(),
 		refreshScriptEditor: new SIGNALS.Signal()
 

+ 0 - 7
editor/js/Sidebar.Geometry.js

@@ -54,7 +54,6 @@ Sidebar.Geometry = function ( editor ) {
 				editor.execute( new CmdSetPosition( object, newPosition ) );
 
 				editor.signals.geometryChanged.dispatch( object );
-				editor.signals.objectChanged.dispatch( object );
 
 				break;
 
@@ -81,17 +80,12 @@ Sidebar.Geometry = function ( editor ) {
 
 				editor.execute( new CmdMultiCmds( cmds ), 'Flatten Geometry' );
 
-				editor.signals.geometryChanged.dispatch( object );
-				editor.signals.objectChanged.dispatch( object );
-
 				break;
 
 		}
 
 		this.setValue( 'Actions' );
 
-		signals.objectChanged.dispatch( object );
-
 	} );
 	container.addStatic( objectActions );
 
@@ -184,7 +178,6 @@ Sidebar.Geometry = function ( editor ) {
 
 	signals.objectSelected.add( build );
 	signals.geometryChanged.add( build );
-	signals.updateSidebar.add( build );
 
 	return container;
 

+ 2 - 6
editor/js/Sidebar.Object3D.js

@@ -56,8 +56,6 @@ Sidebar.Object3D = function ( editor ) {
 
 		this.setValue( 'Actions' );
 
-		signals.objectChanged.dispatch( object );
-
 	} );
 	container.addStatic( objectActions );
 
@@ -457,8 +455,6 @@ Sidebar.Object3D = function ( editor ) {
 
 			}
 
-			signals.objectChanged.dispatch( object );
-
 		}
 
 	}
@@ -546,7 +542,7 @@ Sidebar.Object3D = function ( editor ) {
 
 	} );
 
-	signals.updateSidebar.add( function ( object ) {
+	signals.refreshSidebarObject3D.add( function ( object ) {
 
 		if ( object !== editor.selected ) return;
 
@@ -555,7 +551,7 @@ Sidebar.Object3D = function ( editor ) {
 	} );
 
 	function updateUI( object ) {
-
+		console.log("updateUI called");
 		objectType.setValue( object.type );
 
 		objectUUID.setValue( object.uuid );

+ 1 - 2
editor/js/Viewport.js

@@ -53,7 +53,7 @@ var Viewport = function ( editor ) {
 
 			}
 
-			signals.updateSidebar.dispatch( object );
+			signals.refreshSidebarObject3D.dispatch( object );
 
 		}
 
@@ -105,7 +105,6 @@ var Viewport = function ( editor ) {
 
 		}
 
-		signals.objectChanged.dispatch( object );
 		controls.enabled = true;
 
 	} );