Tidy up

visgl · Jan 26, 2022 · 97be55a · 97be55a
1 parent a3315a4
commit 97be55a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/modules/core/src/effects/mask/mask-effect.js b/modules/core/src/effects/mask/mask-effect.js
@@ -56,6 +56,8 @@ export default class MaskEffect extends Effect {
 
       const bounds = getMaskBounds({layers: maskLayers, viewport});
 
+      // TODO if the mask layer's data has changed and the data bounds are clipped
+      // by the viewport, this condition will prevent the mask from rerendering
       if (!equals(bounds, this.lastBounds)) {
         this.lastBounds = bounds;
 

diff --git a/modules/core/src/lib/layer.js b/modules/core/src/lib/layer.js
@@ -108,7 +108,6 @@ const defaultProps = {
   pickable: false,
   opacity: {type: 'number', min: 0, max: 1, value: 1},
   operation: OPERATION.DRAW,
-  maskEnabled: {type: 'boolean', value: true, optional: true},
 
   onHover: {type: 'function', value: null, compare: false, optional: true},
   onClick: {type: 'function', value: null, compare: false, optional: true},

diff --git a/modules/core/src/passes/mask-pass.ts b/modules/core/src/passes/mask-pass.ts
@@ -56,12 +56,6 @@ export default class MaskPass extends LayersPass {
     return layer.props.operation === OPERATION.MASK;
   }
 
-  getModuleParameters() {
-    return {
-      drawToMaskMap: true
-    };
-  }
-
   delete() {
     this.fbo.delete();
     this.maskMap.delete();

diff --git a/modules/core/src/passes/pick-layers-pass.ts b/modules/core/src/passes/pick-layers-pass.ts
@@ -1,6 +1,7 @@
 import LayersPass, {LayersPassRenderOptions, RenderStats} from './layers-pass';
 import {withParameters} from '@luma.gl/core';
 import GL from '@luma.gl/constants';
+import {OPERATION} from '../lib/constants';
 import log from '../utils/log';
 
 import type {Framebuffer} from '@luma.gl/core';
@@ -121,7 +122,7 @@ export default class PickLayersPass extends LayersPass {
   }
 
   protected shouldDrawLayer(layer: Layer): boolean {
-    return layer.props.pickable;
+    return layer.props.pickable && layer.props.operation === OPERATION.DRAW;
   }
 
   protected getModuleParameters() {