projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logic gates and, or and xor now take an arbitrary amount of inputs.
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
timeline
/
Timeline.java
diff --git
a/era.mi/src/era/mi/logic/timeline/Timeline.java
b/era.mi/src/era/mi/logic/timeline/Timeline.java
index
2578a9b
..
186e946
100644
(file)
--- a/
era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/
era.mi/src/era/mi/logic/timeline/Timeline.java
@@
-103,4
+103,9
@@
public class Timeline
{
\r
return "simulation time: " + currentTime + ", " + events.toString();
\r
}
\r
{
\r
return "simulation time: " + currentTime + ", " + events.toString();
\r
}
\r
+
\r
+ public static long toNanoseconds(long ticks)
\r
+ {
\r
+ return ticks; //TODO: Alter this when it has been determined how ticks should relate to real time.
\r
+ }
\r
}
\ No newline at end of file
}
\ No newline at end of file