Skip to content

MaterialNode: Add specularStrength #26444

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
Jul 16, 2023
Merged

MaterialNode: Add specularStrength #26444

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
16 changes: 11 additions & 5 deletions examples/jsm/nodes/accessors/MaterialNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,24 @@ class MaterialNode extends Node {

node = this.getColor( 'specular' );

} else if ( scope === MaterialNode.REFLECTIVITY ) {
} else if ( scope === MaterialNode.SPECULAR_STRENGTH ) {

const reflectivityNode = this.getFloat( 'reflectivity' );
const specularNode = this.getColor( 'specular' );

if ( material.specularMap && material.specularMap.isTexture === true ) {

node = reflectivityNode.mul( this.getTexture( 'specularMap' ).r );
node = specularNode.mul( this.getTexture( 'specularMap' ).r );

} else {

node = reflectivityNode;
node = specularNode;

}

} else if ( scope === MaterialNode.REFLECTIVITY ) {

node = this.getFloat( 'reflectivity' );

} else if ( scope === MaterialNode.ROUGHNESS ) {

const roughnessNode = this.getFloat( 'roughness' );
Expand Down Expand Up @@ -246,7 +250,8 @@ MaterialNode.ALPHA_TEST = 'alphaTest';
MaterialNode.COLOR = 'color';
MaterialNode.OPACITY = 'opacity';
MaterialNode.SHININESS = 'shininess';
MaterialNode.SPECULAR_COLOR = 'specularColor';
MaterialNode.SPECULAR = 'specular';
MaterialNode.SPECULAR_STRENGTH = 'specularStrength';
MaterialNode.REFLECTIVITY = 'reflectivity';
MaterialNode.ROUGHNESS = 'roughness';
MaterialNode.METALNESS = 'metalness';
Expand All @@ -265,6 +270,7 @@ export const materialShininess = nodeImmutable( MaterialNode, MaterialNode.SHINI
export const materialEmissive = nodeImmutable( MaterialNode, MaterialNode.EMISSIVE );
export const materialOpacity = nodeImmutable( MaterialNode, MaterialNode.OPACITY );
export const materialSpecularColor = nodeImmutable( MaterialNode, MaterialNode.SPECULAR_COLOR );
export const materialSpecularStrength = nodeImmutable( MaterialNode, MaterialNode.SPECULAR_STRENGTH );
export const materialReflectivity = nodeImmutable( MaterialNode, MaterialNode.REFLECTIVITY );
export const materialRoughness = nodeImmutable( MaterialNode, MaterialNode.ROUGHNESS );
export const materialMetalness = nodeImmutable( MaterialNode, MaterialNode.METALNESS );
Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/nodes/functions/PhongLightingModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import BRDF_Lambert from './BSDF/BRDF_Lambert.js';
import BRDF_BlinnPhong from './BSDF/BRDF_BlinnPhong.js';
import { lightingModel } from '../core/LightingModel.js';
import { diffuseColor } from '../core/PropertyNode.js';
import { materialReflectivity } from '../accessors/MaterialNode.js';
import { materialSpecularStrength } from '../accessors/MaterialNode.js';
import { transformedNormalView } from '../accessors/NormalNode.js';
import { tslFn } from '../shadernode/ShaderNode.js';

Expand All @@ -13,7 +13,7 @@ const RE_Direct_BlinnPhong = tslFn( ( { lightDirection, lightColor, reflectedLig

reflectedLight.directDiffuse.addAssign( irradiance.mul( BRDF_Lambert( { diffuseColor: diffuseColor.rgb } ) ) );

reflectedLight.directSpecular.addAssign( irradiance.mul( BRDF_BlinnPhong( { lightDirection } ) ).mul( materialReflectivity ) );
reflectedLight.directSpecular.addAssign( irradiance.mul( BRDF_BlinnPhong( { lightDirection } ) ).mul( materialSpecularStrength ) );

} );

Expand Down