Browse Source

Editor: Cleaned up geometry parameters.

Mr.doob 10 years ago
parent
commit
29d9781165
1 changed files with 14 additions and 28 deletions
  1. 14 28
      editor/js/Sidebar.Geometry.js

+ 14 - 28
editor/js/Sidebar.Geometry.js

@@ -61,7 +61,8 @@ Sidebar.Geometry = function ( editor ) {
 
 	// parameters
 
-	var parameters;
+	var parameters = new UI.Panel();
+	container.add( parameters );
 
 
 	//
@@ -83,60 +84,44 @@ Sidebar.Geometry = function ( editor ) {
 
 			//
 
-			if ( parameters !== undefined ) {
-
-				container.remove( parameters );
-				parameters = undefined;
-
-			}
+			parameters.clear();
 
 			if ( geometry instanceof THREE.BoxGeometry ) {
 
-				parameters = new Sidebar.Geometry.BoxGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.BoxGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.CircleGeometry ) {
 
-				parameters = new Sidebar.Geometry.CircleGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.CircleGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.CylinderGeometry ) {
 
-				parameters = new Sidebar.Geometry.CylinderGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.CylinderGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.SphereGeometry ) {
 
-				parameters = new Sidebar.Geometry.SphereGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.SphereGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.IcosahedronGeometry ) {
 
-				parameters = new Sidebar.Geometry.IcosahedronGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.IcosahedronGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.PlaneGeometry ) {
 
-				parameters = new Sidebar.Geometry.PlaneGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.PlaneGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.TorusGeometry ) {
 
-				parameters = new Sidebar.Geometry.TorusGeometry( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.TorusGeometry( signals, object ) );
 
 			} else if ( geometry instanceof THREE.TorusKnotGeometry ) {
 
-				parameters = new Sidebar.Geometry.TorusKnotGeometry( signals, object );
-				container.add( parameters );
-
-			} else {
-
-				parameters = new Sidebar.Geometry.Modifiers( signals, object );
-				container.add( parameters );
+				parameters.add( new Sidebar.Geometry.TorusKnotGeometry( signals, object ) );
 
 			}
 
+			parameters.add( new Sidebar.Geometry.Modifiers( signals, object ) );
+
 		} else {
 
 			container.setDisplay( 'none' );
@@ -146,6 +131,7 @@ Sidebar.Geometry = function ( editor ) {
 	}
 
 	signals.objectSelected.add( build );
+	signals.geometryChanged.add( build );
 
 	return container;