Merge pull request #2360 from jMonkeyEngine/yaRnMcDonuts-patch-5

Update tank material pointing to deleted copy of PBRLighting
jMonkeyEngine · Feb 3, 2025 · 1f31c14 · 1f31c14
2 parents 7e2f336 + a7a0b24
commit 1f31c14
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag
@@ -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(){

diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag
@@ -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

diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib
@@ -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"

diff --git a/jme3-testdata/src/main/resources/Models/Tank/tank.j3m b/jme3-testdata/src/main/resources/Models/Tank/tank.j3m
@@ -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