Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/postprocessing/ShaderPass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/shaders/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down