thepigeongenerator/tetris_clone
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/tetris_clone.git synced 2025-12-19 23:15:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

use common integer type in shapes.c/shapes.h, for decreasing namespace pollution

Browse Source
This commit is contained in:
Quinn
2025-06-24 19:51:06 +02:00
parent a50b39307a
commit 9fbc9e0f9a
6 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/game/tetromino/shapes.c
View File

@@ -1,42 +1,43 @@
#include "shapes.h"
#include "../../io/colour/colour8.h"
#include "../../util/types.h"
/* 0 1 2 3 */
#define SHAPE_O ((shape)0x0660) // 0000 0110 0110 0000 the O tetromino with no rotation
/* 0 1 2 3 */
#define SHAPE_O ((u16)0x0660) // 0000 0110 0110 0000 the O tetromino with no rotation
#define SHAPE_I ((shape)0x0F00) // 0000 1111 0000 0000 the I tetromino with no rotation
#define SHAPE_I_90 ((shape)0x2222) // 0010 0010 0010 0010 the I tetromino with a 90° rotation
#define SHAPE_I_180 ((shape)0x00F0) // 0000 0000 1111 0000 the I tetromino with a 180° rotation
#define SHAPE_I_270 ((shape)0x4444) // 0100 0100 0100 0100 the I tetromino with a 270° rotation
#define SHAPE_I ((u16)0x0F00) // 0000 1111 0000 0000 the I tetromino with no rotation
#define SHAPE_I_90 ((u16)0x2222) // 0010 0010 0010 0010 the I tetromino with a 90° rotation
#define SHAPE_I_180 ((u16)0x00F0) // 0000 0000 1111 0000 the I tetromino with a 180° rotation
#define SHAPE_I_270 ((u16)0x4444) // 0100 0100 0100 0100 the I tetromino with a 270° rotation
#define SHAPE_S ((shape)0xC600) // 1100 0110 0000 0000 the Z tetromino with no rotation
#define SHAPE_S_90 ((shape)0x2640) // 0010 0110 0100 0000 the Z tetromino with a 90° rotation
#define SHAPE_S_180 ((shape)0x0C60) // 0000 1100 0110 0000 the Z tetromino with a 180° rotation
#define SHAPE_S_270 ((shape)0x4C80) // 0100 1100 1000 0000 the Z tetromino with a 270° rotation
#define SHAPE_S ((u16)0xC600) // 1100 0110 0000 0000 the Z tetromino with no rotation
#define SHAPE_S_90 ((u16)0x2640) // 0010 0110 0100 0000 the Z tetromino with a 90° rotation
#define SHAPE_S_180 ((u16)0x0C60) // 0000 1100 0110 0000 the Z tetromino with a 180° rotation
#define SHAPE_S_270 ((u16)0x4C80) // 0100 1100 1000 0000 the Z tetromino with a 270° rotation
#define SHAPE_Z ((shape)0x6C00) // 0110 1100 0000 0000 the S tetromino with no rotation
#define SHAPE_Z_90 ((shape)0x4620) // 0100 0110 0010 0000 the S tetromino with a 90° rotation
#define SHAPE_Z_180 ((shape)0x06C0) // 0000 0110 1100 0000 the S tetromino with a 180° rotation
#define SHAPE_Z_270 ((shape)0x8C40) // 1000 1100 0100 0000 the S tetromino with a 270° rotation
#define SHAPE_Z ((u16)0x6C00) // 0110 1100 0000 0000 the S tetromino with no rotation
#define SHAPE_Z_90 ((u16)0x4620) // 0100 0110 0010 0000 the S tetromino with a 90° rotation
#define SHAPE_Z_180 ((u16)0x06C0) // 0000 0110 1100 0000 the S tetromino with a 180° rotation
#define SHAPE_Z_270 ((u16)0x8C40) // 1000 1100 0100 0000 the S tetromino with a 270° rotation
#define SHAPE_T ((shape)0x0E40) // 0000 1110 0100 0000 the T tetromino with no rotation
#define SHAPE_T_90 ((shape)0x4C40) // 0100 1100 0100 0000 the T tetromino with a 90° rotation
#define SHAPE_T_180 ((shape)0x4E00) // 0100 1110 0000 0000 the T tetromino with a 180° rotation
#define SHAPE_T_270 ((shape)0x4640) // 0100 0110 0100 0000 the T tetromino with a 270° rotation
#define SHAPE_T ((u16)0x0E40) // 0000 1110 0100 0000 the T tetromino with no rotation
#define SHAPE_T_90 ((u16)0x4C40) // 0100 1100 0100 0000 the T tetromino with a 90° rotation
#define SHAPE_T_180 ((u16)0x4E00) // 0100 1110 0000 0000 the T tetromino with a 180° rotation
#define SHAPE_T_270 ((u16)0x4640) // 0100 0110 0100 0000 the T tetromino with a 270° rotation
#define SHAPE_L ((shape)0x4460) // 0100 0100 0110 0000 the L tetromino with no rotation
#define SHAPE_L_90 ((shape)0x0E80) // 0000 1110 1000 0000 the L tetromino with a 90° rotation
#define SHAPE_L_180 ((shape)0xC440) // 1100 0100 0100 0000 the L tetromino with a 180° rotation
#define SHAPE_L_270 ((shape)0x2E00) // 0010 1110 0000 0000 the L tetromino with a 270° rotation
#define SHAPE_L ((u16)0x4460) // 0100 0100 0110 0000 the L tetromino with no rotation
#define SHAPE_L_90 ((u16)0x0E80) // 0000 1110 1000 0000 the L tetromino with a 90° rotation
#define SHAPE_L_180 ((u16)0xC440) // 1100 0100 0100 0000 the L tetromino with a 180° rotation
#define SHAPE_L_270 ((u16)0x2E00) // 0010 1110 0000 0000 the L tetromino with a 270° rotation
#define SHAPE_J ((shape)0x44C0) // 0100 0100 1100 0000 the J tetromino with no rotation
#define SHAPE_J_90 ((shape)0x8E00) // 1000 1110 0000 0000 the J tetromino with a 90° rotation
#define SHAPE_J_180 ((shape)0x6440) // 0110 0100 0100 0000 the J tetromino with a 180° rotation
#define SHAPE_J_270 ((shape)0x0E20) // 0000 1110 0010 0000 the J tetromino with a 270° rotation
#define SHAPE_J ((u16)0x44C0) // 0100 0100 1100 0000 the J tetromino with no rotation
#define SHAPE_J_90 ((u16)0x8E00) // 1000 1110 0000 0000 the J tetromino with a 90° rotation
#define SHAPE_J_180 ((u16)0x6440) // 0110 0100 0100 0000 the J tetromino with a 180° rotation
#define SHAPE_J_270 ((u16)0x0E20) // 0000 1110 0010 0000 the J tetromino with a 270° rotation
shape shape_from_id(shape_id const id) {
static shape const shapes[TETROMINO_COUNT][4] = {
u16 shape_from_id(u8 id) {
static u16 const shapes[TETROMINO_COUNT][4] = {
// 0° 90° 180° 170°
{SHAPE_O, SHAPE_O, SHAPE_O, SHAPE_O },
{SHAPE_I, SHAPE_I_90, SHAPE_I_180, SHAPE_I_270},
@@ -47,11 +48,11 @@ shape shape_from_id(shape_id const id) {
{SHAPE_J, SHAPE_J_90, SHAPE_J_180, SHAPE_J_270},
};
// first 3 bits is the shape type, the rest is rotation data
// first 3 least significant bits is the shape type, the rest is rotation data
return shapes[id & 7][id >> 3];
}
colour8 colour_from_id(shape_id const id) {
colour8 colour_from_id(u8 id) {
switch (id & 7) {
case TETROMINO_O: return COLOUR8_YELLOW;
case TETROMINO_I: return COLOUR8_CYAN;