From 999e77669d7d6930e28c323d4771a53bf39776b0 Mon Sep 17 00:00:00 2001 From: cinnaboot Date: Sat, 11 Mar 2023 13:01:29 -0500 Subject: [PATCH] change orbit color, and move camera back to fit scene --- src/game.h | 2 +- src/main.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/game.h b/src/game.h index 2752460..41d5910 100644 --- a/src/game.h +++ b/src/game.h @@ -12,7 +12,7 @@ using glm::dmat3; #define DEFAULT_ORBIT_VERTICES 128 -const vec3 DEFAULT_ELLIPSE_COLOR = vec3(0.5, 0.5, 0.5); +const vec3 DEFAULT_ELLIPSE_COLOR = vec3(0.3, 0.3, 0.3); const vec3 SELECTED_ELLIPSE_COLOR = vec3(0.7, 0.2, 0.2); diff --git a/src/main.cpp b/src/main.cpp index f75a2d9..2dab369 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -45,6 +45,11 @@ #include "gooey.h" #include "orbits.h" +// TODO: move globals to config file? +#define DEFAULT_SIM_SPEED 4000 +#define GAME_ARENA_SIZE 16 * 1024 * 1024 // 16MB +#define DEFAULT_MAX_ORBITS 10000 +#define DEFAULT_MANUEVER_NODES 3 * DEFAULT_MAX_ORBITS const double SCALING = 0.001; const vec4 g_light_direction = vec4(-2, 1, 3, 1); @@ -276,7 +281,7 @@ loadRandomOrbits(GameState* gs, bool loadScene(GameState* gs, RenderState* rs) { - initCamera(rs, vec3(-30 / SCALING, -30 / SCALING, 30 / SCALING), vec3(0, 0, 0), vec3(0,0,1)); + initCamera(rs, vec3(-70 / SCALING, -70 / SCALING, 70 / SCALING), vec3(0, 0, 0), vec3(0,0,1)); initLights(rs); gs->running = true; @@ -378,10 +383,6 @@ postFrameCallback(RenderState* rs, void* user_data = nullptr) gooDraw(rs->handles.window, (GameState*) user_data, rs); } -#define DEFAULT_SIM_SPEED 1000 -#define GAME_ARENA_SIZE 16 * 1024 * 1024 // 16MB -#define DEFAULT_MAX_ORBITS 10000 -#define DEFAULT_MANUEVER_NODES 3 * DEFAULT_MAX_ORBITS int main() {