Browse Source

Merge pull request #6207 from zz85/fix_buildjs_shaders

Fix utils/build/build.js Compilation
Mr.doob 10 years ago
parent
commit
40cdb12724
1 changed files with 13 additions and 7 deletions
  1. 13 7
      utils/build/build.js

+ 13 - 7
utils/build/build.js

@@ -50,15 +50,21 @@ function main() {
 			
 			buffer.push('// File:' + files[ j ]);
 			buffer.push('\n\n');
+
+			contents = fs.readFileSync( file, 'utf8' );
+
 			if( file.indexOf( '.glsl') >= 0 ) {
-				buffer.push('THREE.ShaderChunk[\'' + path.basename(file, '.glsl') + '\'] = "');
-				buffer.push(fs.readFileSync( file, 'utf8' ));
-				buffer.push('";\n\n');
-			}
-			else {
+
+				buffer.push( 'THREE.ShaderChunk[ \'' + path.basename( file, '.glsl' ) + '\' ] =')
+				buffer.push( JSON.stringify( contents ) );
+				buffer.push( ';\n\n' );
+
+			} else {
+
 				sources.push( file );
-				buffer.push( fs.readFileSync( file, 'utf8' ) );
-				buffer.push('\n');
+				buffer.push( contents );
+				buffer.push( '\n' );
+
 			}
 
 		}