more fixes

Author: riccardobl

jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib

@@ -304,10 +304,9 @@
         surface.emission = vec3(0.0);        
         surface.ao = vec3(1.0);
         surface.lightMapColor = vec3(0.0);
-        surface.alpha = 1.0;
+        surface.alpha = 1.0;
         surface.roughness = 1.0;
         surface.metallic = 0.0;
-        surface.alpha = 1.0;
         surface.exposure = 1.0;
         surface.diffuseColor = vec3(1.0);
         surface.specularColor = vec3(0.04);
@@ -515,7 +514,7 @@
         void PBRLightingUtils_calculatePreLightingValues(inout PBRSurface surface){
             surface.frontFacing = gl_FrontFacing;
             surface.depth = gl_FragCoord.z;
-            surface.NdotV = clamp(abs(dot(!surface.frontFacing ? -surface.normal : surface.normal, surface.viewDir)), 0.001, 1.0);
+            surface.NdotV = clamp(abs(dot(surface.normal, surface.viewDir)), 0.001, 1.0);
 
             #ifdef SPECGLOSSPIPELINE
                 float maxSpecular = max(max(surface.specularColor.r, surface.specularColor.g), surface.specularColor.b);

jme3-effects/src/main/resources/Common/MatDefs/Post/Downsample.frag

@@ -24,9 +24,9 @@ void main() {
     vec3 b = getColor(m_Texture, vec2(texCoord.x,         texCoord.y + 2.0*y)).rgb;
     vec3 c = getColor(m_Texture, vec2(texCoord.x + 2.0*x, texCoord.y + 2.0*y)).rgb;
 
-    vec3 d = getColor(m_Texture, vec2(texCoord.x - 2*x, texCoord.y)).rgb;
+    vec3 d = getColor(m_Texture, vec2(texCoord.x - 2.0*x, texCoord.y)).rgb;
     vec3 e = getColor(m_Texture, vec2(texCoord.x,       texCoord.y)).rgb;
-    vec3 f = getColor(m_Texture, vec2(texCoord.x + 2*x, texCoord.y)).rgb;
+    vec3 f = getColor(m_Texture, vec2(texCoord.x + 2.0*x, texCoord.y)).rgb;
 
     vec3 g = getColor(m_Texture, vec2(texCoord.x - 2.0*x, texCoord.y - 2.0*y)).rgb;
     vec3 h = getColor(m_Texture, vec2(texCoord.x,         texCoord.y - 2.0*y)).rgb;

jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Modular/PBRTerrainUtils.glsllib

@@ -79,11 +79,11 @@
         float PBRTerrainUtils_getAlphaBlendFromChannel(int layer){
             float finalAlphaBlendForLayer = 0.0;
             vec4 alphaBlend = vec4(0.0);
-            if(float(layer) <= 3.0){
+            if(layer <= 3){
                 alphaBlend = alphaBlend_0;       
-            }else if(float(layer) <= 7.0){
+            }else if(layer <= 7){
                 alphaBlend = alphaBlend_1;
-            }else if(float(layer) <= 11.0){
+            }else if(layer <= 11){
                 alphaBlend = alphaBlend_2;
             }
             int texChannelForAlphaBlending = int(mod(float(layer), 4.0)); //pick the correct channel (r g b or a) based on the layer's index