X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fblitblur.h;h=0eca2cefa1d7278195cc2e3e6aa0d7297208887c;hb=0a33f65eecb5e75cddaefa08d3a5eb1a301d0479;hp=e341cea2827f586283432bbcbd731a01255d6c04;hpb=f7db507815e2822d971031c30f25e02b45e9c914;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/blitblur.h b/shaders/blitblur.h
index e341cea..0eca2ce 100644
--- a/shaders/blitblur.h
+++ b/shaders/blitblur.h
@@ -7,6 +7,7 @@ static struct vg_shader _shader_blitblur = {
    .link = shader_blitblur_link,
    .vs = 
 {
+.orig_file = "shaders/blit.vs",
 .static_src = 
 "layout (location=0) in vec2 a_co;\n"
 "out vec2 aUv;\n"
@@ -19,12 +20,13 @@ static struct vg_shader _shader_blitblur = {
 ""},
    .fs = 
 {
+.orig_file = "shaders/blitblur.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "uniform sampler2D uTexMain;\n"
 "uniform sampler2D uTexMotion;\n"
 "uniform float uBlurStrength;\n"
-"uniform float uBlurExponent;\n"
+"uniform vec2 uOverrideDir;\n"
 "\n"
 "in vec2 aUv;\n"
 "\n"
@@ -41,7 +43,7 @@ static struct vg_shader _shader_blitblur = {
 "   vec2 vrand = rand_hash22( aUv ) * 2.0 - vec2(1.0);\n"
 "   vec2 vrand1 = rand_hash22( vrand ) * 2.0 - vec2(1.0);\n"
 "   \n"
-"   vec2 vdir = texture( uTexMotion, aUv ).xy * uBlurStrength;\n"
+"   vec2 vdir = texture( uTexMotion, aUv ).xy * uBlurStrength + uOverrideDir;\n"
 "\n"
 "   vec4 vcolour0 = texture( uTexMain, aUv + vdir*vrand.x );\n"
 "   vec4 vcolour1 = texture( uTexMain, aUv + vdir*vrand.y );\n"
@@ -56,7 +58,7 @@ static struct vg_shader _shader_blitblur = {
 static GLuint _uniform_blitblur_uTexMain;
 static GLuint _uniform_blitblur_uTexMotion;
 static GLuint _uniform_blitblur_uBlurStrength;
-static GLuint _uniform_blitblur_uBlurExponent;
+static GLuint _uniform_blitblur_uOverrideDir;
 static void shader_blitblur_uTexMain(int i){
    glUniform1i(_uniform_blitblur_uTexMain,i);
 }
@@ -66,8 +68,8 @@ static void shader_blitblur_uTexMotion(int i){
 static void shader_blitblur_uBlurStrength(float f){
    glUniform1f(_uniform_blitblur_uBlurStrength,f);
 }
-static void shader_blitblur_uBlurExponent(float f){
-   glUniform1f(_uniform_blitblur_uBlurExponent,f);
+static void shader_blitblur_uOverrideDir(v2f v){
+   glUniform2fv(_uniform_blitblur_uOverrideDir,1,v);
 }
 static void shader_blitblur_register(void){
    vg_shader_register( &_shader_blitblur );
@@ -77,6 +79,6 @@ static void shader_blitblur_link(void){
    _uniform_blitblur_uTexMain = glGetUniformLocation( _shader_blitblur.id, "uTexMain" );
    _uniform_blitblur_uTexMotion = glGetUniformLocation( _shader_blitblur.id, "uTexMotion" );
    _uniform_blitblur_uBlurStrength = glGetUniformLocation( _shader_blitblur.id, "uBlurStrength" );
-   _uniform_blitblur_uBlurExponent = glGetUniformLocation( _shader_blitblur.id, "uBlurExponent" );
+   _uniform_blitblur_uOverrideDir = glGetUniformLocation( _shader_blitblur.id, "uOverrideDir" );
 }
 #endif /* SHADER_blitblur_H */