altos/draw: Add a reasonable API for drawing, add lines.

[fw/altos] / src / stm-vga / ao_demo.c

diff --git a/src/stm-vga/ao_demo.c b/src/stm-vga/ao_demo.c
index 582e4156b1a5601dc9075931e61a8e1912db5a36..eaeaf0708a2cdeed79760bd6a12eb88696c31555 100644 (file)
--- a/src/stm-vga/ao_demo.c
+++ b/src/stm-vga/ao_demo.c
@@ -24,15 +24,138 @@
 #include <ao_boot.h>
 #include <ao_vga.h>
 
+struct ao_task ball_task;
+
+#define BALL_WIDTH     5
+#define BALL_HEIGHT    5
+
+static int     ball_x;
+static int     ball_y;
+static int     ball_dx, ball_dy;
+
+uint8_t                ball_enable;
+
+void
+ao_ball(void)
+{
+       ball_dx = 1;
+       ball_dy = 1;
+       ball_x = 0;
+       ball_y = 0;
+       for (;;) {
+               while (!ball_enable)
+                       ao_sleep(&ball_enable);
+               for (;;) {
+                       ao_line(&ao_vga_bitmap,
+                               -100, -100, ball_x*2, ball_y*2,
+                               1, AO_XOR);
+                       ao_text(&ao_vga_bitmap,
+                               ball_x, ball_y - 10,
+                               "Hello, Bdale!",
+                               1, AO_XOR);
+                       ao_rect(&ao_vga_bitmap,
+                               ball_x, ball_y,
+                               BALL_WIDTH,
+                               BALL_HEIGHT,
+                               1,
+                               AO_XOR);
+                       ao_delay(AO_MS_TO_TICKS(10));
+                       ao_rect(&ao_vga_bitmap,
+                               ball_x, ball_y,
+                               BALL_WIDTH,
+                               BALL_HEIGHT,
+                               1,
+                               AO_XOR);
+                       ao_text(&ao_vga_bitmap,
+                               ball_x, ball_y - 10,
+                               "Hello, Bdale!",
+                               1, AO_XOR);
+                       ao_line(&ao_vga_bitmap,
+                               -100, -100, ball_x*2, ball_y*2,
+                               1, AO_XOR);
+                       if (!ball_enable)
+                               break;
+                       ball_x += ball_dx;
+                       ball_y += ball_dy;
+                       if (ball_x + BALL_WIDTH > AO_VGA_WIDTH) {
+                               ball_x = AO_VGA_WIDTH - BALL_WIDTH;
+                               ball_dx = -ball_dx;
+                       }
+                       if (ball_x < 0) {
+                               ball_x = -ball_x;
+                               ball_dx = -ball_dx;
+                       }
+                       if (ball_y + BALL_HEIGHT > AO_VGA_HEIGHT) {
+                               ball_y = AO_VGA_HEIGHT - BALL_HEIGHT;
+                               ball_dy = -ball_dy;
+                       }
+                       if (ball_y < 0) {
+                               ball_y = -ball_y;
+                               ball_dy = -ball_dy;
+                       }
+               }
+       }
+}
+
+static void
+ao_fb_init(void)
+{
+       ao_rect(&ao_vga_bitmap,
+               0, 0, AO_VGA_WIDTH, AO_VGA_HEIGHT,
+               1, AO_COPY);
+
+       ao_rect(&ao_vga_bitmap,
+               10, 10, 10, 10,
+               0, AO_COPY);
+
+       ao_rect(&ao_vga_bitmap,
+               AO_VGA_WIDTH - 20, 10, 10, 10,
+               0, AO_COPY);
+
+       ao_rect(&ao_vga_bitmap,
+               10, AO_VGA_HEIGHT - 20, 10, 10,
+               0, AO_COPY);
+
+       ao_rect(&ao_vga_bitmap,
+               AO_VGA_WIDTH - 20, AO_VGA_HEIGHT - 20, 10, 10,
+               0, AO_COPY);
+
+       ao_text(&ao_vga_bitmap,
+               20, 100,
+               "Hello, Bdale!",
+               0, AO_COPY);
+
+       ao_text(&ao_vga_bitmap,
+               1, ao_font.ascent,
+               "UL",
+               0, AO_COPY);
+
+       ao_text(&ao_vga_bitmap,
+               1, AO_VGA_HEIGHT - ao_font.descent,
+               "BL",
+               0, AO_COPY);
+}
+
 static void
 ao_video_toggle(void)
 {
        ao_cmd_decimal();
+       if (ao_cmd_lex_i)
+               ao_fb_init();
        ao_vga_enable(ao_cmd_lex_i);
 }
 
+static void
+ao_ball_toggle(void)
+{
+       ao_cmd_decimal();
+       ball_enable = ao_cmd_lex_i;
+       ao_wakeup(&ball_enable);
+}
+
 __code struct ao_cmds ao_demo_cmds[] = {
        { ao_video_toggle, "V\0Toggle video" },
+       { ao_ball_toggle, "B\0Toggle ball" },
        { 0, NULL }
 };
 
@@ -52,6 +175,7 @@ main(void)
        ao_vga_init();
        ao_usb_init();
 
+       ao_add_task(&ball_task, ao_ball, "ball");
        ao_cmd_register(&ao_demo_cmds[0]);
 
        ao_start_scheduler();