* Updated to latest version of Nifty GUI 1.3

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7270 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
14 years ago · 6ed32b479c
parent 3e34002525
commit 6ed32b479c
6 changed files with 15 additions and 17 deletions
--- a/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar
+++ b/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar
--- a/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar
+++ b/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar
--- a/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar
+++ b/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar
--- a/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar
+++ b/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar
--- a/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag
+++ b/engine/src/core-data/Common/MatDefs/Post/bloomExtract15.frag
@ -4,18 +4,16 @@ uniform COLORTEXTURE m_Texture;

 uniform float m_ExposurePow;
 uniform float m_ExposureCutoff;
-in vec2 texCoord;

+in vec2 texCoord;

 #ifdef HAS_GLOWMAP
  uniform sampler2D m_GlowMap;
 #endif

-void main(void)
-{ 
+void main(){
   vec4 color;
   #ifdef DO_EXTRACT
-
     color = getColor(m_Texture, texCoord);
     if ( (color.r + color.g + color.b) / 3.0 < m_ExposureCutoff ) {
         color = vec4(0.0);
--- 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
 uniform int m_NumSamples;
 uniform int m_NumSamplesDepth;
+
 #ifdef RESOLVE_MS
    #define COLORTEXTURE sampler2DMS
 #else
@ -9,7 +10,6 @@ uniform int m_NumSamplesDepth;

 #ifdef RESOLVE_DEPTH_MS
    #define DEPTHTEXTURE sampler2DMS
-
 #else
    #define DEPTHTEXTURE sampler2D
 #endif