Bladeren bron

Editor: Added geometryChanged signal.

Mr.doob 11 jaren geleden
bovenliggende
commit
792a8820b6

+ 1 - 0
editor/index.html

@@ -160,6 +160,7 @@
 
 				var signals = editor.signals;
 
+				signals.geometryChanged.add( saveState );
 				signals.objectAdded.add( saveState );
 				signals.objectChanged.add( saveState );
 				signals.objectRemoved.add( saveState );

+ 2 - 0
editor/js/Editor.js

@@ -29,6 +29,8 @@ var Editor = function () {
 
 		cameraChanged: new SIGNALS.Signal(),
 
+		geometryChanged: new SIGNALS.Signal(),
+
 		objectSelected: new SIGNALS.Signal(),
 		objectAdded: new SIGNALS.Signal(),
 		objectChanged: new SIGNALS.Signal(),

+ 1 - 1
editor/js/Sidebar.Geometry.BoxGeometry.js

@@ -82,7 +82,7 @@ Sidebar.Geometry.BoxGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.BufferGeometry.js

@@ -55,7 +55,7 @@ Sidebar.Geometry.BufferGeometry = function ( signals ) {
 	};
 
 	signals.objectSelected.add( update );
-	signals.objectChanged.add( update );
+	signals.geometryChanged.add( update );
 
 	return container;
 

+ 1 - 1
editor/js/Sidebar.Geometry.CircleGeometry.js

@@ -37,7 +37,7 @@ Sidebar.Geometry.CircleGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.CylinderGeometry.js

@@ -82,7 +82,7 @@ Sidebar.Geometry.CylinderGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.Geometry.js

@@ -46,7 +46,7 @@ Sidebar.Geometry.Geometry = function ( signals ) {
 	};
 
 	signals.objectSelected.add( update );
-	signals.objectChanged.add( update );
+	signals.geometryChanged.add( update );
 
 	return container;
 

+ 3 - 3
editor/js/Sidebar.Geometry.Modifiers.js

@@ -21,7 +21,7 @@ Sidebar.Geometry.Modifiers = function ( signals, object ) {
 
 		}
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	} );
 
@@ -40,7 +40,7 @@ Sidebar.Geometry.Modifiers = function ( signals, object ) {
 
 			object.geometry = new THREE.Geometry().fromBufferGeometry( object.geometry );
 
-			signals.objectChanged.dispatch( object );
+			signals.geometryChanged.dispatch( object );
 
 		} );
 		container.add( button );
@@ -54,7 +54,7 @@ Sidebar.Geometry.Modifiers = function ( signals, object ) {
 
 			object.geometry = new THREE.BufferGeometry().fromGeometry( object.geometry );
 
-			signals.objectChanged.dispatch( object );
+			signals.geometryChanged.dispatch( object );
 
 		} );
 		container.add( button );

+ 1 - 1
editor/js/Sidebar.Geometry.PlaneGeometry.js

@@ -61,7 +61,7 @@ Sidebar.Geometry.PlaneGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.SphereGeometry.js

@@ -94,7 +94,7 @@ Sidebar.Geometry.SphereGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.TorusGeometry.js

@@ -72,7 +72,7 @@ Sidebar.Geometry.TorusGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

+ 1 - 1
editor/js/Sidebar.Geometry.TorusKnotGeometry.js

@@ -94,7 +94,7 @@ Sidebar.Geometry.TorusKnotGeometry = function ( signals, object ) {
 		object.geometry.buffersNeedUpdate = true;
 		object.geometry.computeBoundingSphere();
 
-		signals.objectChanged.dispatch( object );
+		signals.geometryChanged.dispatch( object );
 
 	}
 

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

@@ -142,7 +142,6 @@ Sidebar.Geometry = function ( editor ) {
 	}
 
 	signals.objectSelected.add( build );
-	signals.objectChanged.add( build );
 
 	return container;
 

+ 3 - 19
editor/js/Viewport.Info.js

@@ -17,28 +17,12 @@ Viewport.Info = function ( editor ) {
 	container.add( new UI.Text( 'vertices' ), verticesText, new UI.Break() );
 	container.add( new UI.Text( 'triangles' ), trianglesText, new UI.Break() );
 
-	signals.sceneGraphChanged.add( function () {
-
-		update();
-
-	} );
-
-	signals.objectChanged.add( function ( object ) {
-
-		// TODO: geometryChanged
-
-		if ( object !== editor.camera ) {
-
-			update();
-
-		}
-
-	} );
+	signals.objectAdded.add( update );
+	signals.objectRemoved.add( update );
+	signals.geometryChanged.add( update );
 
 	//
 
-
-
 	function update() {
 
 		var scene = editor.scene;

+ 2 - 0
editor/js/Viewport.js

@@ -283,6 +283,8 @@ var Viewport = function ( editor ) {
 
 	} );
 
+	signals.geometryChanged.add( render );
+
 	signals.objectAdded.add( function ( object ) {
 
 		var materialsNeedUpdate = false;