Use UBOs in project module (#8782)

visgl · May 7, 2024 · ff9246e · ff9246e
1 parent 1a9dd6f
commit ff9246e
Show file tree

Hide file tree

Showing 57 changed files with 357 additions and 273 deletions.
diff --git a/docs/api-reference/core/project.md b/docs/api-reference/core/project.md
@@ -151,6 +151,6 @@ Returns a matrix that rotates any vector defined in the default common space to
 
 ## Remarks
 
-* For consistent results, the screen space pixels are logical pixels, not device pixels, i.e. functions in the project module multiply `pixels` with `project_uDevicePixelRatio`.
+* For consistent results, the screen space pixels are logical pixels, not device pixels, i.e. functions in the project module multiply `pixels` with `project.devicePixelRatio`.
 * The pixels offsets will be divided by the `w` coordinate of `gl_Position`. This is simply the GPUs standard treatment of any coordinate. This means that there will be more pixels closer to the camera and less pixels further away from the camer. Setting the `focalDistance` uniform controls this.
 * To avoid pixel sizes scaling with distance from camera, simply set `focalDistance` to 1 and multiply clipspace offset with `gl_Position.w`
diff --git a/docs/api-reference/core/project64.md b/docs/api-reference/core/project64.md
@@ -5,7 +5,7 @@ The `project64` shader module is an extension of the [project](./project.md) sha
 
 ## getUniforms
 
-The uniforms needed by `project64` are extracted from the `project` module uniforms `project_uViewProjectionMatrix` and `project_uScale`.
+The uniforms needed by `project64` are extracted from the `project` module uniforms `project.viewProjectionMatrix` and `project.scale`.
 
 
 ## GLSL Uniforms

diff --git a/docs/developer-guide/custom-layers/subclassed-layers.md b/docs/developer-guide/custom-layers/subclassed-layers.md
@@ -225,7 +225,7 @@ void main(void) {
   /* replaced uniform 'radiusPixels' with 'instanceRadiusPixels' */
   gl_Position.xy += project_pixel_size_to_clipspace(positions.xy * instanceRadiusPixels);
 
-  vec3 lightColor = lighting_getLightColor(instanceColors.rgb, project_uCameraPosition, position_commonspace.xyz, project_normal(instanceNormals));
+  vec3 lightColor = lighting_getLightColor(instanceColors.rgb, project.cameraPosition, position_commonspace.xyz, project_normal(instanceNormals));
 
   vColor = vec4(lightColor, instanceColors.a * opacity) / 255.0;
 

diff --git a/examples/experimental/bezier/src/bezier-curve-layer/bezier-curve-layer-vertex.glsl.js b/examples/experimental/bezier/src/bezier-curve-layer/bezier-curve-layer-vertex.glsl.js
@@ -39,7 +39,7 @@ out vec4 vColor;
 // offset_direction is -1 (left) or 1 (right)
 vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
   // normalized direction of the line
-  vec2 dir_screenspace = normalize(line_clipspace * project_uViewportSize);
+  vec2 dir_screenspace = normalize(line_clipspace * project.viewportSize);
   // rotate by 90 degrees
   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
 

diff --git a/examples/website/plot/plot-layer/grid-vertex.glsl.ts b/examples/website/plot/plot-layer/grid-vertex.glsl.ts
@@ -38,7 +38,7 @@ out float shouldDiscard;
 
 // determines if the grid line is behind or in front of the center
 float frontFacing(vec3 v) {
-  vec4 v_clipspace = project_uViewProjectionMatrix * project_uModelMatrix * vec4(v, 0.0);
+  vec4 v_clipspace = project.viewProjectionMatrix * project.modelMatrix * vec4(v, 0.0);
   return step(v_clipspace.z, 0.0);
 }
 

diff --git a/examples/website/plot/plot-layer/label-vertex.glsl.ts b/examples/website/plot/plot-layer/label-vertex.glsl.ts
@@ -50,7 +50,7 @@ float sum3(vec3 v) {
 
 // determines if the grid line is behind or in front of the center
 float frontFacing(vec3 v) {
-  vec4 v_clipspace = project_uViewProjectionMatrix * project_uModelMatrix * vec4(v, 0.0);
+  vec4 v_clipspace = project.viewProjectionMatrix * project.modelMatrix * vec4(v, 0.0);
   return step(v_clipspace.z, 0.0);
 }
 

diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json
@@ -38,8 +38,8 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@luma.gl/constants": "^9.0.11",
-    "@luma.gl/shadertools": "^9.0.11",
+    "@luma.gl/constants": "^9.0.12",
+    "@luma.gl/shadertools": "^9.0.12",
     "@math.gl/web-mercator": "^4.0.0",
     "d3-hexbin": "^0.2.1"
   },

diff --git a/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer-vertex.glsl.ts b/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer-vertex.glsl.ts
@@ -134,7 +134,7 @@ void main(void) {
   vec3 normals_commonspace = project_normal(normals);
 
    if (extruded) {
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, normals_commonspace);
+    vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, normals_commonspace);
     vColor = vec4(lightColor, color.a * opacity) / 255.;
   } else {
     vColor = vec4(color.rgb, color.a * opacity) / 255.;

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
@@ -20,7 +20,15 @@
 
 import {Texture} from '@luma.gl/core';
 import {Model, Geometry} from '@luma.gl/engine';
-import {Layer, LayerProps, log, picking, UpdateParameters, DefaultProps} from '@deck.gl/core';
+import {
+  Layer,
+  LayerProps,
+  log,
+  project32,
+  picking,
+  UpdateParameters,
+  DefaultProps
+} from '@deck.gl/core';
 import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
 import vs from './screen-grid-layer-vertex.glsl';
 import fs from './screen-grid-layer-fragment.glsl';
@@ -59,7 +67,7 @@ export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {
   };
 
   getShaders(): {vs: string; fs: string; modules: ShaderModule[]} {
-    return {vs, fs, modules: [picking as ShaderModule]};
+    return {vs, fs, modules: [project32, picking]};
   }
 
   initializeState() {

diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json
@@ -36,7 +36,7 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@luma.gl/constants": "^9.0.11",
+    "@luma.gl/constants": "^9.0.12",
     "esri-loader": "^3.7.0"
   },
   "peerDependencies": {

diff --git a/modules/carto/package.json b/modules/carto/package.json
@@ -47,9 +47,9 @@
     "@loaders.gl/mvt": "^4.2.0",
     "@loaders.gl/schema": "^4.2.0",
     "@loaders.gl/tiles": "^4.2.0",
-    "@luma.gl/constants": "^9.0.11",
-    "@luma.gl/core": "^9.0.11",
-    "@luma.gl/shadertools": "^9.0.11",
+    "@luma.gl/constants": "^9.0.12",
+    "@luma.gl/core": "^9.0.12",
+    "@luma.gl/shadertools": "^9.0.12",
     "@math.gl/web-mercator": "^4.0.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",

diff --git a/modules/carto/src/layers/raster-layer-vertex.glsl.ts b/modules/carto/src/layers/raster-layer-vertex.glsl.ts
@@ -46,8 +46,8 @@ void main(void) {
   // Important to set geometry.position before using project_ methods below
   // as geometry.worldPosition is not set (we don't know our lat/long)
   geometry.position = vec4(common_position, 0.0, 1.0);
-  if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
-    geometry.position.xyz -= project_uCommonOrigin;
+  if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
+    geometry.position.xyz -= project.commonOrigin;
   }
 
   // calculate elevation, if 3d not enabled set to 0
@@ -86,7 +86,7 @@ void main(void) {
     position_commonspace = geometry.position;
     vColor = vec4(color.rgb, color.a * opacity);
 #else
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);
+    vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);
     vColor = vec4(lightColor, color.a * opacity);
 #endif
   } else {

diff --git a/modules/core/package.json b/modules/core/package.json
@@ -42,11 +42,11 @@
   "dependencies": {
     "@loaders.gl/core": "^4.2.0",
     "@loaders.gl/images": "^4.2.0",
-    "@luma.gl/constants": "^9.0.11",
-    "@luma.gl/core": "^9.0.11",
-    "@luma.gl/engine": "^9.0.11",
-    "@luma.gl/shadertools": "^9.0.11",
-    "@luma.gl/webgl": "^9.0.11",
+    "@luma.gl/constants": "^9.0.12",
+    "@luma.gl/core": "^9.0.12",
+    "@luma.gl/engine": "^9.0.12",
+    "@luma.gl/shadertools": "^9.0.12",
+    "@luma.gl/webgl": "^9.0.12",
     "@math.gl/core": "^4.0.0",
     "@math.gl/sun": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",

diff --git a/modules/core/src/effects/lighting/camera-light.ts b/modules/core/src/effects/lighting/camera-light.ts
@@ -8,15 +8,15 @@ export default class CameraLight extends PointLight {
     const {projectedLight} = this;
     const viewport = layer.context.viewport;
     const {coordinateSystem, coordinateOrigin, modelMatrix} = layer.props;
-    const {project_uCameraPosition} = getUniformsFromViewport({
+    const {cameraPosition} = getUniformsFromViewport({
       viewport,
       modelMatrix,
       coordinateSystem,
       coordinateOrigin
     });
     projectedLight.color = this.color;
     projectedLight.intensity = this.intensity;
-    projectedLight.position = project_uCameraPosition;
+    projectedLight.position = cameraPosition;
     return projectedLight;
   }
 }
diff --git a/modules/core/src/lib/layer.ts b/modules/core/src/lib/layer.ts
@@ -1065,8 +1065,13 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
       // TODO/ib - hack move to luma Model.draw
       if (moduleParameters) {
         const {isActive, isAttribute} = moduleParameters.picking;
+        const {viewport, devicePixelRatio, coordinateSystem, coordinateOrigin} = moduleParameters;
+        const {modelMatrix} = this.props;
         this.setModuleParameters(moduleParameters);
-        this.setShaderModuleProps({picking: {isActive, isAttribute}});
+        this.setShaderModuleProps({
+          picking: {isActive, isAttribute},
+          project: {viewport, devicePixelRatio, modelMatrix, coordinateSystem, coordinateOrigin}
+        });
       }
 
       // Apply polygon offset to avoid z-fighting

diff --git a/modules/core/src/shaderlib/index.ts b/modules/core/src/shaderlib/index.ts
@@ -21,12 +21,13 @@
 import {ShaderAssembler} from '@luma.gl/shadertools';
 
 import {gouraudLighting, phongLighting} from '@luma.gl/shadertools';
+import geometry from './misc/geometry';
 import project from './project/project';
 import project32 from './project32/project32';
 import shadow from './shadow/shadow';
 import picking from './picking/picking';
 
-const DEFAULT_MODULES = [project];
+const DEFAULT_MODULES = [geometry];
 
 const SHADER_HOOKS = [
   'vs:DECKGL_FILTER_SIZE(inout vec3 size, VertexGeometry geometry)',