Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions packages/Main/src/Renderer/LayeredMaterial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,8 @@ export class LayeredMaterial extends THREE.ShaderMaterial {
public override defines: LayeredMaterialDefines;

constructor(options: LayeredMaterialParameters = {}, crsCount: number) {
const lambertUniforms = THREE.UniformsUtils.clone(THREE.ShaderLib.lambert.uniforms);
const shaderMaterialParams: THREE.ShaderMaterialParameters = { ...options };
shaderMaterialParams.uniforms = shaderMaterialParams.uniforms ?? {};
Object.assign(shaderMaterialParams.uniforms, lambertUniforms);
super(shaderMaterialParams);
if (__DEBUG__) { this.name = 'LayeredMaterial'; }
super(options);
this.name = 'LayeredMaterial';

nbSamplers ??= [samplersElevationCount, getMaxColorSamplerUnitsCount()];

Expand Down Expand Up @@ -395,6 +391,13 @@ export class LayeredMaterial extends THREE.ShaderMaterial {
colorTextureCount: 0,
});

const lambertUniforms = THREE.UniformsUtils.clone(THREE.ShaderLib.lambert.uniforms);
const lambertUniformValues: Record<string, unknown> = {};
for (const [name, uniform] of Object.entries(lambertUniforms)) {
lambertUniformValues[name] = uniform.value;
}
this.initUniforms(lambertUniformValues);

// Can't do an ES6 getter/setter here because it would override the
// Material::visible property with accessors, which is not allowed.
Object.defineProperty(this, 'visible', {
Expand All @@ -416,8 +419,6 @@ export class LayeredMaterial extends THREE.ShaderMaterial {
}
},
});

// setTimeout(() => console.log(this), 2);
}

public get mode(): number {
Expand Down
1 change: 1 addition & 0 deletions packages/Main/src/Renderer/c3DEngine.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class c3DEngine {
this.fullSizeRenderTarget.setSize(this.width, this.height);
this.renderer.setSize(this.width, this.height);
this.label2dRenderer.setSize(this.width, this.height);
this.composer.setSize(this.width, this.height);
}.bind(this);

// Create renderer
Expand Down
Loading