Skip to content
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.

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

WebGPURenderer: support specularColorMap #916

Merged
merged 1 commit into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion types/three/examples/jsm/nodes/Nodes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export {
materialSheen,
materialSheenRoughness,
materialShininess,
materialSpecularColor,
materialSpecular,
materialSpecularStrength,
} from "./accessors/MaterialNode.js";
export { default as MaterialReferenceNode, materialReference } from "./accessors/MaterialReferenceNode.js";
Expand Down
12 changes: 6 additions & 6 deletions types/three/examples/jsm/nodes/accessors/MaterialNode.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export type MaterialNodeScope =
| typeof MaterialNode.COLOR
| typeof MaterialNode.OPACITY
| typeof MaterialNode.SHININESS
| typeof MaterialNode.SPECULAR_COLOR
| typeof MaterialNode.SPECULAR
| typeof MaterialNode.SPECULAR_STRENGTH
| typeof MaterialNode.SPECULAR_INTENSITY
| typeof MaterialNode.SPECULAR_COLOR2
| typeof MaterialNode.SPECULAR_COLOR
| typeof MaterialNode.REFLECTIVITY
| typeof MaterialNode.ROUGHNESS
| typeof MaterialNode.METALNESS
Expand Down Expand Up @@ -44,10 +44,10 @@ export default class MaterialNode extends Node {
static COLOR: "color";
static OPACITY: "opacity";
static SHININESS: "shininess";
static SPECULAR_COLOR: "specular";
static SPECULAR: "specular";
static SPECULAR_STRENGTH: "specularStrength";
static SPECULAR_INTENSITY: "specularIntensity";
static SPECULAR_COLOR2: "specularColor";
static SPECULAR_COLOR: "specularColor";
static REFLECTIVITY: "reflectivity";
static ROUGHNESS: "roughness";
static METALNESS: "metalness";
Expand Down Expand Up @@ -84,10 +84,10 @@ export const materialColor: ShaderNodeObject<MaterialNode>;
export const materialShininess: ShaderNodeObject<MaterialNode>;
export const materialEmissive: ShaderNodeObject<MaterialNode>;
export const materialOpacity: ShaderNodeObject<MaterialNode>;
export const materialSpecularColor: ShaderNodeObject<MaterialNode>;
export const materialSpecular: ShaderNodeObject<MaterialNode>;

export const materialSpecularIntensity: ShaderNodeObject<MaterialNode>;
export const materialSpecularColor2: ShaderNodeObject<MaterialNode>;
export const materialSpecularColor: ShaderNodeObject<MaterialNode>;

export const materialSpecularStrength: ShaderNodeObject<MaterialNode>;
export const materialReflectivity: ShaderNodeObject<MaterialNode>;
Expand Down
Loading