Skip to content

Adds typed uniforms to ShaderMaterial and RawShaderMaterial #1579

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

Open
haxiomic wants to merge 4 commits into
base: master
Choose a base branch
from
+7 −5
Open

Adds typed uniforms to ShaderMaterial and RawShaderMaterial #1579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81fd7a2
Add optionally typed uniforms to RawShaderMaterial
haxiomic Mar 19, 2025
386ca7b
Remove <any> for brevity
haxiomic Mar 19, 2025
1f3a08c
Add optionally typed uniforms to ShaderMaterial
haxiomic Mar 19, 2025
b76df9c
Merge pull request #1 from haxiomic/patch-2
haxiomic Mar 19, 2025
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
6 changes: 4 additions & 2 deletions types/three/src/materials/RawShaderMaterial.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { ShaderMaterial, ShaderMaterialParameters } from "./ShaderMaterial.js";

export class RawShaderMaterial extends ShaderMaterial {
constructor(parameters?: ShaderMaterialParameters);
export class RawShaderMaterial<T extends Record<string, IUniform> = any> extends ShaderMaterial {

Check failure on line 3 in types/three/src/materials/RawShaderMaterial.d.ts

View workflow job for this annotation

GitHub Actions / type-check 

Cannot find name 'IUniform'.
declare uniforms: T;

constructor(parameters?: Omit<ShaderMaterialParameters, 'uniforms'> & { uniforms: T });

/**
* Read-only flag to check if a given object is of type {@link RawShaderMaterial}.
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/materials/ShaderMaterial.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export interface ShaderMaterialJSON extends MaterialJSON {
extensions?: Record<string, boolean>;
}

export class ShaderMaterial extends Material {
constructor(parameters?: ShaderMaterialParameters);
export class ShaderMaterial<T extends Record<string, IUniform> = any> extends Material {
constructor(parameters?: Omit<ShaderMaterialParameters, 'uniforms'> & { uniforms: T });

/**
* Read-only flag to check if a given object is of type {@link ShaderMaterial}.
Expand All @@ -87,7 +87,7 @@ export class ShaderMaterial extends Material {
/**
* @default {}
*/
uniforms: { [uniform: string]: IUniform };
uniforms: T;

uniformsGroups: UniformsGroup[];

Expand Down
Loading