diff options
Diffstat (limited to 'Data/Resources')
-rw-r--r-- | Data/Resources/Shaders/BaseColor.glsl | 43 | ||||
-rw-r--r-- | Data/Resources/Shaders/Editor-Shape.glsl | 3 | ||||
-rw-r--r-- | Data/Resources/Shaders/Editor-Text.glsl | 3 |
3 files changed, 3 insertions, 46 deletions
diff --git a/Data/Resources/Shaders/BaseColor.glsl b/Data/Resources/Shaders/BaseColor.glsl deleted file mode 100644 index b1aed17..0000000 --- a/Data/Resources/Shaders/BaseColor.glsl +++ /dev/null @@ -1,43 +0,0 @@ -#version 330 core - -VSH_BEGIN - -vec3 vPos; -vec3 vNormal; -vec4 vTangent; -vec4 vColor; -vec2 vUV; -vec2 vUV2; -vec2 vUV3; -vec2 vUV4; - -uniform mat4 gamelab_mat_model; -uniform mat4 gamelab_mat_vp; -uniform vec4 gamelab_screen; -uniform vec4 gamelab_time; - -uniform mat4 mvp; - -out vec2 uv; - -void main() -{ - vec4 clip = mvp * vec4(vPos, -1, 1.0); - gl_Position = clip; - uv = vUV; -} - -VSH_END - -FSH_BEGIN -uniform sampler2D uiTex; - -in vec2 uv; - -out vec4 FragColor; - -void main() -{ - FragColor = texture(uiTex, uv); -} -FSH_END diff --git a/Data/Resources/Shaders/Editor-Shape.glsl b/Data/Resources/Shaders/Editor-Shape.glsl index 7548507..235390c 100644 --- a/Data/Resources/Shaders/Editor-Shape.glsl +++ b/Data/Resources/Shaders/Editor-Shape.glsl @@ -1,6 +1,5 @@ -// 渲染编辑器文字 - #version 330 core +//绘制几何图形 CMD_BEGIN Cull Off diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl index 03ec5a7..d1003c3 100644 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ b/Data/Resources/Shaders/Editor-Text.glsl @@ -39,7 +39,8 @@ void main() //vec2 uv = vec2(uv.x, 1 - uv.y); vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r); sampled *= color; - //sampled = vec4(1,1,1,1); + // if(sampled.a == 0) + // sampled = vec4(1,0,0,1); FragColor = sampled; } FSH_END |