Changeset 3142 for libcaca/trunk/caca-php/examplesTweet

Timestamp:

Oct 30, 2008, 1:18:07 AM (12 years ago)

Author:

nico

Message:

• Remove php function caca_create_event
• caca_get_event return false if type == CACA_EVENT_NONE otherwise return a new php resource
• Adapt sample program demo.php

File:

• libcaca/trunk/caca-php/examples/demo.php (modified) (5 diffs)

libcaca/trunk/caca-php/examples/demo.php

@@ -16 +16 @@
  */
 
-
-
 function main() {
         $cv = caca_create_canvas(0, 0);
@@ -31 +29 @@
         caca_set_display_time($dp, 40000);
 
-        /* Disable cursor */
+        /* Disable X cursor */
         caca_set_mouse($dp, 0);
 
@@ -40 +38 @@
         $bounds = $outline = $dithering = 0;
         $need_refresh = false;
-        $ev = caca_create_event();
         while(!$quit) {
-                while (caca_get_event($dp, CACA_EVENT_ANY, $ev, 1000)) {
+                while ($ev = caca_get_event($dp, CACA_EVENT_ANY, 1000)) {
                         if (caca_get_event_type($ev) & CACA_EVENT_KEY_PRESS) {
                                 switch (caca_get_event_key_ch($ev)) {
@@ -117 +114 @@
 }
 
-function demo_go($dp, $demo, $cv, $bounds, $outline) {
-        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
-        caca_clear_canvas($cv);
-
-        while (!caca_get_event($dp, CACA_EVENT_KEY_PRESS)) {
-                if (function_exists($demo))
-                        $demo($cv, $bounds, $outline);
-
-                caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
-                caca_draw_thin_box($cv, 1, 1, caca_get_canvas_width($cv) - 2, caca_get_canvas_height($cv) - 2);
-                $rate = sprintf("%01.2f", 1000000 / caca_get_display_time($dp));
-                caca_put_str($cv, 4, 1, "[$rate fps]----");
-                caca_refresh_display($dp);
-        }
-
-        display_menu($cv, $dp, $bounds, $outline);
-        caca_refresh_display($dp);
-}
-
-
-function demo_all($cv, $bounds, $outline) {
-        global $i;
-
-        $i++;
-
-        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
-        caca_clear_canvas($cv);
-
-        /* Draw the sun */
-        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
-        $xo = caca_get_canvas_width($cv) / 4;
-        $yo = caca_get_canvas_height($cv) / 4 + 5 * sin(0.03 * $i);
-
-        for ($j = 0; $j < 16; $j++) {
-                $xa = $xo - (30 + sin(0.03 * $i) * 8) * sin(0.03 * $i + M_PI * $j / 8);
-                $ya = $yo + (15 + sin(0.03 * $i) * 4) * cos(0.03 * $i + M_PI * $j / 8);
-                caca_draw_thin_line($cv, $xo, $yo, $xa, $ya);
-        }
-
-        $j = 15 + sin(0.03 * $i) * 8;
-        caca_set_color_ansi($cv, CACA_WHITE, CACA_BLACK);
-        caca_fill_ellipse($cv, $xo, $yo, $j, $j / 2, ord('#'));
-        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
-        caca_draw_ellipse($cv, $xo, $yo, $j, $j / 2, ord('#'));
-
-        /* Draw the pyramid */
-        $xo = caca_get_canvas_width($cv) * 5 / 8;
-        $yo = 2;
-
-        $xa = caca_get_canvas_width($cv) / 8 + sin(0.03 * $i) * 5;
-        $ya = caca_get_canvas_height($cv) / 2 + cos(0.03 * $i) * 5;
-
-        $xb = caca_get_canvas_width($cv) - 10 - cos(0.02 * $i) * 10;
-        $yb = caca_get_canvas_height($cv) * 3 / 4 - 5 + sin(0.02 * $i) * 5;
-
-        $xc = caca_get_canvas_width($cv) / 4 - sin(0.02 * $i) * 5;
-        $yc = caca_get_canvas_height($cv) * 3 / 4 + cos(0.02 * $i) * 5;
-
-        caca_set_color_ansi($cv, CACA_GREEN, CACA_BLACK);
-        caca_fill_triangle($cv, $xo, $yo, $xb, $yb, $xa, $ya, ord('%'));
-        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
-        caca_draw_thin_triangle($cv, $xo, $yo, $xb, $yb, $xa, $ya);
-
-        caca_set_color_ansi($cv, CACA_RED, CACA_BLACK);
-        caca_fill_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc, ord('#'));
-        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
-        caca_draw_thin_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc);
-
-        caca_set_color_ansi($cv, CACA_BLUE, CACA_BLACK);
-        caca_fill_triangle($cv, $xo, $yo, $xb, $yb, $xc, $yc, ord('%'));
-        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
-        caca_draw_thin_triangle($cv, $xo, $yo, $xb, $yb, $xc, $yc);
-
-        /* Draw a background triangle */
-        $xa = 2;
-        $ya = 2;
-
-        $xb = caca_get_canvas_width($cv) - 3;
-        $yb = caca_get_canvas_height($cv) / 2;
-
-        $xc = caca_get_canvas_width($cv) / 3;
-        $yc = caca_get_canvas_height($cv) - 3;
-
-        caca_set_color_ansi($cv, CACA_CYAN, CACA_BLACK);
-        caca_draw_thin_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc);
-
-        $xo = caca_get_canvas_width($cv) / 2 + cos(0.027 * $i) * caca_get_canvas_width($cv) / 3;
-        $yo = caca_get_canvas_height($cv) / 2 - sin(0.027 * $i) * caca_get_canvas_height($cv) / 2;
-
-        caca_draw_thin_line($cv, $xa, $ya, $xo, $yo);
-        caca_draw_thin_line($cv, $xb, $yb, $xo, $yo);
-        caca_draw_thin_line($cv, $xc, $yc, $xo, $yo);
-
-        /* Draw a trail behind the foreground sprite */
-        for($j = $i - 60; $j < $i; $j++) {
-                $delta = caca_rand(-5, 6);
-                caca_set_color_ansi($cv, caca_rand(0, 16), caca_rand(0, 16));
-                caca_put_char($cv, 
-                        caca_get_canvas_width($cv) / 2 + cos(0.02 * $j) * ($delta + caca_get_canvas_width($cv) / 4),
-                        caca_get_canvas_height($cv) / 2 + sin(0.02 * $j) * ($delta + caca_get_canvas_height($cv) / 3),
-                        ord('#'));
-        }
-}
-
 function display_menu($cv, $dp, $bounds, $outline, $refresh = true) {
         $xo = caca_get_canvas_width($cv) - 2;
@@ -254 +147 @@
 }
 
+function demo_go($dp, $demo, $cv, $bounds, $outline) {
+        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
+        caca_clear_canvas($cv);
+
+        while (!caca_get_event($dp, CACA_EVENT_KEY_PRESS)) {
+                if (function_exists($demo))
+                        $demo($cv, $bounds, $outline);
+
+                caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
+                caca_draw_thin_box($cv, 1, 1, caca_get_canvas_width($cv) - 2, caca_get_canvas_height($cv) - 2);
+                $rate = sprintf("%01.2f", 1000000 / caca_get_display_time($dp));
+                caca_put_str($cv, 4, 1, "[$rate fps]----");
+                caca_refresh_display($dp);
+        }
+
+        display_menu($cv, $dp, $bounds, $outline);
+        caca_refresh_display($dp);
+}
+
+
+function demo_all($cv, $bounds, $outline) {
+        global $i;
+
+        $i++;
+
+        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
+        caca_clear_canvas($cv);
+
+        /* Draw the sun */
+        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
+        $xo = caca_get_canvas_width($cv) / 4;
+        $yo = caca_get_canvas_height($cv) / 4 + 5 * sin(0.03 * $i);
+
+        for ($j = 0; $j < 16; $j++) {
+                $xa = $xo - (30 + sin(0.03 * $i) * 8) * sin(0.03 * $i + M_PI * $j / 8);
+                $ya = $yo + (15 + sin(0.03 * $i) * 4) * cos(0.03 * $i + M_PI * $j / 8);
+                caca_draw_thin_line($cv, $xo, $yo, $xa, $ya);
+        }
+
+        $j = 15 + sin(0.03 * $i) * 8;
+        caca_set_color_ansi($cv, CACA_WHITE, CACA_BLACK);
+        caca_fill_ellipse($cv, $xo, $yo, $j, $j / 2, ord('#'));
+        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
+        caca_draw_ellipse($cv, $xo, $yo, $j, $j / 2, ord('#'));
+
+        /* Draw the pyramid */
+        $xo = caca_get_canvas_width($cv) * 5 / 8;
+        $yo = 2;
+
+        $xa = caca_get_canvas_width($cv) / 8 + sin(0.03 * $i) * 5;
+        $ya = caca_get_canvas_height($cv) / 2 + cos(0.03 * $i) * 5;
+
+        $xb = caca_get_canvas_width($cv) - 10 - cos(0.02 * $i) * 10;
+        $yb = caca_get_canvas_height($cv) * 3 / 4 - 5 + sin(0.02 * $i) * 5;
+
+        $xc = caca_get_canvas_width($cv) / 4 - sin(0.02 * $i) * 5;
+        $yc = caca_get_canvas_height($cv) * 3 / 4 + cos(0.02 * $i) * 5;
+
+        caca_set_color_ansi($cv, CACA_GREEN, CACA_BLACK);
+        caca_fill_triangle($cv, $xo, $yo, $xb, $yb, $xa, $ya, ord('%'));
+        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
+        caca_draw_thin_triangle($cv, $xo, $yo, $xb, $yb, $xa, $ya);
+
+        caca_set_color_ansi($cv, CACA_RED, CACA_BLACK);
+        caca_fill_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc, ord('#'));
+        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
+        caca_draw_thin_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc);
+
+        caca_set_color_ansi($cv, CACA_BLUE, CACA_BLACK);
+        caca_fill_triangle($cv, $xo, $yo, $xb, $yb, $xc, $yc, ord('%'));
+        caca_set_color_ansi($cv, CACA_YELLOW, CACA_BLACK);
+        caca_draw_thin_triangle($cv, $xo, $yo, $xb, $yb, $xc, $yc);
+
+        /* Draw a background triangle */
+        $xa = 2;
+        $ya = 2;
+
+        $xb = caca_get_canvas_width($cv) - 3;
+        $yb = caca_get_canvas_height($cv) / 2;
+
+        $xc = caca_get_canvas_width($cv) / 3;
+        $yc = caca_get_canvas_height($cv) - 3;
+
+        caca_set_color_ansi($cv, CACA_CYAN, CACA_BLACK);
+        caca_draw_thin_triangle($cv, $xa, $ya, $xb, $yb, $xc, $yc);
+
+        $xo = caca_get_canvas_width($cv) / 2 + cos(0.027 * $i) * caca_get_canvas_width($cv) / 3;
+        $yo = caca_get_canvas_height($cv) / 2 - sin(0.027 * $i) * caca_get_canvas_height($cv) / 2;
+
+        caca_draw_thin_line($cv, $xa, $ya, $xo, $yo);
+        caca_draw_thin_line($cv, $xb, $yb, $xo, $yo);
+        caca_draw_thin_line($cv, $xc, $yc, $xo, $yo);
+
+        /* Draw a trail behind the foreground sprite */
+        for($j = $i - 60; $j < $i; $j++) {
+                $delta = caca_rand(-5, 6);
+                caca_set_color_ansi($cv, caca_rand(0, 16), caca_rand(0, 16));
+                caca_put_char($cv, 
+                        caca_get_canvas_width($cv) / 2 + cos(0.02 * $j) * ($delta + caca_get_canvas_width($cv) / 4),
+                        caca_get_canvas_height($cv) / 2 + sin(0.02 * $j) * ($delta + caca_get_canvas_height($cv) / 3),
+                        ord('#'));
+        }
+}
+
 function demo_dots($cv, $bounds, $outline) {
         $xmax = caca_get_canvas_width($cv);