Merge pull request #267 from AnalyticalGraphicsInc/ao-shader-fix

Fix AO shader
CesiumGS · Apr 13, 2017 · a371945 · a371945
2 parents 6914f5f + 5928501
commit a371945
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Change Log
 ==========
 
+### 0.1.0-alpha12 - 2017-04-13
+* Fixed issue with ambient occlusion not working correctly with other stages.
+
 ### 0.1.0-alpha11 - 2017-03-07
 * Added `compressTextures` stage to compress input textures to a variety of compressed texture formats.
 * Optimized `mergeBuffers` to avoid repeated copies, drastically improving performance when there are lots of buffers to merge.

diff --git a/lib/bakeAmbientOcclusion.js b/lib/bakeAmbientOcclusion.js
@@ -483,7 +483,7 @@ function extractInstructionWithFunctionCall(options) {
     var functionName = options.functionName;
     var functionArguments = options.functionArguments;
     var functionArgumentsLength = functionArguments.length;
-    var sourceString = options.shader.extras._pipeline.source.toString();
+    var sourceString = options.shader.extras._pipeline.source;
     var instructions = sourceString.trim().split(/~|;|{|}/); // split not by whitespace but by ;, {, and }
     var instructionCount = instructions.length;
 
@@ -515,7 +515,7 @@ function injectGlslAfterInstructionContaining(options) {
     var lines = options.lines;
     var snippet = options.snippet;
 
-    var sourceString = shader.extras._pipeline.source.toString();
+    var sourceString = shader.extras._pipeline.source;
     var sourceStringLength = sourceString.length;
     // Locate the instruction containing the snippet. Find the nearest `;`
     var snippetIndex = sourceString.indexOf(snippet);
@@ -531,7 +531,7 @@ function injectGlslAfterInstructionContaining(options) {
     newSourceString += sourceString.substring(instructionEndIndex, sourceStringLength);
 
     // Repack into source
-    shader.extras._pipeline.source = new Buffer(newSourceString);
+    shader.extras._pipeline.source = newSourceString;
 }
 
 function editShader(options) {
@@ -540,7 +540,7 @@ function editShader(options) {
     var mainNewName = options.mainNewName;
     var commandsForNewMain = options.commandsForNewMain;
 
-    var sourceString = shader.extras._pipeline.source.toString();
+    var sourceString = shader.extras._pipeline.source;
     // Wrap main
     sourceString = ShaderSource.replaceMain(sourceString, mainNewName);
     var newSourceString = '';
@@ -555,7 +555,7 @@ function editShader(options) {
     newSourceString +='}';
 
     // Repack into source
-    shader.extras._pipeline.source = new Buffer(newSourceString);
+    shader.extras._pipeline.source = newSourceString;
 }
 
 ////////// adding to the gltf by texture //////////

diff --git a/specs/lib/bakeAmbientOcclusionSpec.js b/specs/lib/bakeAmbientOcclusionSpec.js
@@ -763,7 +763,7 @@ describe('AmbientOcclusion', function() {
         };
 
         injectGlslAfterInstructionContaining(options);
-        var newSource = shader.extras._pipeline.source.toString();
+        var newSource = shader.extras._pipeline.source;
         expect(newSource).toEqual('function(arg0, arg1, arg2, arg3, innerArg0) {' +
             'command(arg3);' +
             'otherCommand(arg0);' +

diff --git a/specs/lib/processModelMaterialsCommonSpec.js b/specs/lib/processModelMaterialsCommonSpec.js
@@ -223,7 +223,7 @@ describe('processModelMaterialsCommon', function() {
         var program = gltfClone.programs[technique.program];
         expect(program.attributes.indexOf('a_batchid') > -1).toBe(true);
 
-        var vertexShaderSource = gltfClone.shaders[program.vertexShader].extras._pipeline.source.toString();
+        var vertexShaderSource = gltfClone.shaders[program.vertexShader].extras._pipeline.source;
         expect(vertexShaderSource.indexOf('a_batchid') > -1).toBe(true);
     });