浏览代码

Editor: Save uniforms.

Mr.doob 11 年之前
父节点
当前提交
cbf0ee7a98
共有 3 个文件被更改,包括 3 次插入1 次删除
  1. 1 1
      editor/js/Sidebar.Material.js
  2. 1 0
      examples/js/exporters/MaterialExporter.js
  3. 1 0
      src/loaders/MaterialLoader.js

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

@@ -697,7 +697,7 @@ Sidebar.Material = function ( editor ) {
 
 			if ( material.uniforms !== undefined ) {
 
-				materialUniforms.setValue( JSON.stringify( material.uniforms ) );
+				materialUniforms.setValue( JSON.stringify( material.uniforms, null, '  ' ) );
 
 			}
 

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

@@ -93,6 +93,7 @@ THREE.MaterialExporter.prototype = {
 		} else if ( material instanceof THREE.ShaderMaterial ) {
 
 			output.type = 'ShaderMaterial';
+			output.uniforms = material.uniforms;
 			output.vertexShader = material.vertexShader;
 			output.fragmentShader = material.fragmentShader;
 

+ 1 - 0
src/loaders/MaterialLoader.js

@@ -41,6 +41,7 @@ THREE.MaterialLoader.prototype = {
 		if ( json.emissive !== undefined ) material.emissive.setHex( json.emissive );
 		if ( json.specular !== undefined ) material.specular.setHex( json.specular );
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
+		if ( json.uniforms !== undefined ) material.uniforms = json.uniforms;
 		if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
 		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;		
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;