From f2411141e364766b1294f1b3d9e1a307b9de0c24 Mon Sep 17 00:00:00 2001
From: Andy Belle-Isle <drumsetmonkey@gmail.com>
Date: Sun, 1 Sep 2019 01:25:14 -0400
Subject: Game loop now updates position every tick, and added circular
 movement to dog

---
 src/engine.cpp | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

(limited to 'src/engine.cpp')

diff --git a/src/engine.cpp b/src/engine.cpp
index a89a876..4579eb7 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -27,6 +27,7 @@
 
 #include "components/Script.hpp"
 #include "components/Position.hpp"
+#include "components/Velocity.hpp"
 
 int Engine::init(void)
 {
@@ -42,17 +43,48 @@ int Engine::init(void)
 void Engine::logicLoop(void)
 {
 	using namespace std::chrono_literals;
+    typedef std::chrono::high_resolution_clock mc;
 
-	entityx::TimeDelta dt = 0;
+    entityx::TimeDelta dt = 0; /**< Elapsed milliseconds since each loop */
+    double elapsed = 0;
 
 	while (shouldRun()) {
-		systems.update<InputSystem>(dt);
 
-        // All entities with an idle function should be run here
-        entities.each<Scripted>([](entityx::Entity, Scripted &f){
-            f.exec();
+        auto start = mc::now();
+
+        /***********************
+        *  UPDATE FREQUENTLY  *
+        ***********************/
+        
+        entities.each<Position, Velocity>
+            ([&](entityx::Entity, Position &p, Velocity &v){
+            p.x += (v.x * dt/1000.0);
+            p.y += (v.y * dt/1000.0);
         });
-		std::this_thread::sleep_for(100ms);
+
+		systems.update<InputSystem>(dt);
+
+        /*******************
+        *  LOGIC UPDATES  *
+        *******************/
+        
+        // Update 20 times a second
+        if (elapsed > 50) {
+            elapsed = 0;
+            
+            // All entities with an idle function should be run here
+            entities.each<Scripted>([](entityx::Entity, Scripted &f){
+                f.exec();
+            });
+        }
+
+        auto end = mc::now();
+        auto diff = end - start;
+        auto micros = cr::duration_cast<cr::microseconds>(diff);
+        auto msc = micros.count();
+        dt = static_cast<double>(msc)/1000.0;
+        elapsed += dt;
+		std::this_thread::yield();
 	}
 
     // Remove all Lua references from entities
-- 
cgit v1.2.3