projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch threads into development
[Mograsim.git]
/
plugins
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
timeline
/
PauseableTimeFunction.java
diff --git
a/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
b/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
index
4a7723a
..
7a6185e
100644
(file)
--- a/
plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
+++ b/
plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
@@
-10,7
+10,7
@@
public class PauseableTimeFunction implements TimeFunction
{
private boolean paused = false;
private long unpausedSysTime = 0, lastPausedInternalTime = 0;
{
private boolean paused = false;
private long unpausedSysTime = 0, lastPausedInternalTime = 0;
- private double speedFactor =
1
;
+ private double speedFactor =
0
;
private final List<Consumer<Double>> simulTimeToRealTimeFactorChangedListeners = new ArrayList<>();
private final List<Consumer<Double>> simulTimeToRealTimeFactorChangedListeners = new ArrayList<>();
@@
-48,13
+48,18
@@
public class PauseableTimeFunction implements TimeFunction
public double getSimulTimeToRealTimeFactor()
{
public double getSimulTimeToRealTimeFactor()
{
- return 1 / 1000 / speedFactor;
+ return 1 / 1000d / speedFactor;
+ }
+
+ public double getSpeedFactor()
+ {
+ return speedFactor;
}
public void setSpeedFactor(double factor)
{
if (factor <= 0)
}
public void setSpeedFactor(double factor)
{
if (factor <= 0)
- throw new IllegalArgumentException("time factor can't be
smaller than 1
");
+ throw new IllegalArgumentException("time factor can't be
less than or equal to 0
");
if (!paused)
{
pause();
if (!paused)
{
pause();