From a17dcfdcba9f7da5a91c554eef88cea73d6598b0 Mon Sep 17 00:00:00 2001 From: Jacob McDonnell Date: Sun, 14 Jul 2024 13:04:54 -0400 Subject: Redid the Cmake Config and fell back to C17 --- main.c | 102 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 28ed301..09a14ab 100644 --- a/main.c +++ b/main.c @@ -6,111 +6,111 @@ static uint8_t delay = 5; static uint8_t rightScore = 0; static uint8_t leftScore = 0; -void Delay ( const uint8_t seconds ) { +void Delay(const uint8_t seconds) { const clock_t start = clock(); - while ( clock() < start + seconds * 1000 ) + while (clock() < start + seconds * 1000) ; } -static inline void Update ( const paddle_t rightPaddle, const paddle_t leftPaddle, const ball_t ball ) { - SDL_FillRect( gScreenSurface, NULL, SDL_MapRGB( gScreenSurface->format, 0x00, 0x00, 0x00 ) ); - Draw ( rightPaddle, rightPaddleSurface ); - Draw ( leftPaddle, leftPaddleSurface ); - Draw( ball, ballSurface ); - SDL_UpdateWindowSurface( gWindow ); +static inline void Update(const paddle_t rightPaddle, const paddle_t leftPaddle, const ball_t ball) { + SDL_FillRect(gScreenSurface, NULL, SDL_MapRGB(gScreenSurface->format, 0x00, 0x00, 0x00)); + Draw (rightPaddle, rightPaddleSurface); + Draw (leftPaddle, leftPaddleSurface); + Draw(ball, ballSurface); + SDL_UpdateWindowSurface(gWindow); } -int main ( void ) { - paddle_t leftPaddle = { { 0, 0 }, { 0, 0 }, PADDLE_WIDTH, PADDLE_HEIGHT }, - rightPaddle = { { SCREEN_WIDTH - 16, 0 }, { 0, 0 }, PADDLE_WIDTH, PADDLE_HEIGHT }; - ball_t ball = { { SCREEN_WIDTH >> 1, SCREEN_HEIGHT >> 1 }, { 1, 1 }, BALL_WIDTH, BALL_HEIGHT }; +int main(void) { + paddle_t leftPaddle = {{0, 0}, {0, 0}, PADDLE_WIDTH, PADDLE_HEIGHT}, + rightPaddle = {{SCREEN_WIDTH - 16, 0}, {0, 0}, PADDLE_WIDTH, PADDLE_HEIGHT}; + ball_t ball = {{SCREEN_WIDTH >> 1, SCREEN_HEIGHT >> 1}, {1, 1}, BALL_WIDTH, BALL_HEIGHT}; bool quit = false; SDL_Event e; uint8_t volley = 0; - if ( !InitScreen() ) { - printf( "Failed to initalize!\n" ); + if (!InitScreen()) { + printf("Failed to initalize!\n"); return -1; } - Draw( ball, ballSurface ); - SDL_UpdateWindowSurface( gWindow ); + Draw(ball, ballSurface); + SDL_UpdateWindowSurface(gWindow); Draw( leftPaddle, leftPaddleSurface); - SDL_UpdateWindowSurface( gWindow ); - Draw( rightPaddle, rightPaddleSurface ); - SDL_UpdateWindowSurface( gWindow ); + SDL_UpdateWindowSurface(gWindow); + Draw(rightPaddle, rightPaddleSurface); + SDL_UpdateWindowSurface(gWindow); - while ( quit == false ) { - UpdatePosition( &ball.position, ball.velocity ); - if ( CheckGroundCollision( ball ) || CheckCeilingCollision( ball ) ) { + while (quit == false) { + UpdatePosition(&ball.position, ball.velocity); + if (CheckGroundCollision( ball ) || CheckCeilingCollision(ball)) { ball.velocity.y *= -1; - } else if ( CheckLeftWallCollision( ball ) ) { + } else if (CheckLeftWallCollision(ball)) { rightScore++; volley = 0; delay = 5; - printf( "Left: %3d\tRight: %3d\n", leftScore, rightScore ); - Reset( &ball ); - } else if ( CheckRightWallCollision( ball ) ) { + printf("Left: %3d\tRight: %3d\n", leftScore, rightScore); + Reset(&ball); + } else if (CheckRightWallCollision(ball)) { volley = 0; leftScore++; delay = 5; - printf( "Left: %3d\tRight: %3d\n", leftScore, rightScore ); - Reset( &ball ); - }else if ( CheckMoveableCollision( leftPaddle, ball ) || CheckMoveableCollision( ball, rightPaddle ) ) { + printf("Left: %3d\tRight: %3d\n", leftScore, rightScore); + Reset(&ball); + }else if (CheckMoveableCollision( leftPaddle, ball ) || CheckMoveableCollision(ball, rightPaddle)) { volley++; - int xSign = ( ball.velocity.x < 0 ) ? -1 : 1; - int ySign = ( ball.velocity.y < 0 ) ? -1 : 1; - int increase = ( volley % 4 == 0 ) ? 1 : 0; - ball.velocity.x = -1 * ( xSign * ( abs( ball.velocity.x ) + increase ) ); + int xSign = (ball.velocity.x < 0) ? -1 : 1; + int ySign = (ball.velocity.y < 0) ? -1 : 1; + int increase = (volley % 4 == 0) ? 1 : 0; + ball.velocity.x = -1 * ( xSign * (abs(ball.velocity.x ) + increase)); delay += increase << 2; - ball.velocity.y = ySign * ( abs( ball.velocity.x ) + increase ); + ball.velocity.y = ySign * (abs(ball.velocity.x) + increase); } - while ( SDL_PollEvent( &e ) != 0 ) { - if ( e.type == SDL_QUIT ) { + while (SDL_PollEvent(&e) != 0) { + if (e.type == SDL_QUIT) { quit = true; - } else if ( e.type == SDL_KEYDOWN ) { - switch ( e.key.keysym.sym ) { + } else if (e.type == SDL_KEYDOWN) { + switch (e.key.keysym.sym) { case SDLK_UP: - if ( CheckCeilingCollision( rightPaddle ) ) { + if (CheckCeilingCollision(rightPaddle)) { rightPaddle.velocity.y = 0; rightPaddle.position.y = 0; } else { rightPaddle.velocity.y = -10; - UpdatePosition( &rightPaddle.position, rightPaddle.velocity ); + UpdatePosition(&rightPaddle.position, rightPaddle.velocity); } break; case SDLK_DOWN: - if ( CheckGroundCollision( rightPaddle ) ) { + if (CheckGroundCollision(rightPaddle)) { rightPaddle.velocity.y = 0; rightPaddle.position.y = SCREEN_HEIGHT - rightPaddle.height; } else { rightPaddle.velocity.y = 10; - UpdatePosition( &rightPaddle.position, rightPaddle.velocity ); + UpdatePosition(&rightPaddle.position, rightPaddle.velocity); } break; case SDLK_w: - if ( CheckCeilingCollision( leftPaddle ) ) { + if (CheckCeilingCollision(leftPaddle)) { leftPaddle.velocity.y = 0; leftPaddle.position.y = 0; } else { leftPaddle.velocity.y = -10; - UpdatePosition( &leftPaddle.position, leftPaddle.velocity ); + UpdatePosition(&leftPaddle.position, leftPaddle.velocity); } break; case SDLK_s: - if ( CheckGroundCollision( leftPaddle ) ) { + if (CheckGroundCollision(leftPaddle)) { leftPaddle.velocity.y = 0; leftPaddle.position.y = SCREEN_HEIGHT - leftPaddle.height; } else { leftPaddle.velocity.y = 10; - UpdatePosition( &leftPaddle.position, leftPaddle.velocity ); + UpdatePosition(&leftPaddle.position, leftPaddle.velocity); } break; default: break; } - } else if ( e.type == SDL_KEYUP ) { - switch ( e.key.keysym.sym ) { + } else if (e.type == SDL_KEYUP) { + switch (e.key.keysym.sym) { case SDLK_UP: case SDLK_DOWN: rightPaddle.velocity.y = 0; @@ -123,10 +123,10 @@ int main ( void ) { break; } } - Update( rightPaddle, leftPaddle, ball ); + Update(rightPaddle, leftPaddle, ball); } - Update( rightPaddle, leftPaddle, ball ); - Delay( delay ); + Update(rightPaddle, leftPaddle, ball); + Delay(delay); } Close(); return 0; -- cgit v1.2.3