config dir fix

[physics.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 228c238..a9984f6 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,23 +65,28 @@ int target_UPS = 100;
 long int last_Block_Update;
 float update_Sum = 0;
 
-int ups, fps;
+int ups=100, fps=100;
 int update_Count, draw_Count;
 long int last_Second;
 
 
-float target_time_steps_per_second = 100;
+float target_time_steps_per_second = 1000;
+float times;
+float time_steps_Count;
 
 
 // experiment with rolling averages
 float rUpdate = 100;
 float rDraw = 100;
+float rInput = 100;
 float rRun = 100;
+
 float num = 10;
 
+float total = 0;
 
 /// ***** MAIN Method *****
-int main()
+int main(int argc, char** args)
 {
     init();
     run();
@@ -96,23 +101,23 @@ void init()
     installSignal();
 
     graphics::init();
+    DPF(0, "Graphics initialized");
 
     game::init();
+    DPF(0, "Game initialized");
 
     input::init();
+    DPF(0, "Input initialized");
 
     cfg::init();
+    DPF(0, "Configs initialized");
 
-#ifdef DEBUGGING
-    cout << "Initialization Complete" << endl;
-#endif
+    DPF(0, "Initialization Complete");
 }
 
 void clean()
 {
-#ifdef DEBUGGING
-    cout << "Cleaning up" << endl;
-#endif
+    DPF(0, "Cleaning up");
 
     cfg::clean();
 
@@ -143,18 +148,21 @@ void run()
 
         rRun = (rRun * (num-1) + time) / num;
 
-        cout << "rR:\t" << rRun << endl;
+        //cout << "total:\t" << total << endl;
+        //cout << "rR:\t" << rRun << endl;
+        //total = 0;
     }
 }
 
 void blockUpdate()
 {
     long int start = tickCountMicro();
+    long int diff = start - last_Block_Update;
 
-    cout << "Block" << endl;
+    //cout << "Block" << endl;
 
     // Calculate the updates that should be run for the next draw
-    update_Sum += (start - last_Block_Update) / (1000000 / (float)target_UPS);
+    update_Sum += (float)(diff * target_UPS) / 1000000;
 
     // insures the float to int cast is done once.
     int iupdate_sum = (int)update_Sum;
@@ -162,17 +170,22 @@ void blockUpdate()
     // TODO the main run loop needs to be tested and pruned
     if (iupdate_sum > 0)
     {
-        // Calculate a time step that spreads the updates out as much as possible
-        // used because really quick updates are nearly wasted
-        float time_step = ((float)(start - last_Block_Update)) / iupdate_sum;
+        // Calculate a time step that spreads the updates out as much as
+        // possible used because really quick updates are nearly wasted
+
+        //float time_step = ((float)diff) / iupdate_sum / 1000;
+        //float time_step = 1000 / (100000 / rUpdate) / iupdate_sum;
+        //float time_step = 1000 / ups / iupdate_sum;
+        float time_step = 10;
 
         // run the updates
-        for (int i = 1; i <= iupdate_sum; i++)
+        for (int i = 0; i < iupdate_sum; i++)
         {
             handleInput();
-            update(time_step / 1000);
+            update(time_step);
         }
-        // remove the updates that where run from the sum
+
+        // remove the updates that were run from the sum
         update_Sum -= iupdate_sum;
         last_Block_Update = tickCountMicro();
     }
@@ -185,26 +198,37 @@ void updateFPSCounters()
     {
         ups = update_Count;
         fps = draw_Count;
+        times = time_steps_Count;
         update_Count = 0;
         draw_Count = 0;
+        time_steps_Count = 0;
 
         last_Second = tickCountMicro();
 
 #ifdef FPSUPS
         cout << "ups:\t" << ups << endl;
         cout << "fps:\t" << fps << endl;
+        cout << "times:\t" << times << endl;
 #endif
     }
 }
 
 void handleInput()
 {
-    input::update();
+    long int time;
 
-    game::handleInput();
+    time = tickCountMicro();
+        input::update();
 
-    if(cfg::endGame())
-        is_Running = false;
+        game::handleInput();
+
+        if(cfg::endGame())
+            is_Running = false;
+    time = tickCountMicro() - time;
+
+    rInput = (rInput*(num-1) + time) /num;
+
+    total += rInput;
 }
 
 void update(float time_step)
@@ -212,6 +236,7 @@ void update(float time_step)
     long int time;
 
     update_Count++;
+    time_steps_Count += time_step;
 
     time = tickCountMicro();
         game::update(time_step);
@@ -219,8 +244,10 @@ void update(float time_step)
 
     rUpdate = (rUpdate * (num-1) + time) / num;
 
-    cout << "ru:\t" << rUpdate << endl;
-    cout << "ts:\t" << time_step << endl;
+    //cout << "ts:\t" << time_step << endl;
+    //cout << "ru:\t" << rUpdate << endl;
+
+    total += rUpdate;
 }
 
 void draw()
@@ -236,10 +263,12 @@ void draw()
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        //SDL_Delay(50);
+        //SDL_Delay(10);
     time = tickCountMicro() - time;
 
     rDraw = (rDraw*(num-1) + time) /num;
 
-    cout << "rd:\t" << rDraw << endl;
+    //cout << "rd:\t" << rDraw << endl;
+
+    total += rDraw;
 }