From 1f9fc4809b83db4bffc84f754f9ce9a09367e740 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Tue, 24 Nov 2020 12:34:04 -0600 Subject: [PATCH] forgot to commit setting change --- dummy.settings | 8 ++++++-- src/sim.cpp | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dummy.settings b/dummy.settings index 642fbd8..bf207ef 100644 --- a/dummy.settings +++ b/dummy.settings @@ -21,9 +21,9 @@ body_color 3 1.0 1.0 1.0 # a uniform distribution. # Type# Min Max body_mass_range 0 2.0 4.0 -body_mass_range 1 20.0 22.0 +body_mass_range 1 15.0 20.0 body_mass_range 2 5.0 7.0 -body_mass_range 3 3.0 15.0 +body_mass_range 3 3.0 6.0 # Determines the friction coeffient, u. # Equation of friction used: @@ -38,6 +38,10 @@ friction 6.0 # two bodies will interact in terms of pixels. universe_scale 20.0 +# Determines the magnitude of the force applied to bodies that are within +# 'universe_scale' pixels of each other. +near_repulsive_force 200.0 + # Determines how two bodies will interact. Note, that this is not a symmetric relation. # Body Type# Other Type# Distance Force interaction 0 1 5.0 200.0 diff --git a/src/sim.cpp b/src/sim.cpp index 4170abc..0803ca3 100644 --- a/src/sim.cpp +++ b/src/sim.cpp @@ -360,6 +360,7 @@ main(i32 argc, char* argv[]) auto state = alloc(); sim_state_init(state); + // NOTE(Brendan): Other OpenGL initializations that could probably happen earlier. { glBindVertexArray(circle_mesh); defer { glBindVertexArray(-1); }; -- 2.25.1