Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-12-16 00:04:04 -05:00
Code Issues Projects Releases Packages Wiki Activity

Dynamic screen for PortaRF Tetris (#2803)

Browse source 
* Dynamic screen for PortaRF
* Format code
This commit is contained in:
RocketGod 2025-10-04 10:19:54 -07:00 • committed by GitHub
parent 371b6b5079
commit 41dd0c4674
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

73
firmware/application/external/tetris/ui_tetris.cpp vendored
View file

@ -35,11 +35,17 @@ bool gameStarted = false;
unsigned char nextFigure = 1; unsigned char nextFigure = 1;
short board[20][10] = {0}; short board[20][10] = {0};
const int colors[8] = {White, Blue, Yellow, Purple, Green, Red, Maroon, Orange}; const int colors[8] = {White, Blue, Yellow, Purple, Green, Red, Maroon, Orange};
const short DIMENSION = 16; short DIMENSION = 16;
const short DIMENSION_NEXT = 12; short DIMENSION_NEXT = 12;
short figuresX[7][4] = {{0, 0, 0, 0}, {0, 0, 1, 1}, {0, 1, 1, 1}, {1, 1, 0, 0}, {0, 1, 0, 1}, {1, 1, 1, 0}, {1, 1, 1, 0}}; short figuresX[7][4] = {{0, 0, 0, 0}, {0, 0, 1, 1}, {0, 1, 1, 1}, {1, 1, 0, 0}, {0, 1, 0, 1}, {1, 1, 1, 0}, {1, 1, 1, 0}};
short figuresY[7][4] = {{0, 1, 2, 3}, {1, 0, 0, 1}, {1, 1, 2, 0}, {0, 1, 1, 2}, {0, 1, 1, 2}, {2, 1, 0, 0}, {0, 1, 2, 2}}; short figuresY[7][4] = {{0, 1, 2, 3}, {1, 0, 0, 1}, {1, 1, 2, 0}, {0, 1, 1, 2}, {0, 1, 1, 2}, {2, 1, 0, 0}, {0, 1, 2, 2}};
// Dynamic screen values
int SCREEN_WIDTH = 240;
int SCREEN_HEIGHT = 320;
int BOARD_RIGHT = 162;
int INFO_LEFT = 165;
const Color pp_colors[] = { const Color pp_colors[] = {
Color::white(), Color::white(),
Color::blue(), Color::blue(),
@ -138,19 +144,44 @@ unsigned int GenerateRandomSeed() {
} }
void Init() { void Init() {
// Initialize dynamic screen dimensions
SCREEN_WIDTH = ui::screen_width;
SCREEN_HEIGHT = ui::screen_height;
// For original screen size, use original dimensions
if (SCREEN_WIDTH == 240 && SCREEN_HEIGHT == 320) {
DIMENSION = 16;
DIMENSION_NEXT = 12;
BOARD_RIGHT = 162;
INFO_LEFT = 165;
} else {
// Calculate dimensions for other screen sizes
int available_width = (SCREEN_WIDTH * 3 / 4);
int available_height = SCREEN_HEIGHT - 10;
int max_dimension_width = available_width / 10;
int max_dimension_height = available_height / 20;
DIMENSION = std::min(max_dimension_width, max_dimension_height);
if (DIMENSION < 8) DIMENSION = 8;
DIMENSION_NEXT = DIMENSION * 3 / 4;
BOARD_RIGHT = 10 * DIMENSION + 2;
INFO_LEFT = BOARD_RIGHT + 3;
}
} }
void ShowScore() { void ShowScore() {
fillrect(165, 10, 235, 60, Black); fillrect(INFO_LEFT, 10, SCREEN_WIDTH - 5, 60, Black);
rect(165, 10, 235, 60, White); rect(INFO_LEFT, 10, SCREEN_WIDTH - 5, 60, White);
locate(200, 35); locate((INFO_LEFT + SCREEN_WIDTH - 5) / 2 - 10, 35);
printf("%d", score); printf("%d", score);
} }
void ShowNextFigure() { void ShowNextFigure() {
fillrect(165, 70, 235, 130, Black); fillrect(INFO_LEFT, 70, SCREEN_WIDTH - 5, 130, Black);
rect(165, 70, 235, 130, White); rect(INFO_LEFT, 70, SCREEN_WIDTH - 5, 130, White);
int upperLeftX = 176, upperLeftY = 83; int upperLeftX = INFO_LEFT + 11, upperLeftY = 83;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int x = upperLeftX + DIMENSION_NEXT * figuresY[nextFigure - 1][i], y = upperLeftY + DIMENSION_NEXT * figuresX[nextFigure - 1][i]; int x = upperLeftX + DIMENSION_NEXT * figuresY[nextFigure - 1][i], y = upperLeftY + DIMENSION_NEXT * figuresX[nextFigure - 1][i];
fillrect(x, y, x + DIMENSION_NEXT, y + DIMENSION_NEXT, colors[nextFigure]); fillrect(x, y, x + DIMENSION_NEXT, y + DIMENSION_NEXT, colors[nextFigure]);
@ -159,20 +190,20 @@ void ShowNextFigure() {
} }
void DrawCursor(int color, unsigned char lev) { void DrawCursor(int color, unsigned char lev) {
fillrect(60, lev * 70 + 50, 72, lev * 70 + 50 + 12, color); fillrect(UI_POS_X_CENTER(10) - 20, lev * 70 + 50, UI_POS_X_CENTER(10) - 8, lev * 70 + 50 + 12, color);
} }
void ShowLevelMenu() { void ShowLevelMenu() {
cls(); cls();
background(Black); background(Black);
foreground(White); foreground(White);
locate(80, 50); locate(UI_POS_X_CENTER(8), 50);
printf("LEVEL 1"); printf("LEVEL 1");
locate(80, 120); locate(UI_POS_X_CENTER(8), 120);
printf("LEVEL 2"); printf("LEVEL 2");
locate(80, 190); locate(UI_POS_X_CENTER(8), 190);
printf("LEVEL 3"); printf("LEVEL 3");
locate(80, 260); locate(UI_POS_X_CENTER(8), 260);
printf("LEVEL 4"); printf("LEVEL 4");
DrawCursor(White, level); DrawCursor(White, level);
} }
@ -209,9 +240,9 @@ void StartGame() {
cls(); cls();
background(Black); background(Black);
foreground(White); foreground(White);
fillrect(0, 0, 162, screen_height, Black); fillrect(0, 0, BOARD_RIGHT, SCREEN_HEIGHT, Black);
rect(162, 0, 164, screen_height, White); rect(BOARD_RIGHT, 0, BOARD_RIGHT + 2, SCREEN_HEIGHT, White);
fillrect(164, 0, screen_width, screen_height, Black); fillrect(BOARD_RIGHT + 2, 0, SCREEN_WIDTH, SCREEN_HEIGHT, Black);
ShowScore(); ShowScore();
ShowNextFigure(); ShowNextFigure();
} }
@ -483,7 +514,7 @@ void UpdateBoard() {
board[i - numberOfLines][j] = 0; board[i - numberOfLines][j] = 0;
} }
} }
fillrect(0, 0, 162, screen_height, Black); fillrect(0, 0, BOARD_RIGHT, SCREEN_HEIGHT, Black);
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
for (int j = 0; j < 10; j++) { for (int j = 0; j < 10; j++) {
if (board[i][j] != 0) { if (board[i][j] != 0) {
@ -509,9 +540,9 @@ bool IsOver() {
void ShowGameOverScreen() { void ShowGameOverScreen() {
background(Black); background(Black);
foreground(White); foreground(White);
locate(60, 120); locate(UI_POS_X_CENTER(10), 120);
printf("GAME OVER"); printf("GAME OVER");
locate(40, 150); locate(UI_POS_X_CENTER(21), 150);
printf("YOUR SCORE IS %d", score); printf("YOUR SCORE IS %d", score);
wait(5); wait(5);
} }
@ -565,11 +596,11 @@ void OnTasterPressed() {
void pause_game() { void pause_game() {
game.detach(); game.detach();
joystick.detach(); joystick.detach();
locate(180, 200); locate((INFO_LEFT + SCREEN_WIDTH) / 2 - 25, 200);
printf("PAUSED"); printf("PAUSED");
while ((get_switches_state().to_ulong() & 0x10) == 0) while ((get_switches_state().to_ulong() & 0x10) == 0)
; ;
printf(" "); fillrect(INFO_LEFT, 195, SCREEN_WIDTH, 210, Black);
joystick.attach(&ReadJoystickForFigure, 0.3); joystick.attach(&ReadJoystickForFigure, 0.3);
game.attach(&PlayGame, delays[level]); game.attach(&PlayGame, delays[level]);
} }

12
firmware/application/external/tetris/ui_tetris.hpp vendored
View file

@ -86,11 +86,17 @@ extern bool gameStarted;
extern unsigned char nextFigure; extern unsigned char nextFigure;
extern short board[20][10]; extern short board[20][10];
extern const int colors[8]; extern const int colors[8];
extern const short DIMENSION; extern short DIMENSION;
extern const short DIMENSION_NEXT; extern short DIMENSION_NEXT;
extern short figuresX[7][4]; extern short figuresX[7][4];
extern short figuresY[7][4]; extern short figuresY[7][4];
// Dynamic screen values
extern int SCREEN_WIDTH;
extern int SCREEN_HEIGHT;
extern int BOARD_RIGHT;
extern int INFO_LEFT;
unsigned int GenerateRandomSeed(); unsigned int GenerateRandomSeed();
void Init(); void Init();
void ShowScore(); void ShowScore();
@ -148,7 +154,7 @@ class TetrisView : public View {
NavigationView& nav_; NavigationView& nav_;
Button dummy{ Button dummy{
{screen_width, 0, 0, 0}, {240, 0, 0, 0},
""}; ""};
MessageHandlerRegistration message_handler_frame_sync{ MessageHandlerRegistration message_handler_frame_sync{