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.

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

Fix incorrect metallic calculations in PBRLighting.frag #2334

Merged
merged 4 commits into from
Dec 31, 2024
Merged

Fix incorrect metallic calculations in PBRLighting.frag #2334

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68c9410
Fix incorrect metallic calculations in PBRLighting.frag
yaRnMcDonuts Dec 1, 2024
5b8a88b
Update PBRLighting.frag
yaRnMcDonuts Dec 3, 2024
fd08aef
Update PBRLighting.frag
yaRnMcDonuts Dec 30, 2024
54fa111
Update PBRLighting.frag
yaRnMcDonuts Dec 30, 2024
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: 2 additions & 4 deletions jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,9 @@ void main(){
Roughness = 1.0 - glossiness;
vec3 fZero = specularColor.xyz;
#else
float specular = 0.5;
float nonMetalSpec = 0.08 * specular;
vec4 specularColor = (nonMetalSpec - nonMetalSpec * Metallic) + albedo * Metallic;
vec4 specularColor = (0.04 - 0.04 * Metallic) + albedo * Metallic; // 0.04 is the standard base specular reflectance for non-metallic surfaces in PBR. While values like 0.08 can be used for different implementations, 0.04 aligns with Khronos' PBR specification.
vec4 diffuseColor = albedo - albedo * Metallic;
vec3 fZero = vec3(specular);
vec3 fZero = mix(vec3(0.04), albedo.rgb, Metallic);
#endif

gl_FragColor.rgb = vec3(0.0);
Expand Down
Loading