From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 1 Dec 2020 20:26:14 +0000 (-0600)
Subject: code cleanup
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=ca9d44f757cedd54c1a2031713bebdd2a92d2c3e;p=csc718.git

code cleanup
---

diff --git a/sim_omp b/sim_omp
index 1d89882..ccfe3f2 100755
Binary files a/sim_omp and b/sim_omp differ
diff --git a/sim_seq b/sim_seq
index b582364..f088541 100755
Binary files a/sim_seq and b/sim_seq differ
diff --git a/src/sim.cpp b/src/sim.cpp
index 0803ca3..c4d5ecc 100644
--- a/src/sim.cpp
+++ b/src/sim.cpp
@@ -299,7 +299,6 @@ loop(SimState* state)
 
     f64 frame_delta = 0.0;
     i32 frame_count = 0;
-    clock_t total_clock_delta = 0;
 
     while (!glfwWindowShouldClose(window))
     {
@@ -307,10 +306,7 @@ loop(SimState* state)
         delta = curr_time - last_time;
         last_time = curr_time;
 
-        clock_t before_update = clock();
         update(state, delta);
-        clock_t after_update = clock();
-        total_clock_delta += (after_update - before_update);
 
         frame_count += 1;
         draw(state);
@@ -318,7 +314,6 @@ loop(SimState* state)
         frame_delta += delta;
         if (frame_delta >= 1.0)
         {
-            total_clock_delta = 0;
             frame_delta -= 1.0;
             frame_rate = frame_count;
             frame_count = 0;
diff --git a/src/sim_omp.cpp b/src/sim_omp.cpp
index b09fbee..8bd1a7c 100644
--- a/src/sim_omp.cpp
+++ b/src/sim_omp.cpp
@@ -143,9 +143,6 @@ struct SimState
     Camera camera;
 };
 
-// @CLEANUP
-internal f64 TEMP_dt = 0;
-
 internal void
 sim_state_init(SimState* state)
 {
@@ -227,21 +224,18 @@ loop(SimState* state)
 
     f64 frame_delta = 0.0;
     i32 frame_count = 0;
-    clock_t total_clock_delta = 0;
-    clock_t before_update, after_update;
 
     #pragma omp parallel
     {
         while (!glfwWindowShouldClose(window))
         {
+            // NOTE(Brendan): Compute the delta time and update camera variables.
             #pragma omp master
             {
                 curr_time = glfwGetTime();
                 delta = curr_time - last_time;
                 last_time = curr_time;
 
-                before_update = clock();
-
                 glfwGetWindowSize(window, &state->camera.window_width, &state->camera.window_height);
 
                 persist const f32 camera_move_speed = 6;
@@ -251,30 +245,27 @@ loop(SimState* state)
                 if (glfwGetKey(window, GLFW_KEY_RIGHT)) state->camera.offset.x += camera_move_speed;
                 if (glfwGetKey(window, GLFW_KEY_Q))     state->camera.scale *= 1.02f;
                 if (glfwGetKey(window, GLFW_KEY_A))     state->camera.scale /= 1.02f;
-
-                TEMP_dt = delta;
             }
 
+            // NOTE(Brendan): Calculate how each body will move.
             #pragma omp for
             for (int i = 0; i < global_settings.body_count; i++)
-                body_accumulate_move(&state->bodies[i], &state->qt_bodies, TEMP_dt);
+                body_accumulate_move(&state->bodies[i], &state->qt_bodies, delta);
 
+            // NOTE(Brendan): Move each of the bodies.
             #pragma omp for
             for (int i = 0; i < global_settings.body_count; i++)
-                body_apply_move(&state->bodies[i], TEMP_dt);
+                body_apply_move(&state->bodies[i], delta);
 
+            // NOTE(Brendan): Draw the scene.
             #pragma omp master
             {
-                after_update = clock();
-                total_clock_delta += (after_update - before_update);
-
                 frame_count += 1;
                 draw(state);
 
                 frame_delta += delta;
                 if (frame_delta >= 1.0)
                 {
-                    total_clock_delta = 0;
                     frame_delta -= 1.0;
                     frame_rate = frame_count;
                     frame_count = 0;
@@ -283,6 +274,7 @@ loop(SimState* state)
                 glfwPollEvents();
             }
 
+            // NOTE(Brendan): One of the threads recompute the Quad Tree.
             #pragma omp single
             {
                 state->qt_bodies.init(AABB { -2000, -2000, 4000, 4000 });
diff --git a/src/sim_seq.cpp b/src/sim_seq.cpp
index 37f3e49..abc51ba 100644
--- a/src/sim_seq.cpp
+++ b/src/sim_seq.cpp
@@ -258,7 +258,6 @@ loop(SimState* state)
 
     f64 frame_delta = 0.0;
     i32 frame_count = 0;
-    clock_t total_clock_delta = 0;
 
     while (!glfwWindowShouldClose(window))
     {
@@ -266,10 +265,7 @@ loop(SimState* state)
         delta = curr_time - last_time;
         last_time = curr_time;
 
-        clock_t before_update = clock();
         update(state, delta);
-        clock_t after_update = clock();
-        total_clock_delta += (after_update - before_update);
 
         frame_count += 1;
         draw(state);
@@ -277,7 +273,6 @@ loop(SimState* state)
         frame_delta += delta;
         if (frame_delta >= 1.0)
         {
-            total_clock_delta = 0;
             frame_delta -= 1.0;
             frame_rate = frame_count;
             frame_count = 0;