From 50714b4d8bbf5acd376d56581b03bbc639a88c54 Mon Sep 17 00:00:00 2001
From: Pegacraffft <karl.w.schramm@gmail.com>
Date: Thu, 18 Feb 2021 15:37:21 +0100
Subject: [PATCH] fixed deltatime

---
 src/main/java/engine/Game.java       |  4 ++--
 src/main/java/engine/loops/Loop.java | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/engine/Game.java b/src/main/java/engine/Game.java
index 971eedb..eb932c7 100644
--- a/src/main/java/engine/Game.java
+++ b/src/main/java/engine/Game.java
@@ -101,10 +101,10 @@ public static Scene getScene(String alias) {
 
     /**
      *
-     * @return Returns the time it took, to show the last frame.
+     * @return How long it took to calculate the last frame in respect to the framerate
      */
     public static double deltaTime() {
-        return (double) Loop.frameTime / 1000000;
+        return (double) Loop.frameTime / (1E9 / FPS);
     }
 
     /**
diff --git a/src/main/java/engine/loops/Loop.java b/src/main/java/engine/loops/Loop.java
index 4ad59e2..8682960 100644
--- a/src/main/java/engine/loops/Loop.java
+++ b/src/main/java/engine/loops/Loop.java
@@ -3,7 +3,6 @@
 import engine.Entity;
 import engine.Game;
 import engine.Scene;
-import engine.mechanics.EntityList;
 import engine.rendering.Graphics;
 
 import java.util.ConcurrentModificationException;
@@ -15,19 +14,22 @@ public class Loop implements Runnable {
     /**
      * the time it took to calculate the last frame in ns
      */
-    public static long frameTime = 1;
+    private static long calculationTime = 1;
+    public static int frameTime = 0;
     private int frameRate = 60;
     private boolean running = false;
+    private long lastFrame = System.nanoTime();
 
     @Override
     public void run() {
         while (running) {
-            long startTime = System.nanoTime();
+            frameTime = (int) (System.nanoTime() - lastFrame);
+            long startTime = lastFrame = System.nanoTime();
             logicLoop();
             renderLoop();
             try {
-                frameTime = (System.nanoTime() - startTime);
-                long toWait = (long) 1E9 / frameRate - frameTime;
+                calculationTime = (System.nanoTime() - startTime);
+                long toWait = (long) 1E9 / frameRate - calculationTime;
                 if (toWait < 0) toWait = 0;
                 //noinspection BusyWait
                 Thread.sleep((long) (toWait / 1E6), (int) (toWait % 1E6));