From 19fd78d829132f6153d8a0b991b418d0b6bad087 Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Mon, 3 Feb 2025 04:18:56 -0500 Subject: [PATCH 1/4] Update tank material pointing to deleted copy of PBRLighting In the process of cutting the next alpha release, I ran into a crash with the SimplePBRTest example. This tank material was previously changed to test the new modular pbr shaders when the shaders were in a separate directory for preliminary testing last year. But now they were deleted (and have replaced the main PBR shader) so this test crashes with an assetNotFoundException, and just needed updated to point back to Common/MatDefs/Light/PBRLighting.j3md --- jme3-testdata/src/main/resources/Models/Tank/tank.j3m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jme3-testdata/src/main/resources/Models/Tank/tank.j3m b/jme3-testdata/src/main/resources/Models/Tank/tank.j3m index dd13f8a06f..3cd8ac4287 100644 --- 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 From 65610728655c1ce30761ef19ea85a579ec8cb239 Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Mon, 3 Feb 2025 04:31:23 -0500 Subject: [PATCH 2/4] Fix Broken Asset Paths in modular PBR --- .../resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/AdvancedPBRTerrain.frag index 48d0347154..d889ec82b7 100644 --- 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 From de87ee7f0519f48079756b3fe9b16e9925c1b95c Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Mon, 3 Feb 2025 04:43:14 -0500 Subject: [PATCH 3/4] Fix more asset paths --- .../Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 187a38351a..9dc9390c45 100644 --- 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" From a7a0b246bdce297843430724013074af6ae93b63 Mon Sep 17 00:00:00 2001 From: Ryan McDonough Date: Mon, 3 Feb 2025 04:57:09 -0500 Subject: [PATCH 4/4] Update another broken asset path --- .../src/main/resources/Common/MatDefs/Light/PBRLighting.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag index 7e990aac80..c6630a0fa0 100644 --- 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(){