Added undo in editor.

Author: oryxel1

editor/src/main/java/oxy/bascenario/editor/inspector/Inspector.java

@@ -120,13 +120,10 @@ public void render() {
 
         boolean objectEquals = !old.equals(object.object);
         if (objectEquals || requireWait != object.requireWait || object.layer != layer || !Objects.equals(vec2, object.vec2)) {
-            object.requireWait = requireWait;
-            object.layer = layer;
-            object.vec2 = vec2;
-
+            final int oldTrack = object.track;
+            long oldDuration = old instanceof SoundAsElement sound ? AudioUtils.toDuration(screen.getScenario().name(), sound) : TimeCompiler.compileTime(old);
             if (objectEquals) {
                 long duration = object.object instanceof SoundAsElement sound ? AudioUtils.toDuration(screen.getScenario().name(), sound) : TimeCompiler.compileTime(object.object);
-                long oldDuration = old instanceof SoundAsElement sound ? AudioUtils.toDuration(screen.getScenario().name(), sound) : TimeCompiler.compileTime(old);
                 if (duration == Long.MAX_VALUE) {
                     duration = 0;
                 }
@@ -139,7 +136,22 @@ public void render() {
                 object.track = findNonOccupiedSlot(object.track, object.start, object.duration, object);
             }
 
-            timeline.queueUpdate = true;
+            final boolean oldWait = object.requireWait;
+            final RenderLayer oldLayer = object.layer;
+            final Vec2 oldVec2 = object.vec2;
+            final long oldTime = oldDuration == Long.MAX_VALUE ? 0 : oldDuration;
+            timeline.queueUndo(() -> {
+                object.object = old;
+                object.duration = oldTime;
+                object.requireWait = oldWait;
+                object.layer = oldLayer;
+                object.vec2 = oldVec2;
+                object.track = oldTrack;
+            });
+
+            object.requireWait = requireWait;
+            object.layer = layer;
+            object.vec2 = vec2;
         }
 
         ImGui.end();

editor/src/main/java/oxy/bascenario/editor/screen/BaseScenarioEditorScreen.java

@@ -5,6 +5,7 @@
 import imgui.ImGuiViewport;
 import imgui.flag.ImGuiCol;
 import imgui.flag.ImGuiDockNodeFlags;
+import imgui.flag.ImGuiKey;
 import imgui.flag.ImGuiWindowFlags;
 import lombok.Getter;
 import net.raphimc.thingl.ThinGL;
@@ -55,6 +56,11 @@ public void render(float delta) {
         ImGui.begin("Scenario View", ImGuiWindowFlags.NoBackground);
         renderScenarioWindow();
         ImGui.end();
+
+        boolean control = ImGui.isKeyDown(ImGuiKey.RightCtrl) || ImGui.isKeyDown(ImGuiKey.LeftCtrl);
+        if ((control) && ImGui.isKeyReleased(ImGuiKey.Z)) {
+            timeline.undo();
+        }
     }
 
     public void update() {
@@ -87,6 +93,13 @@ private void renderMenuBar() {
             ImGui.endMenu();
         }
 
+        if (ImGui.beginMenu("Edit")) {
+            if (ImGui.menuItem("Undo", "Ctrl+Z", false, timeline.canUndo())) {
+                timeline.undo();
+            }
+            ImGui.endMenu();
+        }
+
         if (ImGui.beginMenu("Save")) {
             boolean asJson;
             if ((asJson = ImGui.menuItem("As Json")) || ImGui.menuItem("As Binary")) {

editor/src/main/java/oxy/bascenario/editor/timeline/ObjectRenderer.java

@@ -139,6 +139,8 @@ private void handleMouse() {
                 public void accept() {
                     final ImVec2 pos = ImGui.getWindowPos(), size = ImGui.getWindowSize();
 
+                    final long oldStart = object.start;
+                    final int oldTrack = object.track;
                     if (second) {
                         object.start = nearestTime + 1;
                     } else {
@@ -147,7 +149,10 @@ public void accept() {
                     }
                     object.track = trackFromY(timeline, object.renderer.y);
 
-                    timeline.queueUpdate = true;
+                    timeline.queueUndo(() -> {
+                        object.start = oldStart;
+                        object.track = oldTrack;
+                    });
                 }
             });
 
@@ -185,11 +190,18 @@ private boolean handleDurationResize() {
             }
 
             if (TimeCompiler.canResize(object.object)) {
+                final long oldDuration = object.duration;
+                final Object oldObject = object;
+                final float oldWidth = this.width;
                 object.duration = Math.max(0, object.duration + duration);
                 object.object = TimeCompiler.addTime(object.object, (int) duration);
 
                 this.width = ((float) object.duration / (Timeline.DEFAULT_MAX_TIME * timeline.getScale())) * (size.x - size.x / 4);
-                timeline.queueUpdate = true;
+                timeline.queueUndo(() -> {
+                    this.width = oldWidth;
+                    this.object.duration = oldDuration;
+                    this.object.object = oldObject;
+                });
             }
 
             resizing = ImGui.isMouseDown(0);

editor/src/main/java/oxy/bascenario/editor/timeline/Timeline.java

@@ -14,7 +14,9 @@
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Deque;
 import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
 
 // Shit code but whatever.
 public class Timeline {
@@ -30,10 +32,34 @@ public void put(int track, long start, long duration, Object object, RenderLayer
         this.objects.add(objectOrEvent);
         this.objects.sort(Comparator.comparingLong(o -> o.start));
 
-        this.queueUpdate = true;
+        queueUndo(() -> this.objects.remove(objectOrEvent));
         this.setSelectedObject(objectOrEvent);
     }
 
+    // Undo and Redo
+    private final Deque<Runnable> undo = new ConcurrentLinkedDeque<>();
+    public void queueUndo(Runnable run) {
+        this.queueUpdate = true;
+        undo.add(run);
+        if (undo.size() > 30) {
+            undo.poll();
+        }
+    }
+    public boolean canUndo() {
+        return !undo.isEmpty();
+    }
+    public void undo() {
+        if (undo.isEmpty()) {
+            System.out.println("Nothin left to Undo!");
+            return;
+        }
+
+        undo.pollLast().run();
+        System.out.println("Undo!");
+        this.queueUpdate = true;
+//        this.redo =
+    }
+//    private Runnable redo;
 
     @Getter @Setter
     private ObjectOrEvent selectedObject;
@@ -47,7 +73,7 @@ public boolean isDragging(ObjectOrEvent object) {
         return this.draggingObject != null && object == this.draggingObject.object;
     }
 
-    public boolean queueUpdate;
+    private boolean queueUpdate;
 
     public Timeline(BaseScenarioEditorScreen screen, Scenario.Builder scenario) {
         this.screen = screen;
@@ -129,9 +155,10 @@ public void render() {
         drawTimelineCursor(size.x / 4, pos, size);
 
         if (ImGui.isWindowFocused() && this.selectedObject != null && ImGui.isKeyPressed(ImGuiKey.Delete)) {
+            final ObjectOrEvent old = this.selectedObject;
+            queueUndo(() -> this.objects.add(old));
             this.objects.remove(this.selectedObject);
             this.selectedObject = null;
-            this.queueUpdate = true;
         }
 
         if (ImGui.isWindowFocused() && ImGui.isKeyPressed(ImGuiKey.Space)) {