[Fix] Supporting pass specific mesh-instance parameters as they are used by the Editor (playcanvas#2411)

mvaligursky · web-flow · commit e5d6bca3913f · 2020-09-07T16:21:26.000+01:00
diff --git a/src/scene/forward-renderer.js b/src/scene/forward-renderer.js
@@ -1334,6 +1334,7 @@ Object.assign(ForwardRenderer.prototype, {
         var style;
         var settings;
         var visibleList, visibleLength;
+        var passFlag = 1 << SHADER_SHADOW;
 
         for (i = 0; i < lights.length; i++) {
             light = lights[i];
@@ -1475,7 +1476,7 @@ Object.assign(ForwardRenderer.prototype, {
                             material.setParameters(device);
 
                             // Uniforms II (shadow): meshInstance overrides
-                            meshInstance.setParameters(device);
+                            meshInstance.setParameters(device, passFlag);
                         }
 
                         // set shader
@@ -1674,6 +1675,8 @@ Object.assign(ForwardRenderer.prototype, {
         var vrDisplay = camera.vrDisplay;
         var lightHash = layer ? layer._lightHash : 0;
 
+        var passFlag = 1 << pass;
+
         // #ifdef PROFILER
         var forwardStartTime = now();
         // #endif
@@ -1822,7 +1825,7 @@ Object.assign(ForwardRenderer.prototype, {
                 }
 
                 // Uniforms II: meshInstance overrides
-                drawCall.setParameters(device);
+                drawCall.setParameters(device, passFlag);
 
                 this.setVertexBuffers(device, mesh);
                 this.setMorphing(device, drawCall.morphInstance);
diff --git a/src/scene/mesh-instance.js b/src/scene/mesh-instance.js
@@ -457,8 +457,11 @@ Object.assign(MeshInstance.prototype, {
      * if set on Material this mesh instance uses for rendering.
      * @param {string} name - The name of the parameter to set.
      * @param {number|number[]|pc.Texture} data - The value for the specified parameter.
+     * @param {number} [passFlags] - Mask describing which passes the material should be included in.
      */
-    setParameter: function (name, data) {
+    setParameter: function (name, data, passFlags) {
+
+        if (passFlags === undefined) passFlags = -524285; // All bits set except 2 - 18 range
 
         if (data === undefined && typeof name === 'object') {
             var uniformObject = name;
@@ -475,10 +478,12 @@ Object.assign(MeshInstance.prototype, {
         var param = this.parameters[name];
         if (param) {
             param.data = data;
+            param.passFlags = passFlags;
         } else {
             this.parameters[name] = {
                 scopeId: null,
-                data: data
+                data: data,
+                passFlags: passFlags
             };
         }
     },
@@ -496,14 +501,16 @@ Object.assign(MeshInstance.prototype, {
     },
 
     // used to apply parameters from this mesh instance into scope of uniforms, called internally by forward-renderer
-    setParameters: function (device) {
+    setParameters: function (device, passFlag) {
         var parameter, parameters = this.parameters;
         for (var paramName in parameters) {
             parameter = parameters[paramName];
-            if (!parameter.scopeId) {
-                parameter.scopeId = device.scope.resolve(paramName);
+            if (parameter.passFlags & passFlag) {
+                if (!parameter.scopeId) {
+                    parameter.scopeId = device.scope.resolve(paramName);
+                }
+                parameter.scopeId.setValue(parameter.data);
             }
-            parameter.scopeId.setValue(parameter.data);
         }
     }
 });
