X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Frouteui.h;h=00d54fc0329b3a0e29c7d7b8ef36791e147ec0f6;hb=a1adba47558099cab82aa6d10abdc1dca11d3342;hp=eeb351a7d9f5fc6e9b2c7465c1c3e3ee25727d14;hpb=4f4458d229e40a852708319861224b7cc48ad0b9;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/routeui.h b/shaders/routeui.h index eeb351a..00d54fc 100644 --- a/shaders/routeui.h +++ b/shaders/routeui.h @@ -7,7 +7,6 @@ static struct vg_shader _shader_routeui = { .link = shader_routeui_link, .vs = { -.orig_file = "../../shaders/routeui.vs", .static_src = "layout (location=0) in vec2 a_co;\n" "\n" @@ -15,16 +14,12 @@ static struct vg_shader _shader_routeui = { "\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 = { -.orig_file = "../../shaders/routeui.fs", .static_src = "out vec4 FragColor;\n" "\n" @@ -40,10 +35,10 @@ static struct vg_shader _shader_routeui = { 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){ - glUniform4fv( _uniform_routeui_uColour, 1, v ); + glUniform4fv(_uniform_routeui_uColour,1,v); } static void shader_routeui_register(void){ vg_shader_register( &_shader_routeui );