Skip to content

chore(shadertools); Add uniforms for pbrMaterial extensions #2394

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(shadertools); Add uniforms for pbrMaterial extensions #2394

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
57 changes: 57 additions & 0 deletions modules/shadertools/src/modules/lighting/pbr-material/pbr-material-glsl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,40 @@ uniform pbrMaterialUniforms {

bool alphaCutoffEnabled;
float alphaCutoff; // #ifdef ALPHA_CUTOFF

vec3 specularColorFactor;
float specularIntensityFactor;
bool specularColorMapEnabled;
bool specularIntensityMapEnabled;

float ior;

float transmissionFactor;
bool transmissionMapEnabled;

float thicknessFactor;
float attenuationDistance;
vec3 attenuationColor;

float clearcoatFactor;
float clearcoatRoughnessFactor;
bool clearcoatMapEnabled;

vec3 sheenColorFactor;
float sheenRoughnessFactor;
bool sheenColorMapEnabled;

float iridescenceFactor;
float iridescenceIor;
vec2 iridescenceThicknessRange;
bool iridescenceMapEnabled;

float anisotropyStrength;
float anisotropyRotation;
vec2 anisotropyDirection;
bool anisotropyMapEnabled;

float emissiveStrength;

// IBL
bool IBLenabled;
Expand Down Expand Up @@ -98,6 +132,29 @@ uniform sampler2D pbr_metallicRoughnessSampler;
#ifdef HAS_OCCLUSIONMAP
uniform sampler2D pbr_occlusionSampler;
#endif
#ifdef HAS_SPECULARCOLORMAP
uniform sampler2D pbr_specularColorSampler;
#endif
#ifdef HAS_SPECULARINTENSITYMAP
uniform sampler2D pbr_specularIntensitySampler;
#endif
#ifdef HAS_TRANSMISSIONMAP
uniform sampler2D pbr_transmissionSampler;
#endif
#ifdef HAS_CLEARCOATMAP
uniform sampler2D pbr_clearcoatSampler;
uniform sampler2D pbr_clearcoatRoughnessSampler;
#endif
#ifdef HAS_SHEENCOLORMAP
uniform sampler2D pbr_sheenColorSampler;
uniform sampler2D pbr_sheenRoughnessSampler;
#endif
#ifdef HAS_IRIDESCENCEMAP
uniform sampler2D pbr_iridescenceSampler;
#endif
#ifdef HAS_ANISOTROPYMAP
uniform sampler2D pbr_anisotropySampler;
#endif
#ifdef USE_IBL
uniform samplerCube pbr_diffuseEnvSampler;
uniform samplerCube pbr_specularEnvSampler;
Expand Down
57 changes: 57 additions & 0 deletions modules/shadertools/src/modules/lighting/pbr-material/pbr-material-wgsl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,40 @@ uniform pbrMaterialUniforms {

bool alphaCutoffEnabled;
float alphaCutoff; // #ifdef ALPHA_CUTOFF

vec3 specularColorFactor;
float specularIntensityFactor;
bool specularColorMapEnabled;
bool specularIntensityMapEnabled;

float ior;

float transmissionFactor;
bool transmissionMapEnabled;

float thicknessFactor;
float attenuationDistance;
vec3 attenuationColor;

float clearcoatFactor;
float clearcoatRoughnessFactor;
bool clearcoatMapEnabled;

vec3 sheenColorFactor;
float sheenRoughnessFactor;
bool sheenColorMapEnabled;

float iridescenceFactor;
float iridescenceIor;
vec2 iridescenceThicknessRange;
bool iridescenceMapEnabled;

float anisotropyStrength;
float anisotropyRotation;
vec2 anisotropyDirection;
bool anisotropyMapEnabled;

float emissiveStrength;

// IBL
bool IBLenabled;
Expand Down Expand Up @@ -65,6 +99,29 @@ uniform sampler2D u_MetallicRoughnessSampler;
#ifdef HAS_OCCLUSIONMAP
uniform sampler2D u_OcclusionSampler;
#endif
#ifdef HAS_SPECULARCOLORMAP
uniform sampler2D u_SpecularColorSampler;
#endif
#ifdef HAS_SPECULARINTENSITYMAP
uniform sampler2D u_SpecularIntensitySampler;
#endif
#ifdef HAS_TRANSMISSIONMAP
uniform sampler2D u_TransmissionSampler;
#endif
#ifdef HAS_CLEARCOATMAP
uniform sampler2D u_ClearcoatSampler;
uniform sampler2D u_ClearcoatRoughnessSampler;
#endif
#ifdef HAS_SHEENCOLORMAP
uniform sampler2D u_SheenColorSampler;
uniform sampler2D u_SheenRoughnessSampler;
#endif
#ifdef HAS_IRIDESCENCEMAP
uniform sampler2D u_IridescenceSampler;
#endif
#ifdef HAS_ANISOTROPYMAP
uniform sampler2D u_AnisotropySampler;
#endif
#ifdef USE_IBL
uniform samplerCube u_DiffuseEnvSampler;
uniform samplerCube u_SpecularEnvSampler;
Expand Down
89 changes: 88 additions & 1 deletion modules/shadertools/src/modules/lighting/pbr-material/pbr-material.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ export type PBRMaterialBindings = {
pbr_metallicRoughnessSampler?: Texture | null; // #ifdef HAS_METALROUGHNESSMAP
pbr_occlusionSampler?: Texture | null; // #ifdef HAS_OCCLUSIONMAP

pbr_specularColorSampler?: Texture | null; // #ifdef HAS_SPECULARCOLORMAP
pbr_specularIntensitySampler?: Texture | null; // #ifdef HAS_SPECULARINTENSITYMAP
pbr_transmissionSampler?: Texture | null; // #ifdef HAS_TRANSMISSIONMAP

pbr_clearcoatSampler?: Texture | null; // #ifdef HAS_CLEARCOATMAP
pbr_clearcoatRoughnessSampler?: Texture | null; // #ifdef HAS_CLEARCOATMAP
pbr_sheenColorSampler?: Texture | null; // #ifdef HAS_SHEENCOLORMAP
pbr_sheenRoughnessSampler?: Texture | null; // #ifdef HAS_SHEENCOLORMAP
pbr_iridescenceSampler?: Texture | null; // #ifdef HAS_IRIDESCENCEMAP
pbr_anisotropySampler?: Texture | null; // #ifdef HAS_ANISOTROPYMAP

// IBL Samplers
pbr_diffuseEnvSampler?: Texture | null; // #ifdef USE_IBL (samplerCube)
pbr_specularEnvSampler?: Texture | null; // #ifdef USE_IBL (samplerCube)
Expand Down Expand Up @@ -66,6 +77,41 @@ export type PBRMaterialUniforms = {
// #ifdef PBR_DEBUG
scaleDiffBaseMR?: Readonly<Vector4 | NumberArray4>;
scaleFGDSpec?: Readonly<Vector4 | NumberArray4>;

// glTF material extensions
specularColorFactor?: Readonly<Vector3 | NumberArray3>;
specularIntensityFactor?: number;
specularColorMapEnabled?: boolean;
specularIntensityMapEnabled?: boolean;

ior?: number;

transmissionFactor?: number;
transmissionMapEnabled?: boolean;

thicknessFactor?: number;
attenuationDistance?: number;
attenuationColor?: Readonly<Vector3 | NumberArray3>;

clearcoatFactor?: number;
clearcoatRoughnessFactor?: number;
clearcoatMapEnabled?: boolean;

sheenColorFactor?: Readonly<Vector3 | NumberArray3>;
sheenRoughnessFactor?: number;
sheenColorMapEnabled?: boolean;

iridescenceFactor?: number;
iridescenceIor?: number;
iridescenceThicknessRange?: Readonly<Vector2 | NumberArray2>;
iridescenceMapEnabled?: boolean;

anisotropyStrength?: number;
anisotropyRotation?: number;
anisotropyDirection?: Readonly<Vector2 | NumberArray2>;
anisotropyMapEnabled?: boolean;

emissiveStrength?: number;
};

export type PBRMaterialProps = PBRMaterialBindings & PBRMaterialUniforms;
Expand All @@ -91,6 +137,13 @@ export const pbrMaterial = {
HAS_OCCLUSIONMAP: false,
HAS_BASECOLORMAP: false,
HAS_METALROUGHNESSMAP: false,
HAS_SPECULARCOLORMAP: false,
HAS_SPECULARINTENSITYMAP: false,
HAS_TRANSMISSIONMAP: false,
HAS_CLEARCOATMAP: false,
HAS_SHEENCOLORMAP: false,
HAS_IRIDESCENCEMAP: false,
HAS_ANISOTROPYMAP: false,
ALPHA_CUTOFF: false,
USE_IBL: false,
PBR_DEBUG: false
Expand Down Expand Up @@ -126,6 +179,40 @@ export const pbrMaterial = {
// debugging flags used for shader output of intermediate PBR variables
// #ifdef PBR_DEBUG
scaleDiffBaseMR: 'vec4<f32>',
scaleFGDSpec: 'vec4<f32>'
scaleFGDSpec: 'vec4<f32>',

specularColorFactor: 'vec3<f32>',
specularIntensityFactor: 'f32',
specularColorMapEnabled: 'i32',
specularIntensityMapEnabled: 'i32',

ior: 'f32',

transmissionFactor: 'f32',
transmissionMapEnabled: 'i32',

thicknessFactor: 'f32',
attenuationDistance: 'f32',
attenuationColor: 'vec3<f32>',

clearcoatFactor: 'f32',
clearcoatRoughnessFactor: 'f32',
clearcoatMapEnabled: 'i32',

sheenColorFactor: 'vec3<f32>',
sheenRoughnessFactor: 'f32',
sheenColorMapEnabled: 'i32',

iridescenceFactor: 'f32',
iridescenceIor: 'f32',
iridescenceThicknessRange: 'vec2<f32>',
iridescenceMapEnabled: 'i32',

anisotropyStrength: 'f32',
anisotropyRotation: 'f32',
anisotropyDirection: 'vec2<f32>',
anisotropyMapEnabled: 'i32',

emissiveStrength: 'f32'
}
} as const satisfies ShaderModule<PBRMaterialProps, PBRMaterialUniforms, PBRMaterialBindings>;
Loading