X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fplaneinf.h;fp=shaders%2Fplaneinf.h;h=bb2a89a3cb341be2dcecab64db9b0eccae780052;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=a0272a8d9c837c7121b18c0c2188ff554146e9ce;hpb=d5405f24a854aff8b76bb126492f2c18bc874270;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/planeinf.h b/shaders/planeinf.h index a0272a8..bb2a89a 100644 --- a/shaders/planeinf.h +++ b/shaders/planeinf.h @@ -18,8 +18,8 @@ static struct vg_shader _shader_planeinf = { "\n" "#line 2 0 \n" "\n" -"uniform mat4 uPv;\n" "uniform mat4x3 uMdl;\n" +"uniform mat4 uPv;\n" "\n" "out vec4 aColour;\n" "out vec2 aUv;\n" @@ -72,16 +72,16 @@ static struct vg_shader _shader_planeinf = { ""}, }; -static GLuint _uniform_planeinf_uPv; static GLuint _uniform_planeinf_uMdl; +static GLuint _uniform_planeinf_uPv; static GLuint _uniform_planeinf_uCamera; static GLuint _uniform_planeinf_uPlane; -static void shader_planeinf_uPv(m4x4f m){ - glUniformMatrix4fv( _uniform_planeinf_uPv, 1, GL_FALSE, (float *)m ); -} static void shader_planeinf_uMdl(m4x3f m){ glUniformMatrix4x3fv( _uniform_planeinf_uMdl, 1, GL_FALSE, (float *)m ); } +static void shader_planeinf_uPv(m4x4f m){ + glUniformMatrix4fv( _uniform_planeinf_uPv, 1, GL_FALSE, (float *)m ); +} static void shader_planeinf_uCamera(v3f v){ glUniform3fv( _uniform_planeinf_uCamera, 1, v ); } @@ -93,8 +93,8 @@ static void shader_planeinf_register(void){ } static void shader_planeinf_use(void){ glUseProgram(_shader_planeinf.id); } static void shader_planeinf_link(void){ - _uniform_planeinf_uPv = glGetUniformLocation( _shader_planeinf.id, "uPv" ); _uniform_planeinf_uMdl = glGetUniformLocation( _shader_planeinf.id, "uMdl" ); + _uniform_planeinf_uPv = glGetUniformLocation( _shader_planeinf.id, "uPv" ); _uniform_planeinf_uCamera = glGetUniformLocation( _shader_planeinf.id, "uCamera" ); _uniform_planeinf_uPlane = glGetUniformLocation( _shader_planeinf.id, "uPlane" ); }