fix(types): remove references to Shader type (#327)

pmndrs · Dec 23, 2023 · 8449f8e · 8449f8e
1 parent f35f76e
commit 8449f8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/postprocessing/ShaderPass.ts b/src/postprocessing/ShaderPass.ts
@@ -1,13 +1,14 @@
-import { Shader, ShaderMaterial, UniformsUtils, WebGLRenderer, WebGLRenderTarget } from 'three'
+import { ShaderMaterial, UniformsUtils, WebGLRenderer, WebGLRenderTarget } from 'three'
 import { Pass, FullScreenQuad } from './Pass'
+import { Defines, IShader, Uniforms } from '../shaders/types'
 
 class ShaderPass extends Pass {
   public textureID: string
-  public uniforms: Shader['uniforms']
+  public uniforms: Uniforms
   public material: ShaderMaterial
   public fsQuad: FullScreenQuad
 
-  constructor(shader: ShaderMaterial | (Shader & { defines?: Object }), textureID = 'tDiffuse') {
+  constructor(shader: ShaderMaterial | IShader<Uniforms, Defines | undefined>, textureID = 'tDiffuse') {
     super()
 
     this.textureID = textureID

diff --git a/src/shaders/types.ts b/src/shaders/types.ts
@@ -1,9 +1,9 @@
-import type { IUniform, Shader } from 'three'
+import type { IUniform } from 'three'
 
-type Defines = { [key: string]: boolean | number | string }
-type Uniforms = { [key: string]: IUniform }
+export type Defines = { [key: string]: boolean | number | string }
+export type Uniforms = { [key: string]: IUniform }
 
-export interface IShader<U extends Uniforms, D extends Defines | undefined = undefined> extends Shader {
+export interface IShader<U extends Uniforms, D extends Defines | undefined = undefined> {
   defines?: D
   fragmentShader: string
   uniforms: U