giers10/webeditor3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor texture set creation and disposal to use generic Material types

Browse Source
This commit is contained in:
Victor Giers
2026-05-18 16:02:02 +02:00
parent e35452d6d6
commit 8adcaefe4b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/viewport-three/viewport-host.ts
View File

@@ -2364,7 +2364,7 @@ export class ViewportHost {
this.renderer.autoClear = true; this.renderer.autoClear = true;
for (const cachedTexture of this.materialTextureCache.values()) { for (const cachedTexture of this.materialTextureCache.values()) {
disposeStarterMaterialTextureSet(cachedTexture.textureSet); disposeMaterialTextureSet(cachedTexture.textureSet);
} }
this.materialTextureCache.clear(); this.materialTextureCache.clear();
@@ -10740,7 +10740,7 @@ export class ViewportHost {
} }
private getOrCreateTextureSet(material: MaterialDef) { private getOrCreateTextureSet(material: MaterialDef) {
const signature = createStarterMaterialSignature(material); const signature = createMaterialSignature(material, this.loadedImageAssets);
const cachedTexture = this.materialTextureCache.get(material.id); const cachedTexture = this.materialTextureCache.get(material.id);
if (cachedTexture !== undefined && cachedTexture.signature === signature) { if (cachedTexture !== undefined && cachedTexture.signature === signature) {
@@ -10748,12 +10748,13 @@ export class ViewportHost {
} }
if (cachedTexture !== undefined) { if (cachedTexture !== undefined) {
disposeStarterMaterialTextureSet(cachedTexture.textureSet); disposeMaterialTextureSet(cachedTexture.textureSet);
} }
const textureSet = createStarterMaterialTextureSet( const textureSet = createMaterialTextureSet(
material, material,
this.materialTextureLoader this.materialTextureLoader,
this.loadedImageAssets
); );
this.materialTextureCache.set(material.id, { this.materialTextureCache.set(material.id, {