projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
even more collision filtering
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
menu.h
diff --git
a/shaders/menu.h
b/shaders/menu.h
index 67700e8e908482467dbbf64894f1a1038db42eac..75ed0ddc402b7e410502a4c37ff9837d3b6cec88 100644
(file)
--- a/
shaders/menu.h
+++ b/
shaders/menu.h
@@
-7,7
+7,6
@@
static struct vg_shader _shader_menu = {
.link = shader_menu_link,
.vs =
{
.link = shader_menu_link,
.vs =
{
-.orig_file = "../../shaders/standard.vs",
.static_src =
"layout (location=0) in vec3 a_co;\n"
"layout (location=1) in vec3 a_norm;\n"
.static_src =
"layout (location=0) in vec3 a_co;\n"
"layout (location=1) in vec3 a_norm;\n"
@@
-40,7
+39,6
@@
static struct vg_shader _shader_menu = {
""},
.fs =
{
""},
.fs =
{
-.orig_file = "../../shaders/unlit.fs",
.static_src =
"out vec4 FragColor;\n"
"\n"
.static_src =
"out vec4 FragColor;\n"
"\n"
@@
-54,8
+52,12
@@
static struct vg_shader _shader_menu = {
"\n"
"void main()\n"
"{\n"
"\n"
"void main()\n"
"{\n"
-" vec3 diffuse = texture( uTexMain, aUv ).rgb;\n"
-" FragColor = vec4( diffuse, 1.0 );\n"
+" vec4 diffuse = texture( uTexMain, aUv );\n"
+"\n"
+" if( diffuse.a < 0.5 )\n"
+" discard;\n"
+"\n"
+" FragColor = vec4( diffuse.rgb, 1.0 ) * uColour;\n"
"}\n"
""},
};
"}\n"
""},
};
@@
-65,16
+67,16
@@
static GLuint _uniform_menu_uPv;
static GLuint _uniform_menu_uTexMain;
static GLuint _uniform_menu_uColour;
static void shader_menu_uMdl(m4x3f m){
static GLuint _uniform_menu_uTexMain;
static GLuint _uniform_menu_uColour;
static void shader_menu_uMdl(m4x3f m){
- glUniformMatrix4x3fv(
_uniform_menu_uMdl, 1, GL_FALSE, (float *)m
);
+ glUniformMatrix4x3fv(
_uniform_menu_uMdl,1,GL_FALSE,(float*)m
);
}
static void shader_menu_uPv(m4x4f m){
}
static void shader_menu_uPv(m4x4f m){
- glUniformMatrix4fv(
_uniform_menu_uPv, 1, GL_FALSE, (float *)m
);
+ glUniformMatrix4fv(
_uniform_menu_uPv,1,GL_FALSE,(float*)m
);
}
static void shader_menu_uTexMain(int i){
}
static void shader_menu_uTexMain(int i){
- glUniform1i(
_uniform_menu_uTexMain, i
);
+ glUniform1i(
_uniform_menu_uTexMain,i
);
}
static void shader_menu_uColour(v4f v){
}
static void shader_menu_uColour(v4f v){
- glUniform4fv(
_uniform_menu_uColour, 1, v
);
+ glUniform4fv(
_uniform_menu_uColour,1,v
);
}
static void shader_menu_register(void){
vg_shader_register( &_shader_menu );
}
static void shader_menu_register(void){
vg_shader_register( &_shader_menu );