diff --git a/engine/src/core-data/Common/MatDefs/Gui/Gui.frag b/engine/src/core-data/Common/MatDefs/Gui/Gui.frag index caa666c1b..619682ce0 100644 --- a/engine/src/core-data/Common/MatDefs/Gui/Gui.frag +++ b/engine/src/core-data/Common/MatDefs/Gui/Gui.frag @@ -1,6 +1,6 @@ #ifdef TEXTURE -uniform sampler2D m_Texture; -varying vec2 texCoord; + uniform sampler2D m_Texture; + varying vec2 texCoord; #endif varying vec4 color; diff --git a/engine/src/core-data/Common/MatDefs/Gui/Gui.j3md b/engine/src/core-data/Common/MatDefs/Gui/Gui.j3md index ea871b507..f37f6c979 100644 --- a/engine/src/core-data/Common/MatDefs/Gui/Gui.j3md +++ b/engine/src/core-data/Common/MatDefs/Gui/Gui.j3md @@ -2,8 +2,8 @@ MaterialDef Default GUI { MaterialParameters { Texture2D Texture - Color Color ( Color ) - Boolean VertexColor + Color Color (Color) + Boolean VertexColor (UseVertexColor) } Technique { @@ -20,7 +20,7 @@ MaterialDef Default GUI { } } - Technique FixedFunc { + Technique { } } \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Gui/Gui.vert b/engine/src/core-data/Common/MatDefs/Gui/Gui.vert index 0591c5e89..7640573dc 100644 --- a/engine/src/core-data/Common/MatDefs/Gui/Gui.vert +++ b/engine/src/core-data/Common/MatDefs/Gui/Gui.vert @@ -4,19 +4,17 @@ uniform vec4 m_Color; attribute vec3 inPosition; #ifdef VERTEX_COLOR -attribute vec4 inColor; + attribute vec4 inColor; #endif #ifdef TEXTURE -attribute vec2 inTexCoord; -varying vec2 texCoord; + attribute vec2 inTexCoord; + varying vec2 texCoord; #endif varying vec4 color; void main() { - //vec2 pos = (g_WorldViewProjectionMatrix * inPosition).xy; - //gl_Position = vec4(pos, 0.0, 1.0); gl_Position = g_WorldViewProjectionMatrix * vec4(inPosition, 1.0); #ifdef TEXTURE texCoord = inTexCoord;