Browse Source

Editor: material.side wasn’t being saved. Fixes #4107.

Mr.doob 11 years ago
parent
commit
0c038d5853
3 changed files with 8 additions and 1 deletions
  1. 2 1
      editor/index.html
  2. 5 0
      examples/js/exporters/MaterialExporter.js
  3. 1 0
      src/loaders/MaterialLoader.js

+ 2 - 1
editor/index.html

@@ -132,7 +132,7 @@
 
 
 						editor.storage.set( exporter.parse( editor.scene ) );
 						editor.storage.set( exporter.parse( editor.scene ) );
 
 
-					}, 2000 );
+					}, 1000 );
 
 
 				};
 				};
 
 
@@ -141,6 +141,7 @@
 				signals.objectAdded.add( saveState );
 				signals.objectAdded.add( saveState );
 				signals.objectChanged.add( saveState );
 				signals.objectChanged.add( saveState );
 				signals.objectRemoved.add( saveState );
 				signals.objectRemoved.add( saveState );
+				signals.materialChanged.add( saveState );
 				signals.sceneGraphChanged.add( saveState );
 				signals.sceneGraphChanged.add( saveState );
 
 
 			} );
 			} );

+ 5 - 0
examples/js/exporters/MaterialExporter.js

@@ -28,6 +28,7 @@ THREE.MaterialExporter.prototype = {
 			output.color = material.color.getHex();
 			output.color = material.color.getHex();
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
+			if ( material.side !== THREE.FrontSide ) output.side = material.side;
 			output.opacity = material.opacity;
 			output.opacity = material.opacity;
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;
@@ -40,6 +41,7 @@ THREE.MaterialExporter.prototype = {
 			output.emissive = material.emissive.getHex();
 			output.emissive = material.emissive.getHex();
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
+			if ( material.side !== THREE.FrontSide ) output.side = material.side;
 			output.opacity = material.opacity;
 			output.opacity = material.opacity;
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;
@@ -54,6 +56,7 @@ THREE.MaterialExporter.prototype = {
 			output.shininess = material.shininess;
 			output.shininess = material.shininess;
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.vertexColors !== THREE.NoColors ) output.vertexColors = material.vertexColors;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
+			if ( material.side !== THREE.FrontSide ) output.side = material.side;
 			output.opacity = material.opacity;
 			output.opacity = material.opacity;
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;
@@ -62,6 +65,7 @@ THREE.MaterialExporter.prototype = {
 
 
 			output.type = 'MeshNormalMaterial';
 			output.type = 'MeshNormalMaterial';
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
+			if ( material.side !== THREE.FrontSide ) output.side = material.side;
 			output.opacity = material.opacity;
 			output.opacity = material.opacity;
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;
@@ -70,6 +74,7 @@ THREE.MaterialExporter.prototype = {
 
 
 			output.type = 'MeshDepthMaterial';
 			output.type = 'MeshDepthMaterial';
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
 			if ( material.blending !== THREE.NormalBlending ) output.blending = material.blending;
+			if ( material.side !== THREE.FrontSide ) output.side = material.side;
 			output.opacity = material.opacity;
 			output.opacity = material.opacity;
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;

+ 1 - 0
src/loaders/MaterialLoader.js

@@ -43,6 +43,7 @@ THREE.MaterialLoader.prototype = {
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
 		if ( json.blending !== undefined ) material.blending = json.blending;
 		if ( json.blending !== undefined ) material.blending = json.blending;
+		if ( json.side !== undefined ) material.side = json.side;
 		if ( json.opacity !== undefined ) material.opacity = json.opacity;
 		if ( json.opacity !== undefined ) material.opacity = json.opacity;
 		if ( json.transparent !== undefined ) material.transparent = json.transparent;
 		if ( json.transparent !== undefined ) material.transparent = json.transparent;
 		if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
 		if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;