Merge parameters in layers-pass

visgl · Mar 15, 2024 · 11dcd54 · 11dcd54
1 parent 12624ac
commit 11dcd54
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/modules/core/src/lib/layer.ts b/modules/core/src/lib/layer.ts
@@ -1072,6 +1072,12 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
 
       context.device.setParametersWebGL({polygonOffset: offsets});
 
+      // TODO (v9) remove pickingActive check once pick-layers-pass removes GL parameters
+      const pickingActive = moduleParameters.picking?.isActive === 1;
+      for (const model of this.getModels()) {
+        model.setParameters(pickingActive ? {} : parameters);
+      }
+
       // Call subclass lifecycle method
       context.device.withParametersWebGL(parameters, () => {
         const opts = {renderPass, moduleParameters, uniforms, parameters, context};

diff --git a/modules/core/src/passes/layers-pass.ts b/modules/core/src/passes/layers-pass.ts
@@ -181,7 +181,10 @@ export default class LayersPass extends Pass {
           pass,
           moduleParameters
         );
-        layerParam.layerParameters = this.getLayerParameters(layer, layerIndex, viewport);
+        layerParam.layerParameters = {
+          ...layer.context.deck?.props.parameters,
+          ...this.getLayerParameters(layer, layerIndex, viewport)
+        };
       }
       drawLayerParams[layerIndex] = layerParam;
     }

diff --git a/modules/core/src/passes/pick-layers-pass.ts b/modules/core/src/passes/pick-layers-pass.ts
@@ -11,6 +11,16 @@ const PICKING_PARAMETERS: GLParameters = {
   blendEquation: GL.FUNC_ADD
 };
 
+// TODO (v9) migrate to string constants
+// const PICKING_PARAMETERS: RenderPipelineParameters = {
+//   blendColorOperation: 'add',
+//   blendColorSrcFactor: 'one',
+//   blendColorDstFactor: 'zero',
+//   blendAlphaOperation: 'add',
+//   blendAlphaSrcFactor: 'constant-alpha', // <- Not yet implemented in luma
+//   blendAlphaDstFactor: 'zero'
+// };
+
 type PickLayersPassRenderOptions = LayersPassRenderOptions & {
   pickingFBO: Framebuffer;
   deviceRect: Rect;
@@ -76,6 +86,8 @@ export default class PickLayersPass extends LayersPass {
     // Set blend mode for picking
     // always overwrite existing pixel with [r,g,b,layerIndex]
     const renderStatus = this.device.withParametersWebGL(
+      // TODO (v9) should move parameters to getLayerParameters(), but first need
+      // luma to support BlendFactor 'constant-alpha'
       {
         scissorTest: true,
         scissor: [x, y, width, height],