New drop of the jmonkeyengine libraryHEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-l-preview_r2android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r22.2tools_r22tools_r21nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-iot-releasen-iot-preview-4mastermarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasemainl-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-releasejb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devjb-mr0-releasejb-devidea133-weekly-releaseidea133

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

10 files changed, 85 insertions, 20 deletions

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/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/Nifty.j3md b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md
index 9ba39b1..07f5e92 100644
--- a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md
@@ -2,13 +2,12 @@ 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

+        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyTex.vert

+        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyTex.frag

 

         WorldParameters {

             WorldViewProjectionMatrix

diff --git a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert
index 67c864d..c5c3dc1 100644
--- a/engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert
+++ b/engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert
@@ -1,16 +1,13 @@
 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;

+    texCoord = inTexCoord;    

 }
\ No newline at end of file