Merge pull request #2391 from jMonkeyEngine/yaRnMcDonuts-patch-3

Fix exception when using Instancing with Fog in PBR

Author: yaRnMcDonuts

jme3-core/src/main/resources/Common/MatDefs/Light/Lighting.vert

@@ -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;
@@ -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
-}
+}

jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.vert

@@ -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
 
 }