Cryz/arduino_pong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start thinking about MENU status

Browse Source
This commit is contained in:
andrea
2026-03-19 22:23:29 +01:00
parent 6ea443d92a
commit 4bb6d6d6ee
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arduino_pong.ino
View File

@@ -26,6 +26,7 @@ uint8_t hits= 0;
long exec_t2= millis(); long exec_t2= millis();
enum game_statuses : uint8_t { enum game_statuses : uint8_t {
MENU,
TIMER, TIMER,
RUN, RUN,
SCORE, SCORE,
@@ -38,7 +39,7 @@ Ball ball(4, 6);
// HumanPaddle p1(1, P1_BTN_UP, P1_BTN_BOTTOM); // HumanPaddle p1(1, P1_BTN_UP, P1_BTN_BOTTOM);
// HumanPaddle p2(4, P2_BTN_UP, P2_BTN_BOTTOM); // HumanPaddle p2(4, P2_BTN_UP, P2_BTN_BOTTOM);
BotPaddle p1(1, 0, 2); BotPaddle p1(1, 0, 2);
BotPaddle p2(4, MATRIX_WIDTH-1, 2); BotPaddle p2(4, MATRIX_WIDTH-1, 1);
Engine engine(p1, p2, ball, INITIAL_BALL_DELAY); Engine engine(p1, p2, ball, INITIAL_BALL_DELAY);
Renderer renderer(p1, p2, ball, frame, matrix); Renderer renderer(p1, p2, ball, frame, matrix);
@@ -60,6 +61,14 @@ void loop() {
switch (game_status) { switch (game_status) {
case MENU:
// show menu on the matrix
// 1. P vs P
// 2. P vs CPU
// 3. CPU vs CPU
// slideshow menu
break;
case TIMER: case TIMER:
for (int i = START_TIMER; i >= 0; i--) { for (int i = START_TIMER; i >= 0; i--) {
renderer.render_timer(i); renderer.render_timer(i);
@@ -71,8 +80,7 @@ void loop() {
break; break;
case RUN: case RUN:
// need_refresh= check_paddle_movements(p1, p2); need_refresh= engine.control_players();
need_refresh= engine.control_players(exec_t2);
if (exec_t1 - exec_t2 > engine.ball_movement_delay()) { if (exec_t1 - exec_t2 > engine.ball_movement_delay()) {
engine.run(); engine.run();

22
src/engine.cpp
View File

@@ -60,29 +60,13 @@ void Engine::run() {
} }
} }
bool Engine::control_players(long exec_t2) { bool Engine::control_players() {
bool need_refresh= false; bool need_refresh= false;
if (_p1.is_human()) need_refresh |= _p1.check_pad_movement(); if (_p1.is_human()) need_refresh |= _p1.check_pad_movement();
else { else need_refresh |= _p1.check_pad_movement();
uint8_t ball_delay= this -> ball_movement_delay();
long exec_t1= millis();
uint8_t skill= _p1.get_skills();
if (exec_t1 - exec_t2 > ball_delay - (skill * 10)) {
need_refresh |= _p1.check_pad_movement(_ball);
}
}
if (_p2.is_human()) need_refresh |= _p2.check_pad_movement(); if (_p2.is_human()) need_refresh |= _p2.check_pad_movement();
else { else need_refresh |= _p2.check_pad_movement();
uint8_t ball_delay= this -> ball_movement_delay();
long exec_t1= millis();
uint8_t skill= _p1.get_skills();
if (exec_t1 - exec_t2 > ball_delay - (skill * 10)) {
need_refresh |= _p2.check_pad_movement(_ball);
}
}
return need_refresh; return need_refresh;
} }

2
src/engine.h
View File

@@ -26,7 +26,7 @@ class Engine {
: _p1(p_one), _p2(p_two), _ball(ball), _ball_mv_delay(ball_mv_delay) {} : _p1(p_one), _p2(p_two), _ball(ball), _ball_mv_delay(ball_mv_delay) {}
void run(); void run();
bool control_players(long exec_t2); bool control_players();
uint8_t ball_movement_delay(); uint8_t ball_movement_delay();
EngineEvents get_event(); EngineEvents get_event();
void restart_ball(); void restart_ball();