diff --git a/CMakeLists.txt b/CMakeLists.txt index f57ec57..8c0070f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,10 @@ target_link_libraries(${PROJECT_NAME} raylib ) -target_compile_options(${PROJECT_NAME} - PRIVATE - -Wall - -Wextra - -Wpedantic +target_compile_options(${PROJECT_NAME} PRIVATE + -Wall + -Wextra + -Wpedantic + $<$:-ggdb -O0> + $<$:-O3> ) diff --git a/config.fphy b/config.fphy new file mode 100644 index 0000000..bb8fd0b --- /dev/null +++ b/config.fphy @@ -0,0 +1,38 @@ +mass(EARTH_MASS), radius(km), {x(UA), y(UA)}, {vx(km/s), vy(km/s)}, draw_radius(km), charge(C), name +330432.0, 696340.0, {0, 0}, {0, 0}, 696340, 0, Sun +0.055, 2439.7, {0.387, 0}, {0, -38.86}, 80, 0, Mercury +0.815, 6051.8, {0.723, 0}, {0, -34.79}, 190, 0, Venus +1.0, 6371.0, {1.0, 0}, {0, -29.29}, 200, 0, Earth +0.107, 3389.5, {1.524, 0}, {0, -21.97}, 106, 0, Mars +317.83, 69911.0, {5.203, 0}, {0, -12.43}, 400, 0, Jupiter +95.159, 58232.0, {9.582, 0}, {0, -9.11}, 300, 0, Saturn +14.536, 25362.0, {19.201, 0}, {0, -6.80}, 250, 0, Uranus +17.147, 24622.0, {30.069, 0}, {0, -5.43}, 250, 0, Neptune +0.012294, 1737.4, {1.002570, 0}, {0, -30.3083}, 60, 0, Moon +0.000000001775, 11.27, {1.524063, 0}, {0, -24.1070}, 20, 0, Phobos +0.000000000402, 6.20, {1.524157, 0}, {0, -23.3212}, 16, 0, Deimos +0.00000001674, 21.5, {5.203856, 0}, {0, -43.8901}, 15, 0, Metis +0.00000000335, 8.2, {5.203862, 0}, {0, -43.7679}, 12, 0, Adrastea +0.000001256, 83.5, {5.204213, 0}, {0, -38.8569}, 20, 0, Amalthea +0.000000134, 49.3, {5.204483, 0}, {0, -36.3239}, 18, 0, Thebe +0.014956, 1821.49, {5.205820, 0}, {0, -29.7605}, 65, 0, Io +0.008037, 1560.80, {5.207486, 0}, {0, -26.1695}, 60, 0, Europa +0.024813, 2631.20, {5.210155, 0}, {0, -23.3091}, 75, 0, Ganymede +0.018015, 2410.30, {5.215585, 0}, {0, -20.6330}, 70, 0, Callisto +0.000001591, 85.0, {5.279739, 0}, {0, -15.7520}, 20, 0, Himalia +0.000006346, 198.2, {9.583240, 0}, {0, -23.4089}, 24, 0, Mimas +0.000018084, 252.1, {9.583591, 0}, {0, -21.7338}, 28, 0, Enceladus +0.000103479, 531.1, {9.583970, 0}, {0, -20.4559}, 36, 0, Tethys +0.000184187, 561.4, {9.584523, 0}, {0, -19.1353}, 38, 0, Dione +0.000386792, 763.8, {9.585523, 0}, {0, -17.5935}, 44, 0, Rhea +0.0225294, 2575.0, {9.590168, 0}, {0, -14.6817}, 75, 0, Titan +0.000000938, 135.0, {9.592033, 0}, {0, -14.1371}, 20, 0, Hyperion +0.000303071, 734.5, {9.605803, 0}, {0, -12.3738}, 42, 0, Iapetus +0.000011051, 235.8, {19.201865, 0}, {0, -13.4917}, 25, 0, Miranda +0.000226047, 578.9, {19.202277, 0}, {0, -12.3074}, 38, 0, Ariel +0.000195908, 584.7, {19.202780, 0}, {0, -11.4645}, 38, 0, Umbriel +0.000589398, 788.9, {19.203914, 0}, {0, -10.4458}, 45, 0, Titania +0.000504002, 761.4, {19.204901, 0}, {0, -9.9511}, 44, 0, Oberon +0.000008372, 210.0, {30.069686, 0}, {0, -13.0522}, 25, 0, Proteus +0.00358327, 1353.4, {30.071271, 0}, {0, -1.0406}, 55, 0, Triton +0.000005023, 170.0, {30.105758, 0}, {0, -6.5434}, 23, 0, Nereid diff --git a/consts.h b/consts.h index 4cdbede..444691d 100644 --- a/consts.h +++ b/consts.h @@ -1,15 +1,16 @@ #ifndef CONSTS_H_ #define CONSTS_H_ -#define LOOP_TIMESTEP 1000000LL // Wall-clock nanoseconds between updates (1 kHz). -#define PHYSICS_TIMESTEP 100.0f // Simulated seconds per update. -#define WALL_COLLISIONS 0 // Enable for bounded collision tests. +#define LOOP_TIMESTEP \ + 1000000LL // Wall-clock nanoseconds between updates (1 kHz). +#define PHYSICS_TIMESTEP 10.0f // Simulated seconds per update. +#define WALL_COLLISIONS 0 // Enable for bounded collision tests. #define NEWTON_G 6.674e-11 #define EARTH_MASS 5.9722e24 // Kilograms per simulation mass unit. #define UA 149.6E6 -#define RT 6378.14 // Kilometers per simulation distance unit. -#define DISTANCE_UNIT_METERS (RT * 1000.0) -#define SIMULATION_G (NEWTON_G * EARTH_MASS / \ - (DISTANCE_UNIT_METERS * DISTANCE_UNIT_METERS * \ - DISTANCE_UNIT_METERS)) +#define EARTH_RADIUS 6378.14 // Kilometers per simulation distance unit. +#define DISTANCE_UNIT_METERS (EARTH_RADIUS * 1000.0) +#define SIMULATION_G \ + (NEWTON_G * EARTH_MASS / \ + (DISTANCE_UNIT_METERS * DISTANCE_UNIT_METERS * DISTANCE_UNIT_METERS)) #endif // CONSTS_H_ diff --git a/main.c b/main.c index ed98bc6..d0eea3a 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,5 @@ #define _POSIX_C_SOURCE 200809L + #include "consts.h" #include "gravity.h" #include "magnetism.h" @@ -11,6 +12,7 @@ #include #include #include +#include #include #include @@ -50,34 +52,48 @@ void *physics(void *args) { } } -int main(void) { +int main(int argc, char **argv) { + if (argc != 2) { + printf("No config provided\n"); + return EXIT_FAILURE; + } + FILE *file = fopen(argv[1], "r"); + if (file == NULL) { + printf("File not found"); + return EXIT_FAILURE; + } + int cam_lock = -1; float v_scale = 1; Vector2 canvas_offset = {0, 0}; pthread_t physics_thread; const char *welcome_text = "Welcome to Fucked Physics!"; universe_t universe = {0, NULL}; universe.bodies = malloc(1024 * sizeof(mass_body_t)); - universe.num_bodies = 7; + universe.num_bodies = 0; + char line[1024]; + fgets(line, 1024, file); + while (fgets(line, 1024, file)) { + printf("%s", line); + float mass, radius, x, y, vx, vy, draw_radius, charge; + char name[32]; + sscanf(line, "%f, %f, {%f, %f}, {%f, %f}, %f, %f, %31s", &mass, &radius, &x, + &y, &vx, &vy, &draw_radius, &charge, name); + + universe.bodies[universe.num_bodies] = (mass_body_t){ + .mass = mass, + .radius = radius / EARTH_RADIUS, + .position = (Vector2){x * UA / EARTH_RADIUS, y * UA / EARTH_RADIUS}, + .speed = (Vector2){vx / EARTH_RADIUS, vy / EARTH_RADIUS}, + .draw_radius = draw_radius / EARTH_RADIUS, + .charge = charge}; + + memcpy((void *)&universe.bodies[universe.num_bodies].name, (void *)&name, + 32); + universe.num_bodies++; + } + + fclose(file); - universe.bodies[0] = - (mass_body_t){330432.0f, 696340 / RT, {0, 0}, {0, 0}, 600, 0, "Sun"}; - universe.bodies[1] = (mass_body_t){ - 0.055f, 2439.7 / RT, {0.387 * UA / RT, 0}, {0, -38.86 / RT}, 80, - 0, "Mercury"}; - universe.bodies[2] = (mass_body_t){ - 0.815f, 6051.8 / RT, {0.723 * UA / RT, 0}, {0, -34.79 / RT}, 190, - 0, "Venus"}; - universe.bodies[3] = (mass_body_t){ - 1.0f, 1.0f, {1 * UA / RT, 0}, {0, -29.29 / RT}, 200, 0, "Earth"}; - universe.bodies[4] = (mass_body_t){ - 0.107f, 3389.5 / RT, {1.524 * UA / RT, 0}, {0, -21.97 / RT}, 106, - 0, "Mars"}; - universe.bodies[5] = (mass_body_t){ - 317.83f, 69911 / RT, {5.203 * UA / RT, 0}, {0, -12.43 / RT}, 400, - 0, "Jupiter"}; - universe.bodies[6] = (mass_body_t){ - 95.159f, 58232 / RT, {9.582 * UA / RT, 0}, {0, -9.11 / RT}, 300, - 0, "Saturn"}; SetConfigFlags(FLAG_WINDOW_RESIZABLE); InitWindow(800, 450, "Fucked Physics"); SetTargetFPS(120); @@ -90,18 +106,10 @@ int main(void) { key_pressed = GetKeyPressed(); switch (key_pressed) { case KEY_I: - if (v_scale >= 0.1) { - v_scale += 0.1; - } else { - v_scale += 0.01; - } + v_scale *= 1.26; break; case KEY_O: - if (v_scale > 0.1) { - v_scale -= 0.1; - } else if (v_scale > 0.01) { - v_scale -= 0.01; - } + v_scale /= 1.26; break; case KEY_LEFT: canvas_offset.x += 100; @@ -115,6 +123,38 @@ int main(void) { case KEY_DOWN: canvas_offset.y -= 100; break; + case KEY_ONE: + cam_lock = 1; + break; + case KEY_TWO: + cam_lock = 2; + break; + case KEY_THREE: + cam_lock = 3; + break; + case KEY_FOUR: + cam_lock = 4; + break; + case KEY_FIVE: + cam_lock = 5; + break; + case KEY_SIX: + cam_lock = 6; + break; + case KEY_SEVEN: + cam_lock = 7; + break; + case KEY_EIGHT: + cam_lock = 8; + break; + case KEY_NINE: + cam_lock = 9; + break; + case KEY_ZERO: + cam_lock = 0; + break; + case KEY_F: + cam_lock = -1; } } while (key_pressed != 0); @@ -133,34 +173,21 @@ int main(void) { universe.num_bodies++; } - if (canvas_offset.x + GetRenderWidth() * 0.5 / v_scale > - GetRenderWidth() * 50) { - canvas_offset.x = - -GetRenderWidth() * 0.5 / v_scale + GetRenderWidth() * 50; - } else if (canvas_offset.x - GetRenderWidth() * 0.5 / v_scale < - -GetRenderWidth() * 50) { - canvas_offset.x = - GetRenderWidth() * 0.5 / v_scale - GetRenderWidth() * 50; - } - - if (canvas_offset.y + GetRenderHeight() * 0.5 / v_scale > - GetRenderHeight() * 50) { - canvas_offset.y = - -GetRenderHeight() * 0.5 / v_scale + GetRenderHeight() * 50; - } else if (canvas_offset.y - GetRenderHeight() * 0.5 / v_scale < - -GetRenderHeight() * 50) { - canvas_offset.y = - GetRenderHeight() * 0.5 / v_scale - GetRenderHeight() * 50; - } - BeginDrawing(); ClearBackground(RAYWHITE); for (unsigned int i = 0; i < universe.num_bodies; i++) { - Vector2 scaled_offset = vec2_scale(canvas_offset, v_scale); + Vector2 local_offset = canvas_offset; + if (cam_lock != -1) { + local_offset = vec2_scale(universe.bodies[cam_lock].position, -1); + } + Vector2 scaled_offset = vec2_scale(local_offset, v_scale); Vector2 body_position = vec2_scale(universe.bodies[i].position, v_scale); body_position = vec2_sum(body_position, scaled_offset); body_position = transform_to_center(body_position); float draw_radius = universe.bodies[i].draw_radius * v_scale; + if (draw_radius < 2) { + draw_radius = 2; + } DrawCircleV(body_position, draw_radius, (Color){((256 / universe.num_bodies) * i) % 256 / 2, 255 * (i % 2) / 2, 255 * (i % 2) * (i % 3) / 2, 255}); @@ -170,8 +197,8 @@ int main(void) { (int)(body_position.y - 8), 16, BLACK); } - DrawText(welcome_text, center_x_text(welcome_text, GetRenderWidth(), 20), - center_y_text(GetRenderHeight(), 20), 20, BLACK); + // DrawText(welcome_text, center_x_text(welcome_text, GetRenderWidth(), 20), + // center_y_text(GetRenderHeight(), 20), 20, BLACK); EndDrawing(); } diff --git a/three.fphy b/three.fphy new file mode 100644 index 0000000..1235b14 --- /dev/null +++ b/three.fphy @@ -0,0 +1,4 @@ +mass(EARTH_MASS), radius(km), {x(UA), y(UA)}, {vx(km/s), vy(km/s)}, draw_radius(km), charge(C), name +396518.4, 760000, {-0.85, 0}, {0, 45.0}, 220000, 0, Alpha +297388.8, 650000, {-0.35, 0}, {0, -37.0}, 200000, 0, Beta +495648.0, 900000, {1.30, 0}, {0, -14.5}, 250000, 0, Gamma