Skip to content

Polishing: Let ball go in an angle #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tolik518 merged 5 commits into from
Apr 28, 2026
Merged

Polishing: Let ball go in an angle #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f28c4e7
let the ball go in an angle
tolik518 Apr 28, 2026
ddaee60
ball should not start in the center
tolik518 Apr 28, 2026
eef5e8f
press A to start the game
tolik518 Apr 28, 2026
8cd90f1
added pause and fixed tunneling bug
tolik518 Apr 28, 2026
ff4c447
speed up ball after X hits
tolik518 Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 79 additions & 108 deletions code/source/ball.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <../build/soundbank.h>
#include <../build/soundbank_bin.h>

// Collisions of the wall and the walls
// Collisions of the ball and the walls
#define BALL_COLLISION_TOP self->x - (self->h / 2) <= 0
#define BALL_COLLISION_LEFT self->y - (self->h / 2) <= 0
#define BALL_COLLISION_RIGHT self->y + (self->h / 2) >= SCREEN_WIDTH - 1
Expand Down Expand Up @@ -43,122 +43,93 @@ bool checkCollisionWithPaddle(const Ball *self, Paddle *player)
return true;
}

//return 1 = left player lost
//return 2 = right player lost
static int moveTopLeft(Ball *self, Paddle *player)
{
self->x -= self->speedX;
self->y -= self->speedY;

if (BALL_COLLISION_TOP) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_BOTTOMLEFT;
return 0;
}

if (checkCollisionWithPaddle(self, player)) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_TOPRIGHT;
return 0;
}

if (BALL_COLLISION_LEFT) {
return 1;
}

return 0;
}

static int moveBottomLeft(Ball *self, Paddle *player)
{
self->x += self->speedX;
self->y -= self->speedY;

if (BALL_COLLISION_BOTTOM) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_TOPLEFT;
return 0;
}

if (checkCollisionWithPaddle(self, player)) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_BOTTOMRIGHT;
return 0;
}

if (BALL_COLLISION_LEFT) {
return 1;
}

return 0;
}

static int moveBottomRight(Ball *self, Paddle *player)
// Adjust vertical speed (dx) based on where the ball hit the paddle.
// Hitting the center returns the ball nearly horizontal;
// hitting the edges gives a steeper angle.
static void _adjustBounceAngle(Ball *self, Paddle *paddle)
{
self->x += self->speedX;
self->y += self->speedY;

if (BALL_COLLISION_BOTTOM) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_TOPRIGHT;
return 0;
}

if (checkCollisionWithPaddle(self, player)) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_BOTTOMLEFT;
return 0;
}
int ball_center = self->x;
int paddle_center = paddle->x + paddle->h / 2;
int offset = ball_center - paddle_center;
int half_h = paddle->h / 2;

if (BALL_COLLISION_RIGHT) {
return 2;
}
return 0;
self->dx = offset * BALL_MAX_DX / half_h;
}

static int moveTopRight(Ball *self, Paddle *player)
// After a paddle hit, increment hit counter and speed up if interval reached
static void _maybeSpeedUp(Ball *self)
{
self->x -= self->speedX;
self->y += self->speedY;

if (BALL_COLLISION_TOP) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_BOTTOMRIGHT;
return 0;
}

if (checkCollisionWithPaddle(self, player)) {
mmEffect( SFX_CLICK );
self->dir = BALL_MOVES_TOPLEFT;
return 0;
}

if (BALL_COLLISION_RIGHT) {
return 2;
}

return 0;
self->hits++;
if (self->hits % BALL_SPEEDUP_INTERVAL == 0) {
int sign = (self->dy > 0) ? 1 : -1;
int speed = (self->dy > 0) ? self->dy : -self->dy;
if (speed < BALL_MAX_DY) {
self->dy = sign * (speed + 1);
}
}
}

//game->ball, game->p1, game->p2
//int Ball_moveAndCollide(Ball *self, Paddle *p1, Paddle *p2)
//return 1 = left player lost
//return 2 = right player lost
int Ball_moveAndCollide(Game *game)
{
Ball *self = game->ball;
switch (game->ball->dir)
{
case BALL_MOVES_TOPLEFT:
return moveTopLeft(self, game->p1);

case BALL_MOVES_BOTTOMLEFT:
return moveBottomLeft(self, game->p1);

case BALL_MOVES_BOTTOMRIGHT:
return moveBottomRight(self, game->p2);

case BALL_MOVES_TOPRIGHT:
return moveTopRight(self, game->p2);
}
Ball *self = game->ball;
int prev_y = self->y;

// Apply velocity
self->x += self->dx;
self->y += self->dy;

// Top/bottom wall bounce (flip vertical component)
if (BALL_COLLISION_TOP) {
self->x = self->h / 2;
self->dx = -self->dx;
mmEffect(SFX_CLICK);
} else if (BALL_COLLISION_BOTTOM) {
self->x = SCREEN_HEIGHT - 1 - self->h / 2;
self->dx = -self->dx;
mmEffect(SFX_CLICK);
}

// Paddle collision / scoring (horizontal axis)
// Use swept check: did the ball's leading edge cross the paddle front this frame?
if (self->dy < 0) {
// Moving left -> check P1 paddle
int front = game->p1->y + game->p1->w;
int ball_left_prev = prev_y - (self->h / 2);
int ball_left_now = BALL_POSITION_LEFT;
// Ball crossed (or touched) the paddle's right edge this frame
if (ball_left_now <= front && ball_left_prev >= front &&
BALL_POSITION_BOTTOM > game->p1->x &&
BALL_POSITION_TOP < (game->p1->x + game->p1->h)) {
// Snap ball to paddle surface to prevent overlap
self->y = front + self->h / 2;
_adjustBounceAngle(self, game->p1);
self->dy = -self->dy;
_maybeSpeedUp(self);
mmEffect(SFX_CLICK);
} else if (BALL_COLLISION_LEFT) {
return 1;
}
} else {
// Moving right -> check P2 paddle
int front = game->p2->y;
int ball_right_prev = prev_y + (self->h / 2);
int ball_right_now = BALL_POSITION_RIGHT;
// Ball crossed (or touched) the paddle's left edge this frame
if (ball_right_now >= front && ball_right_prev <= front &&
BALL_POSITION_BOTTOM > (game->p2->x) &&
BALL_POSITION_TOP < (game->p2->x + game->p2->h)) {
// Snap ball to paddle surface to prevent overlap
self->y = front - self->h / 2;
_adjustBounceAngle(self, game->p2);
self->dy = -self->dy;
_maybeSpeedUp(self);
mmEffect(SFX_CLICK);
} else if (BALL_COLLISION_RIGHT) {
return 2;
}
}

return 0;
}
23 changes: 8 additions & 15 deletions code/source/ball.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
#include <../include/tonc.h>
typedef struct game Game;

/*********-TOP-**********\
*.1....................4.*
*........................*
LEFT.................RIGHT
*........................*
*.2....................3.*
\********-BOTTOM-********/
// Maximum vertical speed the ball can reach after a paddle bounce
#define BALL_MAX_DX 3

// Directions the ball can go
#define BALL_MOVES_TOPLEFT 0
#define BALL_MOVES_BOTTOMLEFT 1
#define BALL_MOVES_BOTTOMRIGHT 2
#define BALL_MOVES_TOPRIGHT 3
// Ball speeds up every BALL_SPEEDUP_INTERVAL paddle hits
#define BALL_SPEEDUP_INTERVAL 4
#define BALL_MAX_DY 4

typedef struct ball
{
Expand All @@ -25,10 +18,10 @@ typedef struct ball
int prev_x; // crucial for cleaing up previous pixels
int prev_y;
int h; //height
int dir; //direction 0 to 3
int dx; // vertical velocity (positive = down, negative = up)
int dy; // horizontal velocity (positive = right, negative = left)
int hits; // paddle hit counter for speed-up
COLOR color;
int speedX;
int speedY;
} Ball;

int Ball_moveAndCollide(Game *game);
Expand Down
16 changes: 13 additions & 3 deletions code/source/game.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,27 @@ void Game_setPauseText()
(void) initializeScoreWriter();

//show text centered on the screen
tte_set_pos((SCREEN_WIDTH/2)-30, (SCREEN_HEIGHT/2)-6);
tte_erase_rect((SCREEN_WIDTH/2)-30, (SCREEN_HEIGHT/2)-5, (SCREEN_WIDTH/2)+30, (SCREEN_HEIGHT/2)+6);
tte_set_pos((SCREEN_WIDTH/2)-24, (SCREEN_HEIGHT/2)-6);
tte_erase_rect((SCREEN_WIDTH/2)-24, (SCREEN_HEIGHT/2)-5, (SCREEN_WIDTH/2)+24, (SCREEN_HEIGHT/2)+6);

tte_write("PRESS START");
tte_write("PRESS A");
}

void Game_removePauseText()
{
tte_erase_rect((SCREEN_WIDTH/2)-40, (SCREEN_HEIGHT/2)-5, (SCREEN_WIDTH/2)+40, (SCREEN_HEIGHT/2)+6);
}

void Game_showPausedText()
{
(void) initializeScoreWriter();

tte_set_pos((SCREEN_WIDTH/2)-22, (SCREEN_HEIGHT/2)-6);
tte_erase_rect((SCREEN_WIDTH/2)-22, (SCREEN_HEIGHT/2)-5, (SCREEN_WIDTH/2)+22, (SCREEN_HEIGHT/2)+6);

tte_write("PAUSED");
}

void Game_gameLoop(LinkConnection *conn)
{
int _frame = 0;
Expand Down
1 change: 1 addition & 0 deletions code/source/game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ void Game_renderBall(Ball *ball);
void Game_updateScore(const Paddle *p1, const Paddle *p2);
void Game_removePauseText();
void Game_setPauseText();
void Game_showPausedText();


#endif
Loading
Loading