From 12fe065558c33d2496ffd08464682c55d25cf38e Mon Sep 17 00:00:00 2001 From: Ib Green Date: Thu, 25 Apr 2024 09:21:05 -0400 Subject: [PATCH] wip --- modules/core/src/effects/post-process-effect.ts | 4 ++-- modules/core/src/passes/shadow-pass.ts | 4 ++-- modules/core/src/utils/texture.ts | 1 - .../src/collision-filter/collision-filter-effect.ts | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/core/src/effects/post-process-effect.ts b/modules/core/src/effects/post-process-effect.ts index 7b294fa9def..860a97cc68d 100644 --- a/modules/core/src/effects/post-process-effect.ts +++ b/modules/core/src/effects/post-process-effect.ts @@ -1,5 +1,5 @@ import type {Device, Framebuffer} from '@luma.gl/core'; -import {normalizeShaderModule, ShaderPass} from '@luma.gl/shadertools'; +import {initializeShaderModule, ShaderPass} from '@luma.gl/shadertools'; import ScreenPass from '../passes/screen-pass'; @@ -14,7 +14,7 @@ export default class PostProcessEffect implement constructor(module: ShaderPassT, props: ShaderPassT['props']) { this.id = `${module.name}-pass`; this.props = props; - normalizeShaderModule(module); + initializeShaderModule(module); this.module = module; } diff --git a/modules/core/src/passes/shadow-pass.ts b/modules/core/src/passes/shadow-pass.ts index 753517c6fb8..fec133a0195 100644 --- a/modules/core/src/passes/shadow-pass.ts +++ b/modules/core/src/passes/shadow-pass.ts @@ -36,8 +36,8 @@ export default class ShadowPass extends LayersPass { mipmaps: false, // TODO fix getWebGLTextureParameters() in luma to avoid passing deprecated parameters - dataFormat: 6402, // gl.DEPTH_COMPONENT - type: 5125 // gl.UNSIGNED_INT + // dataFormat: 6402, // gl.DEPTH_COMPONENT + // type: 5125 // gl.UNSIGNED_INT }); this.fbo = device.createFramebuffer({ diff --git a/modules/core/src/utils/texture.ts b/modules/core/src/utils/texture.ts index 46d92404041..4d7f37419df 100644 --- a/modules/core/src/utils/texture.ts +++ b/modules/core/src/utils/texture.ts @@ -29,7 +29,6 @@ export function createTexture( sampler: SamplerProps ): Texture | null { if (image instanceof Texture) { - // @ts-expect-error This type error seems like it shouldn't happen... return image; } else if (image.constructor && image.constructor.name !== 'Object') { // Browser object diff --git a/modules/extensions/src/collision-filter/collision-filter-effect.ts b/modules/extensions/src/collision-filter/collision-filter-effect.ts index fa05ee2b02f..ab857c1f9b6 100644 --- a/modules/extensions/src/collision-filter/collision-filter-effect.ts +++ b/modules/extensions/src/collision-filter/collision-filter-effect.ts @@ -251,8 +251,8 @@ export default class CollisionFilterEffect implements Effect { mipmaps: false, // TODO fix getWebGLTextureParameters() in luma to avoid passing deprecated parameters - dataFormat: 6402, // gl.DEPTH_COMPONENT - type: 5125 // gl.UNSIGNED_INT + // dataFormat: 6402, // gl.DEPTH_COMPONENT + // type: 5125 // gl.UNSIGNED_INT }); this.collisionFBOs[collisionGroup] = device.createFramebuffer({ id: `collision-${collisionGroup}`,