Skip to content

Fix exception when using Instancing with Fog in PBR #2391

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 3 commits into from
Mar 12, 2025
Merged

Fix exception when using Instancing with Fog in PBR #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
946b3ea
Fix exception when using Instancing with Fog in PBR
yaRnMcDonuts Mar 7, 2025
c372b32
Minor formatting update to Lighting.vert
yaRnMcDonuts Mar 8, 2025
94cba89
rename varying fog_distance to fogDistance to match expected name in …
yaRnMcDonuts Mar 8, 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
8 changes: 4 additions & 4 deletions jme3-core/src/main/resources/Common/MatDefs/Light/Lighting.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

// fog - jayfella
#ifdef USE_FOG
varying float fog_distance;
uniform vec3 g_CameraPosition;
varying float fogDistance;
uniform vec3 g_CameraPosition;
#endif

uniform vec4 m_Ambient;
Expand Down Expand Up @@ -186,6 +186,6 @@ void main(){
#endif

#ifdef USE_FOG
fog_distance = distance(g_CameraPosition, (TransformWorld(modelSpacePos)).xyz);
fogDistance = distance(g_CameraPosition, (TransformWorld(modelSpacePos)).xyz);
#endif
}
}
2 changes: 1 addition & 1 deletion jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void main(){
#endif

#ifdef USE_FOG
fogDistance = distance(g_CameraPosition, (g_WorldMatrix * modelSpacePos).xyz);
fogDistance = distance(g_CameraPosition, (TransformWorld(modelSpacePos)).xyz);
#endif

}