Skip to content

Update tank material pointing to deleted copy of PBRLighting #2360

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 4 commits into from
Feb 3, 2025
Merged

Update tank material pointing to deleted copy of PBRLighting #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19fd78d
Update tank material pointing to deleted copy of PBRLighting
yaRnMcDonuts Feb 3, 2025
6561072
Fix Broken Asset Paths in modular PBR
yaRnMcDonuts Feb 3, 2025
de87ee7
Fix more asset paths
yaRnMcDonuts Feb 3, 2025
a7a0b24
Update another broken asset path
yaRnMcDonuts Feb 3, 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
2 changes: 1 addition & 1 deletion 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 @@ -20,7 +20,7 @@ uniform vec4 g_LightData[NB_LIGHTS];
uniform vec3 g_CameraPosition;

#ifdef USE_FOG
#import "MatDefs/ShaderLib/MaterialFog.glsllib"
#import "Common/ShaderLib/MaterialFog.glsllib"
#endif

void main(){
Expand Down
4 changes: 2 additions & 2 deletions jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#define ENABLE_PBRTerrainUtils_readPBRTerrainLayers 1

#import "Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib"
#import "Common/MatDefs/ShaderLib/PBRTerrainUtils.glsllib"
#import "Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib"
#ifdef AFFLICTIONTEXTURE
#import "Common/MatDefs/ShaderLib/AfflictionLib.glsllib"
#import "Common/MatDefs/Terrain/Modular/AfflictionLib.glsllib"
#endif

//declare PBR Lighting vars
Expand Down
2 changes: 1 addition & 1 deletion jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __PBR_TERRAIN_UTILS_MODULE__
#define __PBR_TERRAIN_UTILS_MODULE__

#import "Common/MatDefs/ShaderLib/PBRTerrainTextureLayer.glsl"
#import "Common/MatDefs/Terrain/Modular/PBRTerrainTextureLayer.glsl"

#import "Common/ShaderLib/TangentUtils.glsllib"
#import "Common/ShaderLib/TriPlanarUtils.glsllib"
Expand Down
2 changes: 1 addition & 1 deletion jme3-testdata/src/main/resources/Models/Tank/tank.j3m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Material Tank : Common/MatDefs/Light/modular/PBRLighting.j3md {
Material Tank : Common/MatDefs/Light/PBRLighting.j3md {
MaterialParameters {

MetallicRoughnessMap : Flip Models/Tank/Tank_Occ_Rough_Metal.png
Expand Down