Skip to content

Commit e6c6891

Browse files
committed
effects disable
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
1 parent 7965ec0 commit e6c6891

File tree

3 files changed

+55
-36
lines changed

3 files changed

+55
-36
lines changed

src/effects/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@kepler.gl/types": "3.2.5",
3737
"@kepler.gl/utils": "3.2.5",
3838
"@luma.gl/core": "^9.2.0",
39+
"@luma.gl/effects": "^9.2.5",
3940
"@luma.gl/shadertools": "^9.2.0",
4041
"moment-timezone": "^0.5.35",
4142
"suncalc": "^1.9.0"

src/effects/src/post-processing-effect.ts

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
// SPDX-License-Identifier: MIT
22
// Copyright contributors to the kepler.gl project
33

4-
// @ts-nocheck - luma.gl 9.x has completely restructured shader modules
5-
// TODO: Refactor to use luma.gl 9.x shader module patterns
6-
74
import {PostProcessEffect as DeckPostProcessEffect} from '@deck.gl/core';
8-
9-
// In luma.gl 9.x, these shader modules have been restructured
10-
// For now, use empty placeholders
11-
const brightnessContrast = {};
12-
const ink = {};
13-
const triangleBlur = {};
14-
const hueSaturation = {};
15-
const vibrance = {};
16-
const colorHalftone = {};
17-
const dotScreen = {};
18-
const edgeWork = {};
19-
const noise = {};
20-
const sepia = {};
21-
const tiltShift = {};
22-
const vignette = {};
23-
const zoomBlur = {};
24-
const magnify = {};
25-
const hexagonalPixelate = {};
5+
import {
6+
brightnessContrast,
7+
ink,
8+
triangleBlur,
9+
hueSaturation,
10+
vibrance,
11+
colorHalftone,
12+
dotScreen,
13+
edgeWork,
14+
noise,
15+
sepia,
16+
tiltShift,
17+
vignette,
18+
zoomBlur,
19+
magnify,
20+
hexagonalPixelate
21+
} from '@luma.gl/effects';
2622

2723
import {POSTPROCESSING_EFFECTS, DEFAULT_POST_PROCESSING_EFFECT_TYPE} from '@kepler.gl/constants';
2824
import {EffectPropsPartial, EffectParameterDescription} from '@kepler.gl/types';
@@ -118,20 +114,28 @@ class PostProcessingEffect extends Effect {
118114

119115
_initializeEffect() {
120116
const effectDesc = POSTPROCESSING_EFFECTS_DESCS.find(desc => desc.type === this.type);
121-
if (effectDesc) {
122-
this.deckEffect = new DeckPostProcessEffect(effectDesc.class, this.parameters);
117+
if (effectDesc && effectDesc.class) {
118+
try {
119+
this.deckEffect = new DeckPostProcessEffect(effectDesc.class, this.parameters);
123120

124-
const uniforms = this.deckEffect?.module?.uniforms;
125-
if (uniforms) {
126-
// get default parameters
127-
const keys = Object.keys(uniforms);
128-
const defaultParameters = {};
129-
keys.forEach(key => {
130-
defaultParameters[key] = getDefaultValueForParameter(key, this._uiConfig, uniforms);
131-
});
132-
this.parameters = {...defaultParameters, ...this.parameters};
133-
this.deckEffect?.setProps(this.parameters);
121+
const uniforms = this.deckEffect?.module?.uniforms;
122+
if (uniforms) {
123+
// get default parameters
124+
const keys = Object.keys(uniforms);
125+
const defaultParameters = {};
126+
keys.forEach(key => {
127+
defaultParameters[key] = getDefaultValueForParameter(key, this._uiConfig, uniforms);
128+
});
129+
this.parameters = {...defaultParameters, ...this.parameters};
130+
this.deckEffect?.setProps(this.parameters);
131+
}
132+
} catch (error) {
133+
console.warn(`Failed to initialize post-processing effect "${this.type}":`, error);
134+
this.deckEffect = null;
134135
}
136+
} else {
137+
console.warn(`Post-processing effect "${this.type}" is not properly configured`);
138+
this.deckEffect = null;
135139
}
136140
}
137141

@@ -143,8 +147,8 @@ class PostProcessingEffect extends Effect {
143147
super.setProps(props);
144148

145149
// any uniform updated?
146-
if (props.parameters) {
147-
this.deckEffect?.setProps(this.parameters);
150+
if (props.parameters && this.deckEffect) {
151+
this.deckEffect.setProps(this.parameters);
148152
}
149153
}
150154
}

yarn.lock

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5202,6 +5202,7 @@ __metadata:
52025202
"@kepler.gl/types": "npm:3.2.5"
52035203
"@kepler.gl/utils": "npm:3.2.5"
52045204
"@luma.gl/core": "npm:^9.2.0"
5205+
"@luma.gl/effects": "npm:^9.2.5"
52055206
"@luma.gl/shadertools": "npm:^9.2.0"
52065207
moment-timezone: "npm:^0.5.35"
52075208
suncalc: "npm:^1.9.0"
@@ -6102,6 +6103,19 @@ __metadata:
61026103
languageName: node
61036104
linkType: hard
61046105

6106+
"@luma.gl/effects@npm:^9.2.5":
6107+
version: 9.2.5
6108+
resolution: "@luma.gl/effects@npm:9.2.5"
6109+
dependencies:
6110+
"@math.gl/core": "npm:^4.1.0"
6111+
"@math.gl/types": "npm:^4.1.0"
6112+
wgsl_reflect: "npm:^1.0.1"
6113+
peerDependencies:
6114+
"@luma.gl/shadertools": ~9.2.0
6115+
checksum: 10c0/0c62eda62ea1242ae273ef85abfe508a75e2b30e81174d5c567e80ee965972d323428a7469b74c6c38a852fd86c9497ada08d4b981a820fb8ba30d140984506e
6116+
languageName: node
6117+
linkType: hard
6118+
61056119
"@luma.gl/engine@npm:9.2.4":
61066120
version: 9.2.4
61076121
resolution: "@luma.gl/engine@npm:9.2.4"
@@ -31680,7 +31694,7 @@ __metadata:
3168031694
languageName: node
3168131695
linkType: hard
3168231696

31683-
"wgsl_reflect@npm:^1.2.0":
31697+
"wgsl_reflect@npm:^1.0.1, wgsl_reflect@npm:^1.2.0":
3168431698
version: 1.2.3
3168531699
resolution: "wgsl_reflect@npm:1.2.3"
3168631700
checksum: 10c0/0ac66a98607a606ea0d9c419de9be63137ab0cbe05a9024f65fe3d606de1ab40d5b6a50a8fc30b8ad5b06dc7d676e7e5f6c4218ce0061f2b4a17d3722ca363b4

0 commit comments

Comments
 (0)