X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicExecuter.java;h=1eff41123d9e1ec08909396b90b9cb7f86b8d239;hb=69ec19d54ceb6d5abbb8b4faa55284af22174859;hp=77a093522219ef31a6a6cde5a7c83b08559ab150;hpb=26eb7899013bc52e4501ee97422d79d6e1ea2b9c;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
index 77a09352..1eff4112 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
@@ -41,13 +41,12 @@ public class LogicExecuter
 			{
 				while (shouldBeRunningLive.get())
 				{
-					// always execute to keep timeline from "hanging behind" for too long
-					long current = tf.getAsLong();
+					long current = tf.getTime();
 					timeline.executeUntil(timeline.laterThan(current), System.currentTimeMillis() + 10);
 					long nextEventTime = timeline.nextEventTime();
 					long sleepTime;
 					if (timeline.hasNext())
-						sleepTime = tf.simulTimeDeltaToRealTimeMillis(nextEventTime - current);
+						sleepTime = (long) ((nextEventTime - current) * tf.getSimulTimeToRealTimeFactor());
 					else
 						sleepTime = 10000;
 					try
@@ -82,6 +81,8 @@ public class LogicExecuter
 				if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0)
 					simulationThread.interrupt();
 		});
+		// not optimal; but we don't expect this to happen very often
+		tf.addSimulTimeToRealTimeFactorChangedListener(d -> simulationThread.interrupt());
 	}
 
 	public void executeNextStep()
@@ -131,6 +132,11 @@ public class LogicExecuter
 		return isPaused.get();
 	}
 
+	public double getSpeedFactor()
+	{
+		return tf.getSpeedFactor();
+	}
+
 	public void setSpeedFactor(double factor)
 	{
 		tf.setSpeedFactor(factor);