diff options
Diffstat (limited to 'engine/src/niftygui/Common')
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/Nifty.frag | 13 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.frag | 6 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.j3md | 19 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuad.vert | 9 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.frag | 6 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.j3md | 18 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyQuadGrad.vert | 14 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.frag | 10 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.j3md (renamed from engine/src/niftygui/Common/MatDefs/Nifty/Nifty.j3md) | 5 | ||||
-rw-r--r-- | engine/src/niftygui/Common/MatDefs/Nifty/NiftyTex.vert (renamed from engine/src/niftygui/Common/MatDefs/Nifty/Nifty.vert) | 5 |
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 |