projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send player region
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
routeui.h
diff --git
a/shaders/routeui.h
b/shaders/routeui.h
index eeb351a7d9f5fc6e9b2c7465c1c3e3ee25727d14..9e571aba42ede7dcb32a8a6c7d06dc8bbf45d9e9 100644
(file)
--- a/
shaders/routeui.h
+++ b/
shaders/routeui.h
@@
-7,7
+7,7
@@
static struct vg_shader _shader_routeui = {
.link = shader_routeui_link,
.vs =
{
.link = shader_routeui_link,
.vs =
{
-.orig_file = "
../../
shaders/routeui.vs",
+.orig_file = "shaders/routeui.vs",
.static_src =
"layout (location=0) in vec2 a_co;\n"
"\n"
.static_src =
"layout (location=0) in vec2 a_co;\n"
"\n"
@@
-15,16
+15,13
@@
static struct vg_shader _shader_routeui = {
"\n"
"void main()\n"
"{\n"
"\n"
"void main()\n"
"{\n"
-" float fbarx = (a_co.x+uOffset.x) * uOffset.z;\n"
-" float fbary = a_co.y*uOffset.w + uOffset.y;\n"
-"\n"
-" vec2 vpos = vec2( fbarx, fbary );\n"
+" vec2 vpos = a_co * uOffset.zw + uOffset.xy;\n"
" gl_Position = vec4(vpos,0.0,1.0);\n"
"}\n"
""},
.fs =
{
" gl_Position = vec4(vpos,0.0,1.0);\n"
"}\n"
""},
.fs =
{
-.orig_file = "
../../
shaders/routeui.fs",
+.orig_file = "shaders/routeui.fs",
.static_src =
"out vec4 FragColor;\n"
"\n"
.static_src =
"out vec4 FragColor;\n"
"\n"
@@
-40,10
+37,10
@@
static struct vg_shader _shader_routeui = {
static GLuint _uniform_routeui_uOffset;
static GLuint _uniform_routeui_uColour;
static void shader_routeui_uOffset(v4f v){
static GLuint _uniform_routeui_uOffset;
static GLuint _uniform_routeui_uColour;
static void shader_routeui_uOffset(v4f v){
- glUniform4fv(
_uniform_routeui_uOffset, 1, v
);
+ glUniform4fv(
_uniform_routeui_uOffset,1,v
);
}
static void shader_routeui_uColour(v4f v){
}
static void shader_routeui_uColour(v4f v){
- glUniform4fv(
_uniform_routeui_uColour, 1, v
);
+ glUniform4fv(
_uniform_routeui_uColour,1,v
);
}
static void shader_routeui_register(void){
vg_shader_register( &_shader_routeui );
}
static void shader_routeui_register(void){
vg_shader_register( &_shader_routeui );