Changeset 2021Tweet

Timestamp:

Oct 17, 2012, 2:24:43 AM (5 years ago)

Author:

rez

Message:

neercs: scanline auto-resize

Location:

trunk/tools/neercs/video

Files:

• postfx.lolfx (modified) (3 diffs)
• render.cpp (modified) (3 diffs)

trunk/tools/neercs/video/postfx.lolfx

@@ -15 +15 @@
 uniform sampler2D texture;
 uniform vec2 screen_size;
+uniform vec2 ratio_2d;
 uniform float time;
 uniform vec2 deform;
@@ -61 +62 @@
     vec3 c=source+g1*ghost1.w+g2*ghost2.w;                   // mix
 
-    float v=aberration/float(screen_size.x);//+aberration/float(screen_size.x)*(2.0-mask);
+    float v=aberration/float(screen_size.x/ratio_2d.x);//+aberration/float(screen_size.x)*(2.0-mask);
     vec3 ca1=get_color(texture,vec2(z.x-v,z.y));
     vec3 ca2=get_color(texture,vec2(z.x+v,z.y));
@@ -81 +82 @@
     if(k>=r_p+r_h) r=mix(c4,c5,k*((k-(r_p+r_h))/(r_p-r_h)));
 
-    c*=moire_h.x+moire_h.y*sin(z.y*float(screen_size.y*moire_h.z))*sin(0.5+z.x*float(screen_size.x*moire_h.w)); // moire h
-    c*=moire_v.x+moire_v.y*sin(z.x*float(screen_size.x*moire_v.z))*sin(0.5+z.y*float(screen_size.y*moire_v.w)); // moire v
-    c*=scanline_h.x+scanline_h.y*cos(z.y*float(screen_size.y*scanline_h.z+scanline_h.w)); // scanline h
-    c*=scanline_v.x+scanline_v.y*cos(z.x*float(screen_size.x*scanline_v.z+scanline_v.w)); // scanline v
+    c*=moire_h.x+moire_h.y*sin(z.y*float(screen_size.y*moire_h.z)/ratio_2d.y)*sin(0.5+z.x*float(screen_size.x*moire_h.w)/ratio_2d.x); // moire h
+    c*=moire_v.x+moire_v.y*sin(z.x*float(screen_size.x*moire_v.z)/ratio_2d.x)*sin(0.5+z.y*float(screen_size.y*moire_v.w)/ratio_2d.y); // moire v
+    c*=scanline_h.x+scanline_h.y*cos(z.y*float(screen_size.y*scanline_h.z+scanline_h.w)/ratio_2d.y); // scanline h
+    c*=scanline_v.x+scanline_v.y*cos(z.x*float(screen_size.x*scanline_v.z+scanline_v.w)/ratio_2d.x); // scanline v
     c+=r*0.05;                                               // reflection
     c*=mix(1.0,mask,vignetting);                             // vignetting

trunk/tools/neercs/video/render.cpp

@@ -495 +495 @@
               shader_postfx_texture_2d,
               shader_postfx_screen_size,
+              shader_postfx_ratio_2d,
               shader_postfx_time,
               shader_postfx_deform,
@@ -595 +596 @@
     shader_postfx_texture_2d = shader_postfx->GetUniformLocation("texture_2d");
     shader_postfx_screen_size = shader_postfx->GetUniformLocation("screen_size");
+    shader_postfx_ratio_2d = shader_postfx->GetUniformLocation("ratio_2d");
     shader_postfx_time = shader_postfx->GetUniformLocation("time");
     shader_postfx_deform = shader_postfx->GetUniformLocation("deform");
@@ -1305 +1307 @@
         shader_postfx->SetUniform(shader_postfx_texture, fbo_screen->GetTexture(), 0);
         shader_postfx->SetUniform(shader_postfx_screen_size, (vec2)screen_size);
+        shader_postfx->SetUniform(shader_postfx_ratio_2d, (vec2)ratio_2d / 2);
         shader_postfx->SetUniform(shader_postfx_time, fx_angle);
         shader_postfx->SetUniform(shader_postfx_deform, postfx_deform);