浏览代码

Merge pull request #6527 from sebavan/master

Fix some preprocessor issues
sebavan 6 年之前
父节点
当前提交
2ea0f345b9

+ 6 - 0
src/Engines/Processors/shaderCodeCursor.ts

@@ -15,6 +15,12 @@ export class ShaderCodeCursor {
         this._lines = [];
 
         for (var line of value) {
+            // Prevent removing line break in macros.
+            if (line[0] === "#") {
+                this._lines.push(line);
+                continue;
+            }
+
             const split = line.split(";");
 
             for (var index = 0; index < split.length; index++) {

+ 5 - 1
src/PostProcesses/volumetricLightScatteringPostProcess.ts

@@ -213,7 +213,11 @@ export class VolumetricLightScatteringPostProcess extends PostProcess {
                 { vertexElement: "depth", fragmentElement: "volumetricLightScatteringPass" },
                 attribs,
                 ["world", "mBones", "viewProjection", "diffuseMatrix"],
-                ["diffuseSampler"], join);
+                ["diffuseSampler"],
+                join,
+                undefined, undefined, undefined,
+                { maxSimultaneousMorphTargets: mesh.numBoneInfluencers }
+        );
         }
 
         return this._volumetricLightScatteringPass.isReady();