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

add GLSL150 compatible Unshaded

Browse Source
This commit is contained in:
David Bernard 2015-07-05 11:39:10 +02:00
parent 704c3f1a10
commit 568ee09d17
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View File

@ -1080,6 +1080,7 @@ public class GLRenderer implements Renderer {
if (linearizeSrgbImages) {
stringBuf.append("#define SRGB 1\n");
}
stringBuf.append("#define ").append(source.getType().name().toUpperCase()).append("_SHADER 1\n");
stringBuf.append(source.getDefines());
stringBuf.append(source.getSource());

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

@ -1,3 +1,5 @@
#import "Common/ShaderLib/GLSL150Compat.glsllib"
#if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD))
#define NEED_TEXCOORD1
#endif

25
jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.j3md
View File

@ -13,7 +13,7 @@ MaterialDef Unshaded {
Color GlowColor
// For instancing
Boolean UseInstancing
Boolean UseInstancing
// For hardware skinning
Int NumberOfBones
@ -54,8 +54,8 @@ MaterialDef Unshaded {
}
Technique {
VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert
FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag
VertexShader GLSL150: Common/MatDefs/Misc/Unshaded.vert
FragmentShader GLSL150: Common/MatDefs/Misc/Unshaded.frag
WorldParameters {
WorldViewProjectionMatrix
@ -76,6 +76,25 @@ MaterialDef Unshaded {
}
Technique {
VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert
FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag
WorldParameters {
WorldViewProjectionMatrix
ViewProjectionMatrix
ViewMatrix
}
Defines {
INSTANCING : UseInstancing
SEPARATE_TEXCOORD : SeparateTexCoord
HAS_COLORMAP : ColorMap
HAS_LIGHTMAP : LightMap
HAS_VERTEXCOLOR : VertexColor
HAS_COLOR : Color
NUM_BONES : NumberOfBones
DISCARD_ALPHA : AlphaDiscardThreshold
}
}
Technique PreNormalPass {

1
jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.vert
View File

@ -1,3 +1,4 @@
#import "Common/ShaderLib/GLSL150Compat.glsllib"
#import "Common/ShaderLib/Skinning.glsllib"
#import "Common/ShaderLib/Instancing.glsllib"

2
jme3-core/src/main/resources/Common/ShaderLib/GLSL150Compat.glsllib
View File

@ -1,4 +1,4 @@
#if _VERSION_ >= 150
#if __VERSION__ >= 130
out vec4 outFragColor;
# define texture1D texture
# define texture2D texture