input update 1

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / model_font.h

diff --git a/shaders/model_font.h b/shaders/model_font.h
index 7de7971be0a42c9a34ed4453af9fa981d53c69b3..65d53e3f83d1a1a43d97cdbb0661af2643e5a1cb 100644 (file)
--- a/shaders/model_font.h
+++ b/shaders/model_font.h
@@ -39,7 +39,7 @@ static struct vg_shader _shader_model_font = {
 "uniform mat4x3 uMdl;\n"
 "uniform mat4 uPv;\n"
 "uniform mat4 uPvmPrev;\n"
-"uniform vec3 uOffset;\n"
+"uniform vec4 uOffset;\n"
 "\n"
 "out vec4 aColour;\n"
 "out vec2 aUv;\n"
@@ -49,7 +49,7 @@ static struct vg_shader _shader_model_font = {
 "\n"
 "void main()\n"
 "{\n"
-"   vec3 co = a_co+uOffset;\n"
+"   vec3 co = a_co*uOffset.w+uOffset.xyz;\n"
 "   vec3 world_pos0 = uMdl     * vec4( co, 1.0 );\n"
 "   vec4 vproj0     = uPv      * vec4( world_pos0, 1.0 );\n"
 "   vec4 vproj1     = uPvmPrev * vec4( co, 1.0 );\n"
@@ -102,8 +102,7 @@ static struct vg_shader _shader_model_font = {
 "void main()\n"
 "{\n"
 "   compute_motion_vectors();\n"
-"   vec4 diffuse = texture( uTexMain, aUv );\n"
-"   FragColor = vec4( diffuse.rgb, 1.0 ) * uColour;\n"
+"   FragColor = texture( uTexMain, aUv ) * uColour;\n"
 "}\n"
 ""},
 };
@@ -123,8 +122,8 @@ static void shader_model_font_uPv(m4x4f m){
 static void shader_model_font_uPvmPrev(m4x4f m){
    glUniformMatrix4fv(_uniform_model_font_uPvmPrev,1,GL_FALSE,(float*)m);
 }
-static void shader_model_font_uOffset(v3f v){
-   glUniform3fv(_uniform_model_font_uOffset,1,v);
+static void shader_model_font_uOffset(v4f v){
+   glUniform4fv(_uniform_model_font_uOffset,1,v);
 }
 static void shader_model_font_uTexMain(int i){
    glUniform1i(_uniform_model_font_uTexMain,i);