From a6b44658eb1c55295f132a36233a11aa2bd8f9cf Mon Sep 17 00:00:00 2001
From: Scott Barta <sbarta@google.com>
Date: Fri, 9 Mar 2012 13:52:20 -0800
Subject: New drop of the jmonkeyengine library

A new drop of the jmonkeyengine library sources, based on a
2012-03-05 snapshot. Fixes a few unnecessary memory allocations in
the main rendering loop.

Change-Id: I51ac0942fe87204df102cfdce746b59a5cb5ff85
---
 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag | 13 -------------
 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md | 21 ---------------------
 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert | 16 ----------------
 .../niftygui/Common/MatDefs/Nifty/NiftyQuad.frag    |  6 ++++++
 .../niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md    | 19 +++++++++++++++++++
 .../niftygui/Common/MatDefs/Nifty/NiftyQuad.vert    |  9 +++++++++
 .../Common/MatDefs/Nifty/NiftyQuadGrad.frag         |  6 ++++++
 .../Common/MatDefs/Nifty/NiftyQuadGrad.j3md         | 18 ++++++++++++++++++
 .../Common/MatDefs/Nifty/NiftyQuadGrad.vert         | 14 ++++++++++++++
 .../src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag | 10 ++++++++++
 .../src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md | 20 ++++++++++++++++++++
 .../src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert | 13 +++++++++++++
 12 files changed, 115 insertions(+), 50 deletions(-)
 delete mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag
 delete mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md
 delete mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.frag
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.vert
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.frag
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.j3md
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.vert
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md
 create mode 100644 engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert

(limited to 'engine/src/niftygui/Common/MatDefs')

diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag b/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag
deleted file mode 100644
index 5e77548..0000000
--- a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-uniform bool m_UseTex;
-uniform sampler2D m_Texture;
-uniform vec4 m_Color;
-
-varying vec2 texCoord;
-varying vec4 color;
-
-void main() {
-    vec4 texVal = texture2D(m_Texture, texCoord);
-    texVal = m_UseTex ? texVal : vec4(1.0);
-    gl_FragColor = texVal * color * m_Color;
-}
-
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md b/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md
deleted file mode 100644
index 9ba39b1..0000000
--- a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md
+++ /dev/null
@@ -1,21 +0,0 @@
-MaterialDef Default GUI {
-
-    MaterialParameters {
-        Texture2D Texture
-        Boolean UseTex
-        Vector4 Color (Color)
-    }
-
-    Technique {
-        VertexShader GLSL100:   Common/MatDefs/Nifty/Nifty.vert
-        FragmentShader GLSL100: Common/MatDefs/Nifty/Nifty.frag
-
-        WorldParameters {
-            WorldViewProjectionMatrix
-        }
-    }
-
-    Technique FixedFunc {
-    }
-
-}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert b/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert
deleted file mode 100644
index 67c864d..0000000
--- a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert
+++ /dev/null
@@ -1,16 +0,0 @@
-uniform mat4 g_WorldViewProjectionMatrix;
-
-attribute vec4 inPosition;
-attribute vec4 inColor;
-attribute vec2 inTexCoord;
-
-varying vec2 texCoord;
-varying vec4 color;
-
-void main() {
-    vec2 pos = (g_WorldViewProjectionMatrix * inPosition).xy;
-    gl_Position = vec4(pos, 0.0, 1.0);
-
-    texCoord = inTexCoord;
-    color = inColor;
-}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.frag b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.frag
new file mode 100644
index 0000000..31f49d6
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.frag
@@ -0,0 +1,6 @@
+uniform vec4 m_Color;
+
+void main() { 
+    gl_FragColor = m_Color;
+}
+
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md
new file mode 100644
index 0000000..d0213e9
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md
@@ -0,0 +1,19 @@
+MaterialDef Default GUI {
+
+    MaterialParameters {      
+        Vector4 Color (Color)
+    }
+
+    Technique {
+        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyQuad.vert
+        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuad.frag
+
+        WorldParameters {
+            WorldViewProjectionMatrix
+        }   
+    }
+
+    Technique FixedFunc {
+    }
+
+}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.vert b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.vert
new file mode 100644
index 0000000..1eb1616
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.vert
@@ -0,0 +1,9 @@
+uniform mat4 g_WorldViewProjectionMatrix;
+
+attribute vec4 inPosition;
+
+
+void main() {
+    vec2 pos = (g_WorldViewProjectionMatrix * inPosition).xy;
+    gl_Position = vec4(pos, 0.0, 1.0);
+}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.frag b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.frag
new file mode 100644
index 0000000..1f0a645
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.frag
@@ -0,0 +1,6 @@
+varying vec4 color;
+
+void main() { 
+    gl_FragColor = color;
+}
+
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.j3md b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.j3md
new file mode 100644
index 0000000..4b3b22d
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.j3md
@@ -0,0 +1,18 @@
+MaterialDef Default GUI {
+
+    MaterialParameters {              
+    }
+
+    Technique {
+        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyQuadGrad.vert
+        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuadGrad.frag
+
+        WorldParameters {
+            WorldViewProjectionMatrix
+        }   
+    }
+
+    Technique FixedFunc {
+    }
+
+}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.vert b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.vert
new file mode 100644
index 0000000..0ecaee4
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.vert
@@ -0,0 +1,14 @@
+uniform mat4 g_WorldViewProjectionMatrix;
+
+attribute vec4 inPosition;
+attribute vec4 inColor;
+attribute vec4 inIndex;
+
+varying vec4 color;
+
+void main() {
+    vec2 pos = (g_WorldViewProjectionMatrix * inPosition).xy;
+    gl_Position = vec4(pos, 0.0, 1.0);
+
+    color = inIndex;
+}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag
new file mode 100644
index 0000000..b2b4b95
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag
@@ -0,0 +1,10 @@
+uniform sampler2D m_Texture;
+uniform vec4 m_Color; 
+
+varying vec2 texCoord;
+
+void main() {
+    vec4 texVal = texture2D(m_Texture, texCoord);
+    gl_FragColor = texVal * m_Color ;
+}
+
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md
new file mode 100644
index 0000000..07f5e92
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md
@@ -0,0 +1,20 @@
+MaterialDef Default GUI {
+
+    MaterialParameters {
+        Texture2D Texture
+        Vector4 Color (Color)
+    }
+
+    Technique {
+        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyTex.vert
+        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyTex.frag
+
+        WorldParameters {
+            WorldViewProjectionMatrix
+        }
+    }
+
+    Technique FixedFunc {
+    }
+
+}
\ No newline at end of file
diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert
new file mode 100644
index 0000000..c5c3dc1
--- /dev/null
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert
@@ -0,0 +1,13 @@
+uniform mat4 g_WorldViewProjectionMatrix;
+
+attribute vec4 inPosition;
+attribute vec2 inTexCoord;
+
+varying vec2 texCoord;
+
+void main() {
+    vec2 pos = (g_WorldViewProjectionMatrix * inPosition).xy;
+    gl_Position = vec4(pos, 0.0, 1.0);
+
+    texCoord = inTexCoord;    
+}
\ No newline at end of file
-- 
cgit v1.2.3