Skip to content

Add tbnMat variable to PBRSurface.glsl #2348

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
yaRnMcDonuts merged 5 commits into from
Jan 23, 2025
Merged

Add tbnMat variable to PBRSurface.glsl #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9e5734
Add tbnMat variable to PBRSurface.glsl
yaRnMcDonuts Jan 20, 2025
337696b
Update PBRLightingUtils.glsllib
yaRnMcDonuts Jan 20, 2025
5dd4869
Removed undeclared normal variable that is no longer needed
yaRnMcDonuts Jan 20, 2025
3d6a504
Update PBRLightingUtils.glsllib
yaRnMcDonuts Jan 22, 2025
9f6a168
Update PBRLightingUtils.glsllib
yaRnMcDonuts Jan 22, 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
3 changes: 2 additions & 1 deletion jme3-core/src/main/resources/Common/ShaderLib/module/PBRSurface.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
vec3 normal; // normals w/ normalmap
bool frontFacing; //gl_FrontFacing
float depth;
mat3 tbnMat;

// from texture
vec3 albedo;
Expand All @@ -36,4 +37,4 @@
#endstruct
#define PBRSurface StdPBRSurface
#endif
#endif
#endif
5 changes: 3 additions & 2 deletions jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@
#if defined(NORMALMAP) || defined(PARALLAXMAP)
vec3 tan = normalize(wTangent.xyz);
mat3 tbnMat = mat3(tan, wTangent.w * cross( surface.geometryNormal, tan), surface.geometryNormal);
surface.tbnMat = tbnMat;
#endif

vec2 newTexCoord;
Expand Down Expand Up @@ -338,7 +339,7 @@
#endif
surface.normal = normalize(tbnMat * normal);
#else
surface.normal = normal;
surface.normal = surface.geometryNormal;
#endif

//spec gloss tex reads:
Expand Down Expand Up @@ -589,4 +590,4 @@
#endif


#endif
#endif
Loading