sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #377 from davidB/fix_opengl3

Browse Source 
opengl3: add GLSLCompat into Gui.j3md
This commit is contained in:
Kirill Vainer 2015-11-09 20:44:50 -05:00
commit 79638b7434
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.frag
View File

@ -1,3 +1,5 @@
#import "Common/ShaderLib/GLSLCompat.glsllib"
#ifdef TEXTURE
uniform sampler2D m_Texture;
varying vec2 texCoord;

17
jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.j3md
View File

@ -6,6 +6,20 @@ MaterialDef Default GUI {
Boolean VertexColor (UseVertexColor)
}
Technique {
VertexShader GLSL150: Common/MatDefs/Gui/Gui.vert
FragmentShader GLSL150: Common/MatDefs/Gui/Gui.frag
WorldParameters {
WorldViewProjectionMatrix
}
Defines {
TEXTURE : Texture
VERTEX_COLOR : VertexColor
}
}
Technique {
VertexShader GLSL100: Common/MatDefs/Gui/Gui.vert
FragmentShader GLSL100: Common/MatDefs/Gui/Gui.frag
@ -20,7 +34,4 @@ MaterialDef Default GUI {
}
}
Technique {
}
}

2
jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.vert
View File

@ -1,3 +1,5 @@
#import "Common/ShaderLib/GLSLCompat.glsllib"
uniform mat4 g_WorldViewProjectionMatrix;
uniform vec4 m_Color;