Skip to content

feat: Set up shader injection through RasterLayer #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylebarron merged 3 commits into from
Dec 22, 2025
Merged

feat: Set up shader injection through RasterLayer #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d21f054
feat: Set up shader injection through RasterLayer
kylebarron Dec 22, 2025
dd0b956
Merge branch 'main' into kyle/set-up-shader-injection
kylebarron Dec 22, 2025
62c5d4a
fix pin of luma.gl
kylebarron Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
"typecheck": "pnpm -r typecheck"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^8.49.0",
"@typescript-eslint/eslint-plugin": "^8.50.1",
"publint": "^0.3.16",
"tsup": "^8.3.5",
"typescript": "^5.7.2"
"tsup": "^8.5.1",
"typescript": "^5.9.3"
},
"pnpm": {
"overrides": {
"deck.gl": "9.2.5",
"@deck.gl/*": "9.2.5",
"luma.gl": "9.2.5",
"@luma.gl/*": "9.2.5"
"@luma.gl/constants": "9.2.5",
"@luma.gl/core": "9.2.5",
"@luma.gl/engine": "9.2.5",
"@luma.gl/gltf": "9.2.5",
"@luma.gl/shadertools": "9.2.5",
"@luma.gl/webgl": "9.2.5"
}
},
"packageManager": "pnpm@10.25.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/deck.gl-raster/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
"url": "git+https://github.com/developmentseed/deck.gl-raster.git"
},
"devDependencies": {
"@luma.gl/core": "^9.2.5",
"@luma.gl/shadertools": "^9.2.5",
"@types/node": "^25.0.1",
"@typescript-eslint/eslint-plugin": "^8.16.0",
"@typescript-eslint/parser": "^8.16.0",
Expand All @@ -55,7 +57,9 @@
"@deck.gl/core": "^9.2.5",
"@deck.gl/geo-layers": "^9.2.5",
"@deck.gl/layers": "^9.2.5",
"@deck.gl/mesh-layers": "^9.2.5"
"@deck.gl/mesh-layers": "^9.2.5",
"@luma.gl/core": "^9.2.5",
"@luma.gl/shadertools": "^9.2.5"
},
"dependencies": {
"@developmentseed/raster-reproject": "workspace:^",
Expand Down
55 changes: 55 additions & 0 deletions packages/deck.gl-raster/src/mesh-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import type { SimpleMeshLayerProps } from "@deck.gl/mesh-layers";
import { SimpleMeshLayer } from "@deck.gl/mesh-layers";

import type { ShaderModule } from "@luma.gl/shadertools";

export interface MeshTextureLayerProps extends SimpleMeshLayerProps {
shaders?: {
inject?: {
"fs:#decl"?: string;
"fs:DECKGL_FILTER_COLOR"?: string;
};
modules?: ShaderModule[];
shaderProps?: { [x: string]: Partial<Record<string, unknown> | undefined> };
};
}

/**
* A small subclass of the SimpleMeshLayer to allow dynamic shader injections.
*
* In the future this may expand to diverge more from the SimpleMeshLayer, such
* as allowing the texture to be a 2D _array_.
*/
export class MeshTextureLayer extends SimpleMeshLayer<
null,
MeshTextureLayerProps
> {
static override layerName = "mesh-texture-layer";
static override defaultProps: typeof SimpleMeshLayer.defaultProps =
SimpleMeshLayer.defaultProps;

override getShaders() {
const upstreamShaders = super.getShaders();

return {
...upstreamShaders,
inject: {
...upstreamShaders.inject,
...this.props.shaders?.inject,
},
modules: [
...upstreamShaders.modules,
...(this.props.shaders?.modules || []),
],
};
}

override draw(opts: any): void {
if (this.props.shaders?.shaderProps)
for (const m of super.getModels()) {
m.shaderInputs.setProps(this.props.shaders.shaderProps);
}

super.draw(opts);
}
}
12 changes: 9 additions & 3 deletions packages/deck.gl-raster/src/raster-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import type {
import { CompositeLayer } from "@deck.gl/core";
import { PolygonLayer } from "@deck.gl/layers";
import type { SimpleMeshLayerProps } from "@deck.gl/mesh-layers";
import { SimpleMeshLayer } from "@deck.gl/mesh-layers";
import type { ReprojectionFns } from "@developmentseed/raster-reproject";
import { RasterReprojector } from "@developmentseed/raster-reproject";
import { MeshTextureLayer, MeshTextureLayerProps } from "./mesh-layer";

const DEFAULT_MAX_ERROR = 0.125;

Expand Down Expand Up @@ -69,6 +69,11 @@ export interface RasterLayerProps extends CompositeLayerProps {
*/
textureParameters?: SimpleMeshLayerProps["textureParameters"];

/**
* Optional shader injection.
*/
shaders?: MeshTextureLayerProps["shaders"];

/**
* Maximum reprojection error in pixels for mesh refinement.
* Lower values create denser meshes with higher accuracy.
Expand Down Expand Up @@ -186,7 +191,7 @@ export class RasterLayer extends CompositeLayer<RasterLayerProps> {

renderLayers() {
const { mesh } = this.state;
const { texture, debug } = this.props;
const { texture, debug, shaders } = this.props;

if (!mesh) {
return null;
Expand All @@ -195,10 +200,11 @@ export class RasterLayer extends CompositeLayer<RasterLayerProps> {
const { indices, positions, texCoords } = mesh;

const layers: Layer[] = [
new SimpleMeshLayer(
new MeshTextureLayer(
this.getSubLayerProps({
id: "raster",
texture,
shaders,
// Dummy data because we're only rendering _one_ instance of this mesh
// https://github.com/visgl/deck.gl/blob/93111b667b919148da06ff1918410cf66381904f/modules/geo-layers/src/terrain-layer/terrain-layer.ts#L241
data: [1],
Expand Down
Loading