Changeset 105Tweet

Timestamp:

Nov 9, 2003, 10:36:24 PM (17 years ago)

Author:

Sam Hocevar

Message:

• libee/triangle.c: + Implemented ee_fill_triangle().
• test/demo.c: + Triangle demo.

Location:

libcaca/trunk

Files:

• libee/Makefile.am (modified) (1 diff)
• libee/ee.h (modified) (1 diff)
• libee/triangle.c (added)
• test/Makefile.am (modified) (1 diff)
• test/demo.c (modified) (5 diffs)

libcaca/trunk/libee/Makefile.am

@@ -20 +20 @@
         ee.h \
         io.c \
+        math.c \
+        line.c \
         circle.c \
-        line.c \
-        math.c \
+        triangle.c \
         $(NULL)
 libee_a_CPPFLAGS = $(CPPFLAGS_slang) $(CPPFLAGS_ncurses)

libcaca/trunk/libee/ee.h

@@ -74 +74 @@
 char ee_get_key(void);
 
-void ee_draw_circle(int, int, int, char);
 void ee_draw_line(int, int, int, int, char);
 void ee_draw_thin_line(int, int, int, int);
+void ee_draw_circle(int, int, int, char);
+void ee_fill_triangle(int, int, int, int, int, int, char);
 
 int ee_rand(int, int);

libcaca/trunk/test/Makefile.am

@@ -21 +21 @@
 
 demo_CPPFLAGS = -I../libee $(CPPFLAGS_slang) $(CPPFLAGS_ncurses)
-demo_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses)
+demo_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 

libcaca/trunk/test/demo.c

@@ -21 +21 @@
  */
 
+#include "config.h"
+
 #include <math.h>
 #include <string.h>
@@ -32 +34 @@
 static void demo_thin_lines(void);
 static void demo_circles(void);
+static void demo_triangle(void);
 static void demo_radar(void);
 
@@ -83 +86 @@
             case '5':
                 ee_clear();
+                demo = demo_triangle;
+                break;
+            case '6':
+                ee_clear();
                 demo = demo_radar;
                 break;
@@ -124 +131 @@
     ee_putstr("4: circles demo");
     ee_goto(4, 10);
-    ee_putstr("5: radar demo");
+    ee_putstr("5: triangle demo");
+    ee_goto(4, 11);
+    ee_putstr("6: radar demo");
 
     ee_goto(4, yo - 2);
@@ -217 +226 @@
         ee_draw_circle(x, y, r, '*');
     }
+
+    ee_refresh();
+}
+
+static void demo_triangle(void)
+{
+    static int i = 0;
+
+    int xo, yo, x1, y1, x2, y2, x3, y3;
+
+    i++;
+
+    xo = ee_get_width() * 5 / 8;
+    yo = 2;
+
+    x1 = ee_get_width() / 8 + sin(0.03*i) * 5;
+    y1 = ee_get_height() / 2 + cos(0.03*i) * 5;
+
+    x2 = ee_get_width() - 10 - cos(0.02*i) * 10;
+    y2 = ee_get_height() - 5 + sin(0.02*i) * 5;
+
+    x3 = ee_get_width() / 4 - sin(0.02*i) * 5;
+    y3 = ee_get_height() + cos(0.02*i) * 5;
+
+    ee_clear();
+
+    ee_color(EE_GREEN);
+    ee_fill_triangle(xo, yo, x2, y2, x1, y1, '%');
+    ee_color(EE_YELLOW);
+    ee_draw_thin_line(xo, yo, x2, y2);
+    ee_draw_thin_line(x2, y2, x1, y1);
+    ee_draw_thin_line(x1, y1, xo, yo);
+
+    ee_color(EE_RED);
+    ee_fill_triangle(x1, y1, x2, y2, x3, y3, '#');
+    ee_color(EE_YELLOW);
+    ee_draw_thin_line(x1, y1, x2, y2);
+    ee_draw_thin_line(x2, y2, x3, y3);
+    ee_draw_thin_line(x3, y3, x1, y1);
+
+    ee_color(EE_BLUE);
+    ee_fill_triangle(xo, yo, x2, y2, x3, y3, '%');
+    ee_color(EE_YELLOW);
+    ee_draw_thin_line(xo, yo, x2, y2);
+    ee_draw_thin_line(x2, y2, x3, y3);
+    ee_draw_thin_line(x3, y3, xo, yo);
 
     ee_refresh();