@deck.gl-community/editable-layers 9.0.0-alpha.1 → 9.0.3

package/src/editable-layers/path-outline-layer/path-outline-layer.ts

@@ -1,147 +0,0 @@
-import { PathLayer, PathLayerProps } from '@deck.gl/layers';
-import type { DefaultProps, LayerContext } from '@deck.gl/core';
-import {GL} from '@luma.gl/constants';
-import { Framebuffer, Texture } from '@luma.gl/core';
-import outline from '../../shaderlib/outline/outline';
-import { UNIT } from '../../constants';
-
-// TODO - this should be built into assembleShaders
-function injectShaderCode({ source, code = '' }) {
-  const INJECT_CODE = /}[^{}]*$/;
-  return source.replace(INJECT_CODE, code.concat('\n}\n'));
-}
-
-const VS_CODE = `\
-  outline_setUV(gl_Position);
-  outline_setZLevel(instanceZLevel);
-`;
-
-const FS_CODE = `\
-  fragColor = outline_filterColor(fragColor);
-`;
-
-export type PathOutlineLayerProps<DataT> = PathLayerProps<DataT> & {
-  dashJustified?: boolean;
-  getDashArray?: [number, number] | ((d: DataT) => [number, number] | null);
-  getZLevel?: (d: DataT, index: number) => number;
-};
-
-const defaultProps: DefaultProps<PathOutlineLayerProps<any>> = {
-  getZLevel: () => 0,
-};
-
-export default class PathOutlineLayer<
-  DataT = any,
-  ExtraPropsT = Record<string, unknown>
-> extends PathLayer<DataT, ExtraPropsT & Required<PathOutlineLayerProps<DataT>>> {
-  static layerName = 'PathOutlineLayer';
-  static defaultProps = defaultProps;
-
-  state: {
-    model?: any;
-    pathTesselator: any;
-    outlineFramebuffer: Framebuffer;
-    dummyTexture: Texture;
-  } = undefined!;
-
-  // Override getShaders to inject the outline module
-  getShaders() {
-    const shaders = super.getShaders();
-    return Object.assign({}, shaders, {
-      modules: shaders.modules.concat([outline]),
-      vs: injectShaderCode({ source: shaders.vs, code: VS_CODE }),
-      fs: injectShaderCode({ source: shaders.fs, code: FS_CODE }),
-    });
-  }
-
-  // @ts-expect-error PathLayer is missing LayerContext arg
-  initializeState(context: LayerContext) {
-    super.initializeState();
-
-    // Create an outline "shadow" map
-    // TODO - we should create a single outlineMap for all layers
-    this.setState({
-      outlineFramebuffer: context.device.createFramebuffer({}),
-      dummyTexture: context.device.createTexture({}),
-    });
-
-    // Create an attribute manager
-    // @ts-expect-error check whether this.getAttributeManager works here
-    this.state.attributeManager.addInstanced({
-      instanceZLevel: {
-        size: 1,
-        type: GL.UNSIGNED_BYTE,
-        accessor: 'getZLevel',
-      },
-    });
-  }
-
-  // Override draw to add render module
-  draw({ moduleParameters = {}, parameters, uniforms, context }) {
-    // Need to calculate same uniforms as base layer
-    const {
-      jointRounded,
-      capRounded,
-      billboard,
-      miterLimit,
-      widthUnits,
-      widthScale,
-      widthMinPixels,
-      widthMaxPixels,
-    } = this.props;
-
-    uniforms = Object.assign({}, uniforms, {
-      jointType: Number(jointRounded),
-      capType: Number(capRounded),
-      billboard,
-      widthUnits: UNIT[widthUnits],
-      widthScale,
-      miterLimit,
-      widthMinPixels,
-      widthMaxPixels,
-    });
-
-    // Render the outline shadowmap (based on segment z orders)
-    const { outlineFramebuffer, dummyTexture } = this.state;
-    // TODO(v9): resize, see 'sf' example.
-    // outlineFramebuffer.resize();
-    // TODO(v9) clear FBO
-    // outlineFramebuffer.clear({ color: true, depth: true, stencil: true });
-
-    this.state.model.updateModuleSettings({
-      outlineEnabled: true,
-      outlineRenderShadowmap: true,
-      outlineShadowmap: dummyTexture,
-    });
-
-    this.state.model.draw({
-      uniforms: Object.assign({}, uniforms, {
-        jointType: 0,
-        widthScale: this.props.widthScale * 1.3,
-      }),
-      parameters: {
-        depthTest: false,
-        // Biggest value needs to go into buffer
-        blendEquation: GL.MAX,
-      },
-      framebuffer: outlineFramebuffer,
-    });
-
-    // Now use the outline shadowmap to render the lines (with outlines)
-    this.state.model.updateModuleSettings({
-      outlineEnabled: true,
-      outlineRenderShadowmap: false,
-      outlineShadowmap: outlineFramebuffer,
-    });
-    this.state.model.draw({
-      uniforms: Object.assign({}, uniforms, {
-        jointType: Number(jointRounded),
-        capType: Number(capRounded),
-        widthScale: this.props.widthScale,
-      }),
-      parameters: {
-        depthTest: false,
-      },
-    });
-  }
-}

package/src/shaderlib/outline/outline.ts

@@ -1,101 +0,0 @@
-/* eslint-disable camelcase */
-const INITIAL_STATE: Record<string, any> = {
-  outlineEnabled: false,
-  outlineRenderShadowmap: false,
-  outlineShadowmap: null,
-};
-
-function getUniforms({ outlineEnabled, outlineRenderShadowmap, outlineShadowmap } = INITIAL_STATE) {
-  const uniforms: Record<string, any> = {};
-  if (outlineEnabled !== undefined) {
-    // ? 1.0 : 0.0;
-    uniforms.outline_uEnabled = outlineEnabled;
-  }
-  if (outlineRenderShadowmap !== undefined) {
-    // ? 1.0 : 0.0;
-    uniforms.outline_uRenderOutlines = outlineRenderShadowmap;
-  }
-  if (outlineShadowmap !== undefined) {
-    uniforms.outline_uShadowmap = outlineShadowmap;
-  }
-  return uniforms;
-}
-
-const vs = `\
-#version 300 es
-in float instanceZLevel;
-out float outline_vzLevel;
-out vec4 outline_vPosition;
-
-// Set the z level for the outline shadowmap rendering
-void outline_setZLevel(float zLevel) {
-  outline_vzLevel = zLevel;
-}
-
-// Store an adjusted position for texture2DProj
-void outline_setUV(vec4 position) {
-  // mat4(
-  //   0.5, 0.0, 0.0, 0.0,
-  //   0.0, 0.5, 0.0, 0.0,
-  //   0.0, 0.0, 0.5, 0.0,
-  //   0.5, 0.5, 0.5, 1.0
-  // ) * position;
-  outline_vPosition = vec4(position.xyz * 0.5 + position.w * 0.5, position.w);
-}
-`;
-
-const fs = `\
-uniform bool outline_uEnabled;
-uniform bool outline_uRenderOutlines;
-uniform sampler2D outline_uShadowmap;
-
-in float outline_vzLevel;
-// in vec2 outline_vUV;
-in vec4 outline_vPosition;
-
-out vec4 fragColor;
-
-const float OUTLINE_Z_LEVEL_ERROR = 0.01;
-
-// Return a darker color in shadowmap
-vec4 outline_filterShadowColor(vec4 color) {
-  return vec4(outline_vzLevel / 255., outline_vzLevel / 255., outline_vzLevel / 255., 1.);
-}
-
-// Return a darker color if in shadowmap
-vec4 outline_filterDarkenColor(vec4 color) {
-  if (outline_uEnabled) {
-    float maxZLevel;
-    if (outline_vPosition.q > 0.0) {
-      maxZLevel = texture2DProj(outline_uShadowmap, outline_vPosition).r * 255.;
-    } else {
-      discard;
-    }
-    if (maxZLevel < outline_vzLevel + OUTLINE_Z_LEVEL_ERROR) {
-      vec4(color.rgb * 0.5, color.a);
-    } else {
-      discard;
-    }
-  }
-  return color;
-}
-
-// if enabled and rendering outlines - Render depth to shadowmap
-// if enabled and rendering colors - Return a darker color if in shadowmap
-// if disabled, just return color
-vec4 outline_filterColor(vec4 color) {
-  if (outline_uEnabled) {
-    return outline_uRenderOutlines ?
-      outline_filterShadowColor(color) :
-      outline_filterDarkenColor(color);
-  }
-  return color;
-}
-`;
-
-export default {
-  name: 'outline',
-  vs,
-  fs,
-  getUniforms,
-};