Added nextEventTime(); added NewEventListeners

[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 be577cf..616db7c 100644 (file)
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -1,6 +1,9 @@
 package era.mi.logic.timeline;\r
 \r
+import java.util.ArrayList;\r
+import java.util.List;\r
 import java.util.PriorityQueue;\r
+import java.util.function.Consumer;\r
 \r
 /**\r
  * Orders Events by the time they are due to be executed. Can execute Events individually.\r
@@ -12,6 +15,8 @@ public class Timeline
        private PriorityQueue<InnerEvent> events;\r
        private long currentTime = 0;\r
        \r
+       private final List<Consumer<TimelineEvent>> eventAddedListener;\r
+       \r
        public Timeline(int initCapacity)\r
        {\r
                events = new PriorityQueue<InnerEvent>(initCapacity, (a, b) -> {\r
@@ -20,6 +25,8 @@ public class Timeline
                                return 0;\r
                        return difference < 0 ? -1 : 1;\r
                });\r
+               \r
+               eventAddedListener = new ArrayList<>();\r
        }\r
        \r
        public boolean hasNext()\r
@@ -79,12 +86,29 @@ public class Timeline
        {\r
                return currentTime;\r
        }\r
+\r
+       public long nextEventTime()\r
+       {\r
+               if(!hasNext())\r
+                       return -1;\r
+               else\r
+                       return events.peek().timing;\r
+       }\r
        \r
        public void reset()\r
        {\r
                events.clear();\r
                currentTime = 0;\r
        }\r
+\r
+       public void addEventAddedListener(Consumer<TimelineEvent> listener)\r
+       {\r
+               eventAddedListener.add(listener);\r
+       }\r
+       public void removeEventAddedListener(Consumer<TimelineEvent> listener)\r
+       {\r
+               eventAddedListener.remove(listener);\r
+       }\r
        \r
        /**\r
         * Adds an Event to the {@link Timeline}\r
@@ -94,7 +118,9 @@ public class Timeline
        public void addEvent(TimelineEventHandler function, int relativeTiming)\r
        {\r
                long timing = currentTime + relativeTiming;\r
-               events.add(new InnerEvent(function, new TimelineEvent(timing), timing));\r
+               TimelineEvent event = new TimelineEvent(timing);\r
+               events.add(new InnerEvent(function, event, timing));\r
+               eventAddedListener.forEach(l -> l.accept(event));\r
        }\r
        \r
        private class InnerEvent\r