Changeset 1858Tweet

Timestamp:

Sep 2, 2012, 5:35:13 PM (7 years ago)

Author:

rez

Message:

scrollable option list in setup

Location:

trunk/tools/neercs

Files:

• neercs.cpp (modified) (1 diff)
• term/term.cpp (modified) (5 diffs)
• video/copper.lolfx (modified) (1 diff)
• video/render.cpp (modified) (10 diffs)

trunk/tools/neercs/neercs.cpp

@@ -89 +89 @@
     return EXIT_SUCCESS;
 }
-

trunk/tools/neercs/term/term.cpp

@@ -95 +95 @@
     int logo_y = h / 2 - 2;
 
-    caca_set_color_argb(m_caca, 0x8ac, bg_color);
+    caca_set_color_argb(m_caca, 0xbac, bg_color);
     //caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3               ), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3               )), bg_color);
     caca_put_str(m_caca, logo_x + 3, logo_y    ,"__  _________ ______ ______ ______ ______");
@@ -104 +104 @@
     //caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3 + M_PI / 4 * 3), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3 + M_PI / 4 * 3)), bg_color);
     caca_put_str(m_caca, logo_x    , logo_y + 3, "/__/\\__/\\_______________/  \\________________\\");
-    caca_set_color_argb(m_caca, 0xdef, bg_color);
+    caca_set_color_argb(m_caca, 0x269, bg_color);
     caca_put_str(m_caca, logo_x + 5, logo_y + 5, "ALL YOUR TERMINALS ARE BELONG TO US");
 
-    caca_set_color_argb(m_caca, 0x666, bg_color);
+    caca_set_color_argb(m_caca, 0x777, bg_color);
     caca_printf(m_caca, 2, h - 3, "W=%i", w);
     caca_printf(m_caca, 2, h - 2, "H=%i", h);
@@ -126 +126 @@
     int lolcube_y = h - 5 - abs ((h - 5) * lol::sin(m_time * 4));
 
-    caca_set_color_argb(m_caca, hex_color(0.75f + 0.25f * lol::sin(m_time * 2), 0.75f + 0.25f * lol::cos(m_time * 3), 0.75f + 0.25f * lol::sin(m_time * 5)), bg_color);
+    caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::sin(m_time * 2), 0.5f + 0.5f * lol::cos(m_time * 3), 0.5f + 0.5f * lol::sin(m_time * 5)), bg_color);
     caca_put_str(m_caca, lolcube_x + 2, lolcube_y    , "_______");
     caca_put_str(m_caca, lolcube_x + 1, lolcube_y + 1, "/      /|");
@@ -134 +134 @@
     caca_put_str(m_caca, lolcube_x    , lolcube_y + 5, "|______|/");
 
-    caca_set_color_argb(m_caca, 0xdef, bg_color);
+    caca_set_color_argb(m_caca, 0x777, bg_color);
     caca_put_str(m_caca, 0, 0, "rez@lol:~/ sudo -s");
     caca_put_str(m_caca, 0, 1, "[sudo] password for rez:");
@@ -141 +141 @@
     caca_put_str(m_caca, 0, 4, "root@lol:~/");
 }
-

trunk/tools/neercs/video/copper.lolfx

@@ -24 +24 @@
 
         vec3 copper=vec3(0.5);
+
         copper.x+=0.5*cos(p.y*float(screen_size.y/64)+time*2.0);
         copper.z+=0.5*sin(p.y*float(screen_size.y/64)+time*2.0);
 
-        copper*=0.75+0.375*cos(p.y*float(screen_size.y/6)-time*2.0);
+        copper*=0.75+0.375*cos(p.y*float(screen_size.x/8)-time*2.0);
 
-        /*
         copper.x=float(int(copper.x*8.0)*32)/256.0;
         copper.y=float(int(copper.y*8.0)*32)/256.0;
         copper.z=float(int(copper.z*8.0)*32)/256.0;
-        */
 
-        gl_FragColor=vec4((dot(color,color)==1.0)?copper:color,1.0);
+        gl_FragColor=vec4((color==1.0)?copper:color,1.0);
         }

trunk/tools/neercs/video/render.cpp

@@ -120 +120 @@
 /* setup variable */
 bool setup_switch = false;      // switch [option/item]
-int setup_option = 0;           // selected option
+int setup_n = 0;                // item/option number
+int setup_h = 6;                // height
+int setup_cursor = 0;           // cursor position
+int setup_option_i = 0;         // selected option
 int setup_option_n = 10;        // option number
-int setup_item = 0;             // selected item
+int setup_option_p = 0;         // option position
+int setup_item_i = 0;           // selected item
 int setup_item_n = 8;           // item number
+int setup_item_p = 0;           // item position
 int setup_item_key = 0;         // item array key
-int setup_n = 0;                // contextual option/item number
 ivec2 setup_p(1,1);             // position [x,y]
-ivec3 setup_size(30,0,12);      // size [w,h,split]
+ivec3 setup_size(30,7,12);      // size [w,h,split]
 ivec2 setup_color(0x678,0x234); // color [foreground,background]
 char const *setup_text[] = {
@@ -360 +364 @@
     for (int i = 0; i < n; i++)
     {
-        int k = !setup_switch ? (i * (setup_item_n + 1)) : (setup_option * (setup_item_n + 1) + 1 + i);
+        int k = !setup_switch ? (i * (setup_item_n + 1)) : (setup_option_i * (setup_item_n + 1) + 1 + i);
         if (setup_text[k] == "") return i - 1;
     }
@@ -531 +535 @@
     caca_set_canvas_size(m_caca, canvas_char.x, canvas_char.y);
 
-    setup_size.y = ((setup_option_n > setup_item_n) ? setup_option_n : setup_item_n) + 1;
     setup_p = (canvas_char - setup_size.xy) / 2;
-
     setup_n = calc_item_length();
 
@@ -601 +603 @@
             if (!setup_switch)
             {
-                setup_option--;
-                if (setup_option < 0) setup_option = setup_n;
-                setup_item = 0;
+                if (setup_cursor > 0)
+                {
+                    setup_cursor--;
+                }
+                else
+                {
+                    if ((setup_option_p > 0) && setup_cursor == 0) setup_option_p--;
+                }
+                if (setup_option_i > 0)
+                {
+                    setup_option_i--;
+                }
+                else
+                {
+                    setup_option_i = setup_option_n - 1;
+                    setup_option_p = setup_option_n - setup_h;
+                    setup_cursor = setup_h - 1;
+                }
+                setup_item_i = 0;
             }
             else
             {
-                setup_item--;
-                if (setup_item < 0) setup_item = setup_n;
+                setup_item_i--;
+                if (setup_item_i < 0) setup_item_i = setup_n;
             }
         }
@@ -618 +636 @@
             if (!setup_switch)
             {
-                setup_option++;
-                if (setup_option > setup_n) setup_option = 0;
-                setup_item = 0;
+                if (setup_cursor < setup_h - 1)
+                {
+                    setup_cursor++;
+                }
+                else
+                {
+                    if ((setup_option_p + setup_h < setup_option_n) && setup_cursor == setup_h - 1) setup_option_p++;
+                }
+                if (setup_option_i < setup_option_n - 1)
+                {
+                    setup_option_i++;
+                }
+                else
+                {
+                    setup_option_i = 0;
+                    setup_option_p = 0;
+                    setup_cursor = 0;
+                }
+                setup_item_i = 0;
             }
             else
             {
-                setup_item++;
-                if (setup_item > setup_n) setup_item = 0;
+                setup_item_i++;
+                if (setup_item_i > setup_n) setup_item_i = 0;
             }
         }
@@ -635 +669 @@
             if (!setup_switch)
             {
-                setup_option = 0;
+                setup_option_i -= setup_cursor;
+                setup_cursor = 0;
+                setup_item_i = 0;
             }
             else
             {
-                setup_item = 0;
             }
         }
@@ -649 +684 @@
             if (!setup_switch)
             {
-                setup_option = setup_n;
-                setup_item = 0;
+                setup_option_i += setup_h - setup_cursor - 1;
+                setup_cursor = setup_h - 1;
+                setup_item_i = 0;
             }
             else
             {
-                setup_item = setup_n;
+                setup_item_i = setup_n;
             }
         }
@@ -765 +801 @@
         caca_put_str(m_caca, setup_p.x + setup_size.x / 2 - 3, setup_p.y, "SETUP");
         /* display option */
-        for (int i = 0; i < setup_option_n; i++)
+        for (int i = 0; i < setup_h; i++)
         {
             int y = setup_p.y + 1 + i;
-            int k = i * (setup_item_n + 1);
-            if (setup_option != i || setup_switch)
+            int k = (setup_option_p + i) * (setup_item_n + 1);
+            if (setup_option_i != setup_option_p + i || setup_switch)
             {
                 caca_set_color_argb(m_caca, setup_color.x, setup_color.y);
@@ -782 +818 @@
         }
         /* display item */
-        for (int i = 0; i < setup_item_n; i++)
+        for (int i = 0; i < setup_h; i++)
         {
             int y = setup_p.y + 1 + i;
-            int k = setup_option * (setup_item_n + 1) + 1 + i;
-            if (setup_item != i || !setup_switch)
+            int k = setup_option_i * (setup_item_n + 1) + 1 + setup_item_p + i;
+            if (setup_item_i != i || !setup_switch)
             {
                 caca_set_color_argb(m_caca, setup_color.x, setup_color.y);
@@ -800 +836 @@
         /* display variable */
         int y = setup_p.y + setup_size.y;
-        setup_item_key = setup_option * (setup_item_n + 1) + 1 + setup_item;
+        setup_item_key = setup_option_i * (setup_item_n + 1) + 1 + setup_item_i;
         caca_set_color_argb(m_caca, setup_color.y, setup_color.x);
         caca_draw_line(m_caca, setup_p.x, y, setup_p.x + setup_size.x, y,' ');