* Gui shader now supports vertex color on GL1

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9532 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
Sha..rd 13 years ago
parent 37f74cdb07
commit c498e79511
  1. 4
      engine/src/core-data/Common/MatDefs/Gui/Gui.j3md
  2. 2
      engine/src/core-data/Common/MatDefs/Gui/Gui.vert

@ -3,7 +3,7 @@ MaterialDef Default GUI {
MaterialParameters {
Texture2D Texture
Color Color (Color)
Boolean VertexColor
Boolean VertexColor (UseVertexColor)
}
Technique {
@ -20,7 +20,7 @@ MaterialDef Default GUI {
}
}
Technique FixedFunc {
Technique {
}
}

@ -15,8 +15,6 @@ varying vec2 texCoord;
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;

Loading…
Cancel
Save