Changeset 1978Tweet

Timestamp:

Oct 5, 2012, 1:59:36 AM (11 years ago)

Author:

rez

Message:

neercs: minors debug (and some bugs added)

Location:

trunk/tools/neercs/video

Files:

• copper.lolfx (modified) (1 diff)
• mirror.lolfx (modified) (1 diff)
• render.cpp (modified) (9 diffs)

trunk/tools/neercs/video/copper.lolfx

@@ -29 +29 @@
     color.z += 0.5 * sin(p.y*float(screen_size.y / copper.w) + time);
 
-    color *= copper.x + copper.y * cos(p.y * float(screen_size.x / copper.z) - time);
+    color *= copper.x + copper.y * cos(p.y * float(screen_size.x / copper.z));// - time);
 
     color.x = float(int(color.x * 8.0) * 32) / 256.0;

trunk/tools/neercs/video/mirror.lolfx

@@ -22 +22 @@
     vec3 source = texture2D(texture, p).xyz;
 
-    vec3 color = vec3(1.0,0.5,0.75);
+    vec3 color = vec3(0.0,0.1,0.0);
 
-    gl_FragColor = vec4(source*color, 1.0);
+    gl_FragColor = vec4(source+color, 1.0);
 }

trunk/tools/neercs/video/render.cpp

@@ -99 +99 @@
 vec2 glow_small(1.5f,0.0f);     // small glow radius [center,corner]
 vec2 blur(0.5f,0.0f);           // blur radius [center,corner]
-vec4 copper_copper(0.8f,0.4f,0.2f,4.0f);        // copper [base,variable,repeat,color cycle]
+vec4 copper_copper(0.75f,0.25f,0.42f,4.0f);     // copper [base,variable,repeat,color cycle]
 vec3 copper_mask_color(4.0f,4.0f,4.0f);         // color [red,green,blue]
 vec3 color_filter(0.9f,0.95f,0.85f);            // color filter [red,green,blue]
@@ -131 +131 @@
 int setup_cursor = 0;           // cursor position
 int setup_option_i = 0;         // selected option
-int setup_option_n = 11;        // option number
+int setup_option_n = 12;        // option number
 int setup_option_p = 0;         // option position
 int setup_item_i = 0;           // selected item
@@ -138 +138 @@
 int setup_item_key = 0;         // item array key
 ivec3 setup_size(29,9,12);      // size [w,h,split]
-ivec2 setup_canvas_size(ivec2(setup_size.x+1,setup_size.y+1)*font_size*ivec2(2,4));
+ivec2 setup_canvas_size(ivec2(setup_size.x + 1, setup_size.y + 1) * font_size * ivec2(2,4));
 ivec2 setup_color(0xaaa,0x222); // color [foreground,background] 0x678,0x234
 char const *setup_text[] = {
@@ -239 +239 @@
         "v variable",
         "v repeat",
-        "v shift"
+        "v shift",
+    "mirror",
+        "enable",
+        "param 1",
+        "param 2",
+        "param 3",
+        "param 4",
+        "",
+        "",
+        ""
     };
 
@@ -342 +351 @@
         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.z),
         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.w),
+    vec4(0), /* mirror */
+        vec4( 0, 1, 1, 1),
+        vec4( 0.0f, 1.0f, 0.1f, mirror.x),
+        vec4( 0.0f, 1.0f, 0.1f, mirror.y),
+        vec4( 0.0f, 1.0f, 0.1f, mirror.z),
+        vec4( 0.0f, 1.0f, 0.1f, mirror.w),
+        vec4(0),
+        vec4(0),
+        vec4(0),
     vec4(0) /* ? */
     };
@@ -624 +642 @@
         caca_set_color_argb(m_cv_setup, setup_color.y, setup_color.x);
         caca_draw_line(m_cv_setup, 0, 0, setup_size.x, 0, ' ');
-        caca_put_str(m_cv_setup, setup_size.x / 2 - 6, 0, "NEERCS SETUP");
+        caca_put_str(m_cv_setup, setup_size.x / 2 - 3, 0, "SETUP");
         /* informations */
         int w = caca_get_canvas_width(m_cv_screen);
@@ -1099 +1117 @@
         shader_copper->SetUniform(shader_copper_texture, fbo_back->GetTexture(), 0);
         shader_copper->SetUniform(shader_copper_screen_size, (vec2)screen_size);
-        shader_copper->SetUniform(shader_copper_time, fx_angle * 2.0f);
+        shader_copper->SetUniform(shader_copper_time, fx_angle);
         shader_copper->SetUniform(shader_copper_copper, vec4(copper_copper.x, copper_copper.y, copper_copper.z * 16.0f, copper_copper.w * 16.0f));
         shader_copper->SetUniform(shader_copper_mask_color, copper_mask_color / 4.0f);
@@ -1256 +1274 @@
     {
         // shader postfx
+        fbo_tmp->Bind();
         shader_postfx->Bind();
         shader_postfx->SetUniform(shader_postfx_texture, fbo_front->GetTexture(), 0);
@@ -1274 +1293 @@
         TraceQuad();
         shader_postfx->Unbind();
-    }
-    else
-    {
+        fbo_tmp->Unbind();
         // shader simple
-        ShaderSimple(fbo_front, 0);
-    }
+        fbo_front->Bind();
+        ShaderSimple(fbo_tmp, 0);
+        fbo_front->Unbind();
+    }
+
+    if (m_shader_mirror)
+    {
+        // shader mirror
+        fbo_tmp->Bind();
+        shader_mirror->Bind();
+        shader_mirror->SetUniform(shader_mirror_texture, fbo_front->GetTexture(), 0);
+        shader_mirror->SetUniform(shader_mirror_screen_size, (vec2)screen_size);
+        shader_mirror->SetUniform(shader_mirror_mirror, mirror);
+        TraceQuad();
+        shader_mirror->Unbind();
+        fbo_tmp->Unbind();
+    }
+
+    // shader simple
+    ShaderSimple(fbo_tmp, 0);
 
     glDisableClientState(GL_VERTEX_ARRAY);