now using RLE transparent sprites

Finnerex · Finnerex · commit 2ce558ab2abb · 2024-01-22T17:20:56.000-05:00
diff --git a/src/collide.c b/src/collide.c
@@ -29,7 +29,7 @@ void collide_balls(ball_data* ball1, ball_data* ball2) {
 
 }
 
-void check_pockets(ball_data* ball, bool* should_change_turn, bool is_player_1_turn, gfx_sprite_t** player_1_type, int* winning_player, 
+void check_pockets(ball_data* ball, bool* should_change_turn, bool is_player_1_turn, gfx_rletsprite_t** player_1_type, int* winning_player, 
                     int* num_solids, int* num_stripes, int picked_pocket, bool win_attempt) {
 
     static const int pocket_x[] = {14, LCD_WIDTH / 2, LCD_WIDTH - 14, 14,                LCD_WIDTH / 2,     LCD_WIDTH - 14};
diff --git a/src/collide.h b/src/collide.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 typedef struct ball_data {
-    gfx_sprite_t* sprite;
+    gfx_rletsprite_t* sprite;
     bool collided;
     bool pocketed;
     float x;
@@ -33,7 +33,7 @@ typedef struct cue_data {
 void collide_balls(ball_data* ball1, ball_data* ball2);
 void collide_walls(ball_data* ball);
 
-void check_pockets(ball_data* ball, bool* next_turn, bool is_player_1_turn, gfx_sprite_t** player_1_type, int* winning_player, 
+void check_pockets(ball_data* ball, bool* next_turn, bool is_player_1_turn, gfx_rletsprite_t** player_1_type, int* winning_player, 
                     int* num_solids, int* num_stripes, int picked_pocket, bool win_attempt);
 
 float time_of_collision(ball_data *ball1, ball_data *ball2);
diff --git a/src/draw.c b/src/draw.c
@@ -95,15 +95,15 @@ float closest_pos(float x, float y, float o_x, float o_y, float min_distance, fl
 
 }
 
-void draw_players(gfx_sprite_t* player_1_type, bool is_player_1_turn) {
+void draw_players(gfx_rletsprite_t* player_1_type, bool is_player_1_turn) {
     gfx_SetColor(3);
     gfx_SetTextFGColor(3);
     gfx_PrintStringXY("Player 1", 8, TABLE_HEIGHT + 20);
     gfx_PrintStringXY("Player 2", LCD_WIDTH - 60, TABLE_HEIGHT + 20);
 
     if (player_1_type != NULL) {
-        gfx_TransparentSprite_NoClip(player_1_type, 66, TABLE_HEIGHT + 20);
-        gfx_TransparentSprite_NoClip((player_1_type == solid) ? stripe : solid, LCD_WIDTH - 72, TABLE_HEIGHT + 20);
+        gfx_RLETSprite_NoClip(player_1_type, 66, TABLE_HEIGHT + 20);
+        gfx_RLETSprite_NoClip((player_1_type == solid) ? stripe : solid, LCD_WIDTH - 72, TABLE_HEIGHT + 20);
     }
 
     if (is_player_1_turn)
diff --git a/src/draw.h b/src/draw.h
@@ -16,7 +16,7 @@ float closest_pos(float x, float y, float o_x, float o_y, float min_distance, fl
 
 void draw_setup(ball_data balls[16], cue_data* queue);
 
-void draw_players(gfx_sprite_t* player_1_type, bool is_player_1_turn);
+void draw_players(gfx_rletsprite_t* player_1_type, bool is_player_1_turn);
 
 void draw_winning(int winning_player);
 
diff --git a/src/gfx/convimg.yaml b/src/gfx/convimg.yaml
@@ -11,19 +11,22 @@ palettes:
     images: automatic
 
 converts:
-
-  - name: sprites
+  - name: rlet_sprites
+    style: rlet
     palette: global_palette
     transparent-color-index: 0
     images:
-      - table_l
-      - table_tl
       - eightball
       - stripe
       - solid
       - qball
 
-
+  - name: sprites
+    palette: global_palette
+    transparent-color-index: 0
+    images:
+      - table_l
+      - table_tl
 
 outputs:
   - type: c
@@ -32,3 +35,4 @@ outputs:
       - global_palette
     converts:
       - sprites
+      - rlet_sprites
diff --git a/src/gfx/eightball.c b/src/gfx/eightball.c
@@ -1,6 +1,6 @@
-unsigned char eightball_data[66] =
+unsigned char eightball_data[74] =
 {
-    0x08,0x08,0x00,0x00,0x0b,0x0b,0x0b,0x0b,0x00,0x00,0x00,0x0b,0x08,0x08,0x08,0x08,0x0b,0x00,0x0b,0x08,0x14,0x14,0x08,0x08,0x08,0x0b,0x0b,0x08,0x14,0x08,0x14,0x08,
-    0x08,0x0b,0x0b,0x08,0x08,0x14,0x08,0x14,0x08,0x0b,0x0b,0x08,0x08,0x08,0x14,0x14,0x08,0x0b,0x00,0x0b,0x08,0x08,0x08,0x08,0x0b,0x00,0x00,0x00,0x0b,0x0b,0x0b,0x0b,
-    0x00,0x00
+    0x08,0x08,0x02,0x04,0x0b,0x0b,0x0b,0x0b,0x02,0x01,0x06,0x0b,0x08,0x08,0x08,0x08,0x0b,0x01,0x00,0x08,0x0b,0x08,0x14,0x14,0x08,0x08,0x08,0x0b,0x00,0x08,0x0b,0x08,
+    0x14,0x08,0x14,0x08,0x08,0x0b,0x00,0x08,0x0b,0x08,0x08,0x14,0x08,0x14,0x08,0x0b,0x00,0x08,0x0b,0x08,0x08,0x08,0x14,0x14,0x08,0x0b,0x01,0x06,0x0b,0x08,0x08,0x08,
+    0x08,0x0b,0x01,0x02,0x04,0x0b,0x0b,0x0b,0x0b,0x02
 };
diff --git a/src/gfx/eightball.h b/src/gfx/eightball.h
@@ -7,9 +7,9 @@ extern "C" {
 
 #define eightball_width 8
 #define eightball_height 8
-#define eightball_size 66
-#define eightball ((gfx_sprite_t*)eightball_data)
-extern unsigned char eightball_data[66];
+#define eightball_size 74
+#define eightball ((gfx_rletsprite_t*)eightball_data)
+extern unsigned char eightball_data[74];
 
 #ifdef __cplusplus
 }
diff --git a/src/gfx/gfx.h b/src/gfx/gfx.h
@@ -9,6 +9,7 @@ extern "C" {
 #define sprites_palette_offset 0
 #include "table_l.h"
 #include "table_tl.h"
+#define rlet_sprites_palette_offset 0
 #include "eightball.h"
 #include "stripe.h"
 #include "solid.h"
diff --git a/src/gfx/qball.c b/src/gfx/qball.c
@@ -1,6 +1,6 @@
-unsigned char qball_data[66] =
+unsigned char qball_data[74] =
 {
-    0x08,0x08,0x00,0x00,0x12,0x12,0x12,0x12,0x00,0x00,0x00,0x12,0x14,0x14,0x14,0x14,0x12,0x00,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x12,0x14,0x14,0x14,0x14,0x14,
-    0x14,0x12,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x12,0x14,0x14,0x14,0x14,0x12,0x00,0x00,0x00,0x12,0x12,0x12,0x12,
-    0x00,0x00
+    0x08,0x08,0x02,0x04,0x12,0x12,0x12,0x12,0x02,0x01,0x06,0x12,0x14,0x14,0x14,0x14,0x12,0x01,0x00,0x08,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x08,0x12,0x14,
+    0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x08,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x08,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x01,0x06,0x12,0x14,0x14,0x14,
+    0x14,0x12,0x01,0x02,0x04,0x12,0x12,0x12,0x12,0x02
 };
diff --git a/src/gfx/qball.h b/src/gfx/qball.h
@@ -7,9 +7,9 @@ extern "C" {
 
 #define qball_width 8
 #define qball_height 8
-#define qball_size 66
-#define qball ((gfx_sprite_t*)qball_data)
-extern unsigned char qball_data[66];
+#define qball_size 74
+#define qball ((gfx_rletsprite_t*)qball_data)
+extern unsigned char qball_data[74];
 
 #ifdef __cplusplus
 }
diff --git a/src/gfx/solid.c b/src/gfx/solid.c
@@ -1,6 +1,6 @@
-unsigned char solid_data[66] =
+unsigned char solid_data[74] =
 {
-    0x08,0x08,0x00,0x00,0x0d,0x0d,0x0d,0x0d,0x00,0x00,0x00,0x0d,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,
-    0x0e,0x0d,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x0d,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x00,0x00,0x0d,0x0d,0x0d,0x0d,
-    0x00,0x00
+    0x08,0x08,0x02,0x04,0x0d,0x0d,0x0d,0x0d,0x02,0x01,0x06,0x0d,0x0e,0x0e,0x0e,0x0e,0x0d,0x01,0x00,0x08,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x08,0x0d,0x0e,
+    0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x08,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x00,0x08,0x0d,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x01,0x06,0x0d,0x0e,0x0e,0x0e,
+    0x0e,0x0d,0x01,0x02,0x04,0x0d,0x0d,0x0d,0x0d,0x02
 };
diff --git a/src/gfx/solid.h b/src/gfx/solid.h
@@ -7,9 +7,9 @@ extern "C" {
 
 #define solid_width 8
 #define solid_height 8
-#define solid_size 66
-#define solid ((gfx_sprite_t*)solid_data)
-extern unsigned char solid_data[66];
+#define solid_size 74
+#define solid ((gfx_rletsprite_t*)solid_data)
+extern unsigned char solid_data[74];
 
 #ifdef __cplusplus
 }
diff --git a/src/gfx/stripe.c b/src/gfx/stripe.c
@@ -1,6 +1,6 @@
-unsigned char stripe_data[66] =
+unsigned char stripe_data[74] =
 {
-    0x08,0x08,0x00,0x00,0x12,0x12,0x12,0x12,0x00,0x00,0x00,0x12,0x14,0x14,0x14,0x14,0x12,0x00,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x13,0x15,0x15,0x15,0x15,0x15,
-    0x15,0x13,0x13,0x15,0x15,0x15,0x15,0x15,0x15,0x13,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x12,0x14,0x14,0x14,0x14,0x12,0x00,0x00,0x00,0x12,0x12,0x12,0x12,
-    0x00,0x00
+    0x08,0x08,0x02,0x04,0x12,0x12,0x12,0x12,0x02,0x01,0x06,0x12,0x14,0x14,0x14,0x14,0x12,0x01,0x00,0x08,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x00,0x08,0x13,0x15,
+    0x15,0x15,0x15,0x15,0x15,0x13,0x00,0x08,0x13,0x15,0x15,0x15,0x15,0x15,0x15,0x13,0x00,0x08,0x12,0x14,0x14,0x14,0x14,0x14,0x14,0x12,0x01,0x06,0x12,0x14,0x14,0x14,
+    0x14,0x12,0x01,0x02,0x04,0x12,0x12,0x12,0x12,0x02
 };
diff --git a/src/gfx/stripe.h b/src/gfx/stripe.h
@@ -7,9 +7,9 @@ extern "C" {
 
 #define stripe_width 8
 #define stripe_height 8
-#define stripe_size 66
-#define stripe ((gfx_sprite_t*)stripe_data)
-extern unsigned char stripe_data[66];
+#define stripe_size 74
+#define stripe ((gfx_rletsprite_t*)stripe_data)
+extern unsigned char stripe_data[74];
 
 #ifdef __cplusplus
 }
diff --git a/src/main.c b/src/main.c
@@ -38,7 +38,7 @@ int num_solids = 7;
 // player turns
 bool is_player_1_turn = true;
 bool should_change_turn = false;
-gfx_sprite_t* player_1_type = NULL;
+gfx_rletsprite_t* player_1_type = NULL;
 
 int winning_player = 0;
 
@@ -87,7 +87,7 @@ void begin(void){
     init_table();
 
     // ball initilization
-    gfx_sprite_t* init_ball_sprite[16] = {stripe, solid, stripe, stripe, eightball, solid, stripe, solid, solid, stripe, solid, stripe, solid, stripe, solid, qball};
+    gfx_rletsprite_t* init_ball_sprite[16] = {stripe, solid, stripe, stripe, eightball, solid, stripe, solid, solid, stripe, solid, stripe, solid, stripe, solid, qball};
     float init_ball_x[16] = {LCD_WIDTH/2 + table_tl_width/2 + 10, init_ball_x[0] + stripe_width, init_ball_x[0] + stripe_width, init_ball_x[2] + stripe_width, init_ball_x[2] + stripe_width, init_ball_x[2] + stripe_width, init_ball_x[5] + stripe_width, init_ball_x[5] + stripe_width, init_ball_x[5] + stripe_width, init_ball_x[5] + stripe_width, init_ball_x[9] + stripe_width, init_ball_x[9] + stripe_width, init_ball_x[9] + stripe_width, init_ball_x[9] + stripe_width, init_ball_x[9] + stripe_width, 85};
     float init_ball_y[16] = {table_l_height/2, init_ball_y[0] - stripe_height/2, init_ball_y[0] + stripe_height/2, init_ball_y[0] - stripe_height, init_ball_y[0], init_ball_y[0] + stripe_height, init_ball_y[0] - (5.0/3.0) * stripe_height + 2, init_ball_y[0] - stripe_height/2, init_ball_y[0] + stripe_height/2, init_ball_y[0] + (5.0/3.0) * stripe_height - 1, init_ball_y[0] - 2 * stripe_height, init_ball_y[0] - stripe_height, init_ball_y[0], init_ball_y[0] + stripe_height, init_ball_y[0] + 2 * stripe_height, table_l_height/2};
     
@@ -343,7 +343,7 @@ void draw(void) {
 
     // draw balls
     for (int i = 0; i < 16; i++) {
-        gfx_TransparentSprite_NoClip(balls[i].sprite, balls[i].x - balls[i].sprite->width/2, balls[i].y - balls[i].sprite->height/2);
+        gfx_RLETSprite_NoClip(balls[i].sprite, balls[i].x - balls[i].sprite->width/2, balls[i].y - balls[i].sprite->height/2);
         balls[i].collided = false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void collide_balls(ball_data* ball1, ball_data* ball2) {`
`29`	`29`
`30`	`30`	`}`
`31`	`31`
`32`		`-void check_pockets(ball_data* ball, bool* should_change_turn, bool is_player_1_turn, gfx_sprite_t** player_1_type, int* winning_player,`
	`32`	`+void check_pockets(ball_data* ball, bool* should_change_turn, bool is_player_1_turn, gfx_rletsprite_t** player_1_type, int* winning_player,`
`33`	`33`	`int* num_solids, int* num_stripes, int picked_pocket, bool win_attempt) {`
`34`	`34`
`35`	`35`	`static const int pocket_x[] = {14, LCD_WIDTH / 2, LCD_WIDTH - 14, 14, LCD_WIDTH / 2, LCD_WIDTH - 14};`