Browse Source

Added MeshFaceMaterial support to MaterialLoader and MaterialExporter.

Mr.doob 12 years ago
parent
commit
4c440a98ad
2 changed files with 21 additions and 0 deletions
  1. 11 0
      examples/js/exporters/MaterialExporter.js
  2. 10 0
      src/loaders/MaterialLoader.js

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

@@ -74,6 +74,17 @@ THREE.MaterialExporter.prototype = {
 			output.transparent = material.transparent;
 			output.transparent = material.transparent;
 			output.wireframe = material.wireframe;
 			output.wireframe = material.wireframe;
 
 
+		} else if ( material instanceof THREE.MeshFaceMaterial ) {
+
+			output.type = 'MeshFaceMaterial';
+			output.materials = [];
+
+			for ( var i = 0, l = material.materials.length; i < l; i ++ ) {
+
+				output.materials.push( this.parse( material.materials[ i ] ) );
+
+			}
+
 		}
 		}
 
 
 		return output;
 		return output;

+ 10 - 0
src/loaders/MaterialLoader.js

@@ -47,6 +47,16 @@ THREE.MaterialLoader.prototype = {
 		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;
 
 
+		if ( json.materials !== undefined ) {
+
+			for ( var i = 0, l = json.materials.length; i < l; i ++ ) {
+
+				material.materials.push( this.parse( json.materials[ i ] ) );
+
+			}
+
+		}
+
 		return material;
 		return material;
 
 
 	}
 	}