From 1b3c2e4436b3a85f2d210b20dfd20ba3378abb80 Mon Sep 17 00:00:00 2001
From: Nehon <Nehon@Nehon-PC>
Date: Sun, 13 Apr 2014 20:15:19 +0200
Subject: [PATCH] Fixed some compilations warning in the lightScattering
 shaders and a compilation error in the glsl 1.2 shader

---
 .../resources/Common/MatDefs/Post/LightScattering.frag | 10 +++++-----
 .../Common/MatDefs/Post/LightScattering15.frag         |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering.frag b/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering.frag
index bc85142e0..55372bda1 100644
--- a/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering.frag
+++ b/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering.frag
@@ -14,23 +14,23 @@ void main(void)
    if(m_Display){
 
        vec4 colorRes= texture2D(m_Texture,texCoord);
-       float factor=(m_BlurWidth/float(m_NbSamples-1.0));
+       float factor=(m_BlurWidth/(float(m_NbSamples)-1.0));
        float scale;
        vec2 texCoo=texCoord - m_LightPosition.xy;
        vec2 scaledCoord;
        vec4 res = vec4(0.0);
        for(int i=0; i<m_NbSamples; i++) {
-            scale = i * factor + m_BlurStart ;
+            scale = float(i) * factor + m_BlurStart ;
             scaledCoord=texCoo*scale + m_LightPosition.xy;
             if(texture2D(m_DepthTexture,scaledCoord).r==1.0){
                 res += texture2D(m_Texture,scaledCoord);
             }
         }
-        res /= m_NbSamples;
+        res /= float(m_NbSamples);
 
         //Blend the original color with the averaged pixels
-        float mean = (res.r + res.g + res.b)/3;
-        fragColor =mix(colorRes ,mix( colorRes, res, m_LightDensity),mean);   
+        float mean = (res.r + res.g + res.b)/3.0;
+        gl_FragColor =mix(colorRes ,mix( colorRes, res, m_LightDensity),mean);   
     }else{
         gl_FragColor= texture2D(m_Texture,texCoord);
     }
diff --git a/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering15.frag b/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering15.frag
index 57547ea1a..f16b0ddee 100644
--- a/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering15.frag
+++ b/jme3-effects/src/main/resources/Common/MatDefs/Post/LightScattering15.frag
@@ -18,22 +18,22 @@ void main(void)
    if(m_Display){
 
        vec4 colorRes= getColor(m_Texture,texCoord);
-       float factor=(m_BlurWidth/float(m_NbSamples-1.0));
+       float factor=(m_BlurWidth/(float(m_NbSamples)-1.0));
        float scale;
        vec2 texCoo=texCoord - m_LightPosition.xy;
        vec2 scaledCoord;
        vec4 res = vec4(0.0);
        for(int i=0; i<m_NbSamples; i++) {
-            scale = i * factor + m_BlurStart ;
+            scale = float(i) * factor + m_BlurStart ;
             scaledCoord=texCoo*scale + m_LightPosition.xy;            
             if(fetchTextureSample(m_DepthTexture, scaledCoord,0).r==1.0){
                 res += fetchTextureSample(m_Texture,scaledCoord,0);
                 }
             }
-        res /= m_NbSamples;
+        res /= float(m_NbSamples);
         
         //Blend the original color with the averaged pixels
-        float mean = (res.r + res.g + res.b)/3;
+        float mean = (res.r + res.g + res.b)/3.0;
         fragColor =mix(colorRes ,mix( colorRes, res, m_LightDensity),mean);        
     }else{
         fragColor = getColor(m_Texture,texCoord);