Commit b7f5295e0a1b96f7bc1928bdb4553eeb8320aa60
2023-11-27T21:03:33
flies
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/libc3/window/cairo/demo/flies.c b/libc3/window/cairo/demo/flies.c
index 3778047..1042999 100644
--- a/libc3/window/cairo/demo/flies.c
+++ b/libc3/window/cairo/demo/flies.c
@@ -13,9 +13,11 @@
#include <math.h>
#include <libc3/c3.h>
#include "../window_cairo.h"
+#include "../cairo_sprite.h"
#include "flies.h"
-#define BOARD_SIZE 25
+#define BOARD_SIZE 25
+#define FLY_TIME_MAX 300
typedef enum {
BOARD_ITEM_SPACE = 0,
@@ -137,11 +139,13 @@ bool flies_render (s_sequence *seq, s_window_cairo *window,
f64 board_item_w;
f64 board_item_h;
s_buf buf;
+ f64 dead_fly_scale;
u8 direction;
bool directions[9];
uw fly_address[2];
uw *fly_in;
uw *fly_out;
+ f64 fly_scale;
uw *fly_time;
uw i;
s_map *map;
@@ -169,6 +173,8 @@ bool flies_render (s_sequence *seq, s_window_cairo *window,
board_w = board_item_w * BOARD_SIZE;
board_h = board_item_h * BOARD_SIZE;
board_x = (window->w - board_w) / 2.0;
+ fly_scale = (f64) board_item_w / g_fly_sprite.w;
+ dead_fly_scale = (f64) board_item_w / g_dead_fly_sprite.w;
cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
cairo_rectangle(cr, board_x, 0, board_w, board_h);
cairo_fill(cr);
@@ -212,10 +218,13 @@ bool flies_render (s_sequence *seq, s_window_cairo *window,
cairo_fill(cr);
break;
case BOARD_ITEM_FLY:
- cairo_set_source_rgb(cr, 1.0, 0.0, 0.0);
- cairo_rectangle(cr, 0, 0, board_item_w + 1.0,
- board_item_h + 1.0);
- cairo_fill(cr);
+ cairo_scale(cr, fly_scale, fly_scale);
+ cairo_sprite_blit(&g_fly_sprite, 0,
+ cr, 0, 0);
+ /*cairo_set_source_rgb(cr, 1.0, 0.0, 0.0);
+ cairo_rectangle(cr, 0, 0, board_item_w + 1.0,
+ board_item_h + 1.0);
+ cairo_fill(cr);*/
if (address[0] == BOARD_SIZE / 2 &&
address[1] == BOARD_SIZE - 1) {
array_data_set(board, address, &g_board_item_space);
@@ -264,16 +273,15 @@ bool flies_render (s_sequence *seq, s_window_cairo *window,
fly_address[1] = address[1];
}
*fly_time += 1;
- if (*fly_time > 200) {
+ if (*fly_time > FLY_TIME_MAX) {
array_data_set(board, fly_address, &g_board_item_dead_fly);
fly_init(map);
}
break;
case BOARD_ITEM_DEAD_FLY:
- cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
- cairo_rectangle(cr, 0, 0, board_item_w + 1.0,
- board_item_h + 1.0);
- cairo_fill(cr);
+ cairo_scale(cr, dead_fly_scale, dead_fly_scale);
+ cairo_sprite_blit(&g_dead_fly_sprite, 0,
+ cr, 0, 0);
break;
}
cairo_identity_matrix(cr);