Changeset 2182Tweet

Timestamp:

Dec 27, 2012, 2:54:20 AM (10 years ago)

Author:

rez

Message:

NEERCS: fixed color matching for copper

Location:

trunk/tools/neercs/video

Files:

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

trunk/tools/neercs/video/copper.lolfx

@@ -39 +39 @@
     color.z = float(int(color.z * 8.0) * 32) / 256.0;
 
-    gl_FragColor = vec4((source == mask_color) ? color : source, 1.0);
+gl_FragColor = vec4((abs(source.x - mask_color.x) < 0.025 && abs(source.y - mask_color.y) < 0.025 && abs(source.z - mask_color.z) < 0.025) ? color : source, 1.0);
 }

trunk/tools/neercs/video/render.cpp

@@ -342 +342 @@
     vec4(0.0f, 1.0f, 0.02f, 0), // copper_copper.z
     vec4(1.0f, 8.0f, 0.25f, 0), // copper_copper.w
-    vec4(0.0f, 4.0f, 0.25f, 0), // copper_mask_color.x
-    vec4(0.0f, 4.0f, 0.25f, 0), // copper_mask_color.y
-    vec4(0.0f, 4.0f, 0.25f, 0), // copper_mask_color.z
+    vec4(0.0f, 1.0f, 0.05f, 0), // copper_mask_color.x
+    vec4(0.0f, 1.0f, 0.05f, 0), // copper_mask_color.y
+    vec4(0.0f, 1.0f, 0.05f, 0), // copper_mask_color.z
     vec4(0),
 vec4(0), /* color */
@@ -455 +455 @@
 0,
     0.75f,0.25f,0.42f,4.0f,   // copper_copper
-    0.0f,4.0f,0.0f,           // copper_mask_color
+    0.05f,1.0f,0.0f,          // copper_mask_color
     0,
 0,
@@ -512 +512 @@
 0,
     0.75f,0.25f,0.42f,4.0f,   // copper_copper
-    0.0f,4.0f,0.0f,           // copper_mask_color
+    0.05f,1.0f,0.0f,          // copper_mask_color
     0,
 0,
@@ -569 +569 @@
 0,
     0.75f,0.25f,0.42f,4.0f,   // copper_copper
-    0.0f,4.0f,0.0f,           // copper_mask_color
+    0.05f,1.0f,0.0f,          // copper_mask_color
     0,
 0,
@@ -626 +626 @@
 0,
     0.75f,0.25f,0.42f,4.0f,   // copper_copper
-    0.0f,4.0f,0.0f,           // copper_mask_color
+    0.05f,1.0f,0.0f,          // copper_mask_color
     0,
 0,
@@ -683 +683 @@
 0,
     0.75f,0.25f,0.42f,4.0f,   // copper_copper
-    0.0f,4.0f,0.0f,           // copper_mask_color
+    0.05f,1.0f,0.0f,          // copper_mask_color
     0,
 0,
@@ -1024 +1024 @@
             else
             {
-                caca_set_color_argb(m_cv_setup, setup_color.y, 0xfff);//setup_color.x);
+                caca_set_color_argb(m_cv_setup, setup_color.y, 0x0f0);//setup_color.x);
                 caca_draw_line(m_cv_setup, 0, y, setup_size.z - 2, y,' ');
                 caca_put_str(m_cv_setup, 1, y, setup_text[k]);
@@ -1041 +1041 @@
             else
             {
-                caca_set_color_argb(m_cv_setup, setup_color.y, 0xfff);//setup_color.x);
+                caca_set_color_argb(m_cv_setup, setup_color.y, 0x0f0);//setup_color.x);
                 caca_draw_line(m_cv_setup, setup_size.z, y, setup_size.x, y,' ');
                 caca_put_str(m_cv_setup, setup_size.z + 1, y, setup_text[k]);
@@ -1500 +1500 @@
         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);
+        shader_copper->SetUniform(shader_copper_mask_color, copper_mask_color);
         TraceQuad();
         shader_color->Unbind();