Skip to content
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

Jump to bottom

Remove updateModuleSettings from codebase #9160

Merged
merged 8 commits into from
Sep 26, 2024
Merged

Remove updateModuleSettings from codebase #9160

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8dfc569
Remove unneeded updateModuleSettings
felixpalmer Sep 18, 2024
cc4cf28
Remove setModuleParameters
felixpalmer Sep 18, 2024
29f4f37
Fix test
felixpalmer Sep 18, 2024
765ce6b
Workaround fp64 not useing UBO
felixpalmer Sep 18, 2024
92c6091
Don't rely of moduleParameters
felixpalmer Sep 18, 2024
cbf20d8
Pass through maskProps
felixpalmer Sep 18, 2024
0af3044
Merge branch 'master' into felix/remove-updateModuleSettings
felixpalmer Sep 26, 2024
884c9db
Use Matrix4Like
felixpalmer Sep 26, 2024
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
1 change: 0 additions & 1 deletion modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,6 @@ export default class HeatmapLayer<
const moduleSettings = this.getModuleSettings();
this._setModelAttributes(weightsTransform.model, attributes);
weightsTransform.model.setVertexCount(this.getNumInstances());
weightsTransform.model.updateModuleSettings(moduleSettings);

const weightProps: WeightProps = {
radiusPixels,
Expand Down
35 changes: 23 additions & 12 deletions modules/core/src/lib/layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
/** Update shader module parameters */
setModuleParameters(moduleParameters: any): void {
for (const model of this.getModels()) {
model.updateModuleSettings(moduleParameters);
// HACK as fp64 is not yet ported to UBO
model.uniforms = {ONE: 1};
}
}

Expand Down Expand Up @@ -1081,12 +1082,13 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
// @ts-expect-error material is not a Layer prop
const {material, modelMatrix} = this.props;

// Do not pass picking module to avoid crash
// TODO remove `setModuleParameters` from codebase
const {picking: _, ...rest} = moduleParameters;
this.setModuleParameters(rest);
this.setModuleParameters({});

const {
// mask
maskChannels,
maskMap,
maskSources,
// shadow
shadowEnabled,
drawToShadowMap,
Expand All @@ -1108,6 +1110,12 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
lightSources
} = moduleParameters;

const maskProps = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Type the props?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The type is in deck.gl/extensions and it is an open question whether this is the correct place to update the ShaderInputs as in many cases the referenced ShaderModules will not be present. Agree that we should type, will revisit when cleaning up, e.g. moving the shaderInputs.setProps into the extensions

maskChannels,
maskMap,
maskSources
};

const shadowProps = {
viewport,
shadowEnabled,
Expand All @@ -1130,22 +1138,25 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
terrainSkipRender
};

const projectProps = {
viewport,
devicePixelRatio,
modelMatrix,
coordinateSystem,
coordinateOrigin
} as ProjectProps;
felixpalmer marked this conversation as resolved.
Show resolved Hide resolved

this.setShaderModuleProps({
// TODO Revisit whether this is necessary once all layers ported to UBO
mask: maskProps,
shadow: shadowProps,
terrain: terrainProps,
layer: {opacity},
lighting: lightSources,
phongMaterial: material,
gouraudMaterial: material,
picking: {isActive, isAttribute} as PickingProps,
project: {
viewport,
devicePixelRatio,
modelMatrix,
coordinateSystem,
coordinateOrigin
} as ProjectProps
project: projectProps
});
}

Expand Down
7 changes: 2 additions & 5 deletions modules/extensions/src/fp64/fp64-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ export default class Fp64Extension extends LayerExtension {
}

draw(this: Layer, params: any, extension: this): void {
const {moduleParameters} = params;
if (moduleParameters) {
const {viewport} = moduleParameters;
this.setShaderModuleProps({project64: {viewport}});
}
const {viewport} = params.context;
this.setShaderModuleProps({project64: {viewport}});
}
}
4 changes: 2 additions & 2 deletions test/modules/extensions/fp64.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import test from 'tape-promise/tape';
import {Fp64Extension} from '@deck.gl/extensions';
import {COORDINATE_SYSTEM} from '@deck.gl/core';
import {ScatterplotLayer} from '@deck.gl/layers';
import {testLayer} from '@deck.gl/test-utils';
import {getLayerUniforms, testLayer} from '@deck.gl/test-utils';

test('Fp64Extension', t => {
const testCases = [
Expand All @@ -22,7 +22,7 @@ test('Fp64Extension', t => {
extensions: [new Fp64Extension()]
},
onAfterUpdate: ({layer}) => {
const {uniforms} = layer.state.model;
const uniforms = getLayerUniforms(layer);
t.ok(uniforms.viewProjectionMatrix, 'has fp64 uniforms');
t.ok(uniforms.viewProjectionMatrix64Low, 'has fp64 uniforms');
}
Expand Down
Loading