Changeset 1707Tweet

Timestamp:

Aug 9, 2012, 1:30:11 AM (11 years ago)

Author:

rez

Message:

setup menu bugfix (working now!)

Location:

trunk/tools/neercs/video

Files:

• render.cpp (modified) (4 diffs)
• render.h (modified) (1 diff)

trunk/tools/neercs/video/render.cpp

@@ -171 +171 @@
 float value, angle, radius, scale, speed;
 /* shader variable */
-vec2 buffer(0.8f,0.2f);         // [new frame mix,old frame mix]
-vec2 remanency(0.2f,0.8f);      // remanency [source mix,buffer mix]
+vec2 buffer(0.7f,0.3f);         // [new frame mix,old frame mix]
+vec2 remanency(0.3f,0.7f);      // remanency [source mix,buffer mix]
 vec2 glow_mix(0.5f,0.5f);       // glow mix [source mix,glow mix]
 vec2 glow_large(2.0f,2.0f);     // large glow radius [center,corner]
@@ -207 +207 @@
         vec4(0.0f, 1.0f, 0.1f, glow_mix.x),
         vec4(0.0f, 1.0f, 0.1f, glow_mix.y),
-        vec4(0.0f, 8.0f, 0.1f, glow_large.x),
-        vec4(0.0f, 8.0f, 0.1f, glow_large.y),
-        vec4(0.0f, 4.0f, 0.1f, glow_small.x),
-        vec4(0.0f, 4.0f, 0.1f, glow_small.y),
+        vec4(0.0f, 4.0f, 0.05f, glow_large.x),
+        vec4(0.0f, 4.0f, 0.05f, glow_large.y),
+        vec4(0.0f, 2.0f, 0.05f, glow_small.x),
+        vec4(0.0f, 2.0f, 0.05f, glow_small.y),
+        vec4(0),
     vec4(0), /* blur */
         vec4(0, 1, 1, 0),
-        vec4(0.0f, 2.0f, 0.1f, blur.x),
-        vec4(0.0f, 2.0f, 0.1f, blur.y),
+        vec4(0.0f, 2.0f, 0.05f, blur.x),
+        vec4(0.0f, 2.0f, 0.05f, blur.y),
     vec4(0) /* color */
     };
 
-void Render::UpdateVar(int key)
-{
-    int k = key;
-    m_shader_remanency = (setup_var[k].w == 1) ? true : false; k += 8;
-    m_shader_glow = (setup_var[k].w == 1) ? true : false;
+void Render::UpdateVar()
+{
+    int k = 1;
+    m_shader_remanency = (setup_var[k].w == 1) ? true : false; k++;
+    buffer = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    remanency = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    k += 4;
+    m_shader_glow = (setup_var[k].w == 1) ? true : false; k++;
+    glow_mix = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    glow_large = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    glow_small = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    k += 2;
+    m_shader_blur = (setup_var[k].w == 1) ? true : false; k++;
+    blur = vec2(setup_var[k].w, setup_var[k + 1].w); k += 2;
+    k += 6;
 }
 
@@ -491 +502 @@
             setup_var[setup_item_key].w -= setup_var[setup_item_key].z;
             if (setup_var[setup_item_key].w < setup_var[setup_item_key].x) setup_var[setup_item_key].w = setup_var[setup_item_key].x;
-            Render::UpdateVar(setup_item_key);
+            Render::UpdateVar();
         }
         timer_key = timer;
@@ -501 +512 @@
             setup_var[setup_item_key].w += setup_var[setup_item_key].z;
             if (setup_var[setup_item_key].w > setup_var[setup_item_key].y) setup_var[setup_item_key].w = setup_var[setup_item_key].y;
-            Render::UpdateVar(setup_item_key);
+            Render::UpdateVar();
         }
         timer_key = timer;

trunk/tools/neercs/video/render.h

@@ -26 +26 @@
     void Pause();
     void Shader();
-    void UpdateVar(int key);
+    void UpdateVar();
 
     caca_canvas_t *m_caca;