Changeset 1922 for trunk/tools/neercs/video/render.cppTweet

Timestamp:

Sep 17, 2012, 1:44:47 AM (8 years ago)

Author:

rez

Message:

NEERCS: added copper in setup (not working yet)

File:

• trunk/tools/neercs/video/render.cpp (modified) (11 diffs)

trunk/tools/neercs/video/render.cpp

@@ -43 +43 @@
 
 #define PID M_PI/180.0f    // pi ratio
-#define CR 1.0f/256.0f     // color ratio
 
 /*
@@ -57 +56 @@
 /* window variable */
 ivec2 screen_size;         // screen size
-vec3 screen_color = CR * vec3(32, 32, 32); // screen color
+vec3 screen_color = vec3(0.125f, 0.125f, 0.125f); // screen color
 /* object variable */
 float main_angle = 0.0f;   // main angle
@@ -94 +93 @@
 vec2 glow_small(1.5f,0.0f);     // small glow radius [center,corner]
 vec2 blur(0.5f,0.0f);           // blur radius [center,corner]
-vec4 copper(0.125,0.125,32,64); // copper [base,variable,repeat x,repeat y]
 vec3 color_filter(0.9f,0.9f,1.0f);    // color filter [red,green,blue]
 vec4 color_color(1.5f,1.2f,0.1f,0.35f);         // color modifier [brightness,contrast,level,grayscale]
@@ -110 +108 @@
 vec4 postfx_scanline_v(0.75f,-0.25f,2.0f,0.0f); // horizontal scanline [base,variable,repeat,shift]
 vec3 postfx_corner(0.0f,0.75f,0.95f);           // corner [width,radius,blur]
+vec4 copper(0.75,0.375,64,8);   // copper [base,variable,repeat x,repeat y]
 /* text variable */
 ivec2 ratio_2d(2,4);            // 2d ratio
@@ -124 +123 @@
 int setup_cursor = 0;           // cursor position
 int setup_option_i = 0;         // selected option
-int setup_option_n = 10;        // option number
+int setup_option_n = 11;        // option number
 int setup_option_p = 0;         // option position
 int setup_item_i = 0;           // selected item
@@ -223 +222 @@
         "v variable",
         "v repeat",
-        "v shift"
+        "v shift",
+    "copper",
+        "enable",
+        "base",
+        "variable",
+        "repeat ?",
+        "repeat ?",
+        "",
+        "",
+        ""
     };
 
@@ -317 +325 @@
         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.z),
         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.w),
-    vec4(0)
+    vec4(0), /* copper */
+        vec4( 0, 1, 1, 1),
+        vec4(0.0f, 1.0f, 0.05f, copper.x),
+        vec4(0.0f, 1.0f, 0.05f, copper.y),
+        vec4(0.0f, 64.0f, 4.00f, copper.z),
+        vec4(0.0f, 8.0f, 1.00f, copper.w),
+        vec4(0),
+        vec4(0),
+        vec4(0),
+    vec4(0) /* ? */
     };
 
@@ -360 +377 @@
     postfx_scanline_h = vec4(setup_var[k].w, setup_var[k + 1].w, setup_var[k + 2].w, setup_var[k + 3].w); k += 4;
     postfx_scanline_v = vec4(setup_var[k].w, setup_var[k + 1].w, setup_var[k + 2].w, setup_var[k + 3].w); k += 4;
-
+    k += 1; /* copper */
+    m_shader_copper = (setup_var[k].w == 1) ? true : false; k++;
+    copper = vec4(setup_var[k].w, setup_var[k + 1].w, setup_var[k + 2].w, setup_var[k + 3].w); k += 4;
     UpdateSize();
 }
@@ -552 +571 @@
     m_shader_blur(true),
     m_shader_remanency(true),
-    m_shader_copper(false),
+    m_shader_copper(true),
     m_shader_color(true),
     m_shader_noise(true),
@@ -646 +665 @@
         caca_printf(m_caca, 0, 0, "%i*%i", w, h);
     }
+    /* draw LOL */
+    caca_set_color_argb(m_caca, 0xfff, 0x000);
+    caca_put_str(m_caca, canvas_char.x - 11, canvas_char.y - 3,"█   ███ █");
+    caca_put_str(m_caca, canvas_char.x - 11, canvas_char.y - 2,"█   █ █ █");
+    caca_put_str(m_caca, canvas_char.x - 11, canvas_char.y - 1,"███ ███ ███");
 }
 
@@ -987 +1011 @@
     Draw2D();
     Draw3D();
-
 }