From 392dc964d94c211ac6af98e02c56371d6bb8a3cd Mon Sep 17 00:00:00 2001 From: Rosyid Haryadi Date: Tue, 2 Jan 2024 22:21:38 +0700 Subject: refactor --- src/main.c | 48 +++--------------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 77e95bc..992982f 100644 --- a/src/main.c +++ b/src/main.c @@ -2,28 +2,10 @@ #include "raylib.h" #include "raymath.h" - -typedef struct Config { - int SCREEN_WIDTH; - int SCREEN_HEIGHT; - int ORIGIN_X; - int ORIGIN_Y; - char TITLE[20]; - int TARGET_FPS; -} Config; -Config config = { - 800, - 600, - 800 / 2, - 600 / 2, - "Gw bikin apaan sih", - 60 -}; +#include "utilities.h" +#include "config.h" void doInitialization(); -Vector2 toCenter(Vector2 vector); -Vector2 toTopLeft(Vector2 vector); -Vector2 angle2HeadingVector(float angle); typedef struct Object { Vector2 pos; @@ -64,30 +46,6 @@ void doInitialization() { SetTargetFPS(config.TARGET_FPS); } -Vector2 toCenter(Vector2 vector) { - // Used only for drawing, any other calculation using raylib style coordinate (0, 0) top left. x = left-right, y = top-bottom - return (Vector2) { - vector.x + (float)config.ORIGIN_X, - (-1 * vector.y) + (float)config.ORIGIN_Y - }; -} - -Vector2 toTopLeft(Vector2 vector) { - return (Vector2) { - vector.x - (float)config.ORIGIN_X, - (-1 * vector.y) - (float)config.ORIGIN_Y - }; -} - -Vector2 angle2HeadingVector(float angle) { - // angle in degree - angle = angle * (float)M_PI / 180; - return (Vector2) { - cosf(angle), - sinf(angle) - }; -} - void doUpdate(Object *object) { float dt = GetFrameTime(); config.SCREEN_WIDTH = GetScreenWidth(); @@ -106,7 +64,7 @@ void doUpdate(Object *object) { if (nextPos.y + object->radius > (float)config.SCREEN_HEIGHT / 2) nextPos.y = ((float)config.SCREEN_HEIGHT / 2) - object->radius; object->pos = nextPos; } else { - object->headingAngle = fmodf(object->headingAngle + 15, 360.0f); +// object->headingAngle = fmodf(object->headingAngle + 15, 360.0f); object->headingAngle = (float)rand()/(float)(RAND_MAX/360); object->distanceTraveled = 0; } -- cgit v1.2.3-70-g09d2