* Updated to latest version of Nifty GUI 1.3

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7270 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar
index 757c35b..eb628a8 100644 (file)
Binary files a/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar differ

diff --git a/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar
index 755edf2..391f581 100644 (file)
Binary files a/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar differ

diff --git a/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar
index 926297f..02048f4 100644 (file)
Binary files a/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar differ

diff --git a/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar
index 69a4434..47e3598 100644 (file)
Binary files a/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar differ

diff --git a/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag b/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag
index a33499f..f5cfea9 100644 (file)
--- a/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag
+++ b/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag
@@ -4,30 +4,28 @@ uniform COLORTEXTURE m_Texture;
 \r
 uniform float m_ExposurePow;\r
 uniform float m_ExposureCutoff;\r
-in vec2 texCoord;\r
 \r
+in vec2 texCoord;\r
 \r
 #ifdef HAS_GLOWMAP\r
   uniform sampler2D m_GlowMap;\r
 #endif\r
 \r
-void main(void)\r
-{ \r
+void main(){\r
    vec4 color;\r
    #ifdef DO_EXTRACT\r
-\r
-    color = getColor(m_Texture, texCoord);\r
-    if ( (color.r+color.g+color.b)/3.0 < m_ExposureCutoff ) {\r
-          color = vec4(0.0);\r
-    }else{\r
-          color = pow(color,vec4(m_ExposurePow));\r
-    }\r
+     color = getColor(m_Texture, texCoord);\r
+     if ( (color.r + color.g + color.b) / 3.0 < m_ExposureCutoff ) {\r
+         color = vec4(0.0);\r
+      }else{\r
+         color = pow(color, vec4(m_ExposurePow));\r
+      }\r
    #endif\r
 \r
    #ifdef HAS_GLOWMAP\r
         vec4 glowColor = texture2D( m_GlowMap, texCoord );\r
-        glowColor = pow(glowColor,vec4(m_ExposurePow));\r
-        color+=glowColor;\r
+        glowColor = pow(glowColor, vec4(m_ExposurePow));\r
+        color += glowColor;\r
    #endif\r
    \r
    gl_FragColor = color;\r

diff --git a/engine/src/core-data/Common/ShaderLib/MultiSample.glsllib b/engine/src/core-data/Common/ShaderLib/MultiSample.glsllib
index e0aa753..e1f8f92 100644 (file)
--- a/engine/src/core-data/Common/ShaderLib/MultiSample.glsllib
+++ b/engine/src/core-data/Common/ShaderLib/MultiSample.glsllib
@@ -1,6 +1,7 @@
 #extension GL_ARB_texture_multisample : enable\r
 uniform int m_NumSamples;\r
 uniform int m_NumSamplesDepth;\r
+\r
 #ifdef RESOLVE_MS\r
     #define COLORTEXTURE sampler2DMS\r
 #else\r
@@ -9,7 +10,6 @@ uniform int m_NumSamplesDepth;
 \r
 #ifdef RESOLVE_DEPTH_MS\r
     #define DEPTHTEXTURE sampler2DMS\r
-\r
 #else\r
     #define DEPTHTEXTURE sampler2D\r
 #endif\r
@@ -17,10 +17,10 @@ uniform int m_NumSamplesDepth;
 vec4 textureFetch(in sampler2DMS tex,in vec2 texC, in int numSamples){\r
       ivec2 iTexC = ivec2(texC * textureSize(tex));\r
       vec4 color = vec4(0.0);\r
-      for (int i=0;i<numSamples;i++){\r
+      for (int i = 0; i < numSamples; i++){\r
          color += texelFetch(tex, iTexC, i);\r
       }\r
-      return color/numSamples;\r
+      return color / numSamples;\r
 }\r
 \r
 vec4 fetchTextureSample(in sampler2D tex,in vec2 texC,in int sample){\r
@@ -32,11 +32,11 @@ vec4 fetchTextureSample(in sampler2DMS tex,in vec2 texC,in int sample){
     return texelFetch(tex, iTexC, sample);\r
 }\r
 \r
-vec4 getColor(in sampler2D tex,in vec2 texC){\r
+vec4 getColor(in sampler2D tex, in vec2 texC){\r
     return texture2D(tex,texC);\r
 }\r
 \r
-vec4 getColor(in sampler2DMS tex,in vec2 texC){\r
+vec4 getColor(in sampler2DMS tex, in vec2 texC){\r
       return textureFetch(tex,texC,m_NumSamples);\r
 }\r
 \r