Skip to content

Commit 8449f8e

Browse files
authored
fix(types): remove references to Shader type (#327)
1 parent f35f76e commit 8449f8e

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/postprocessing/ShaderPass.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import { Shader, ShaderMaterial, UniformsUtils, WebGLRenderer, WebGLRenderTarget } from 'three'
1+
import { ShaderMaterial, UniformsUtils, WebGLRenderer, WebGLRenderTarget } from 'three'
22
import { Pass, FullScreenQuad } from './Pass'
3+
import { Defines, IShader, Uniforms } from '../shaders/types'
34

45
class ShaderPass extends Pass {
56
public textureID: string
6-
public uniforms: Shader['uniforms']
7+
public uniforms: Uniforms
78
public material: ShaderMaterial
89
public fsQuad: FullScreenQuad
910

10-
constructor(shader: ShaderMaterial | (Shader & { defines?: Object }), textureID = 'tDiffuse') {
11+
constructor(shader: ShaderMaterial | IShader<Uniforms, Defines | undefined>, textureID = 'tDiffuse') {
1112
super()
1213

1314
this.textureID = textureID

src/shaders/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { IUniform, Shader } from 'three'
1+
import type { IUniform } from 'three'
22

3-
type Defines = { [key: string]: boolean | number | string }
4-
type Uniforms = { [key: string]: IUniform }
3+
export type Defines = { [key: string]: boolean | number | string }
4+
export type Uniforms = { [key: string]: IUniform }
55

6-
export interface IShader<U extends Uniforms, D extends Defines | undefined = undefined> extends Shader {
6+
export interface IShader<U extends Uniforms, D extends Defines | undefined = undefined> {
77
defines?: D
88
fragmentShader: string
99
uniforms: U

0 commit comments

Comments
 (0)