Broken undo

src/Engine/Core/EntityWrapper.cpp

@@ -34,6 +34,15 @@ EntityWrapper EntityWrapper::Parent()
     }
 }
 
+EntityWrapper EntityWrapper::BaseParent()
+{
+    EntityWrapper baseParent = Parent();
+    while (baseParent.Parent().Valid()) {
+        baseParent = baseParent.Parent();
+    }
+    return baseParent;
+}
+
 EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
 {
     return firstChildByNameRecursive(name, this->ID);

src/Engine/Editor/EditorGUI.cpp

@@ -602,6 +602,15 @@ bool EditorGUI::OnKeyDown(const Events::KeyDown& e)
         m_CopyTarget = m_CurrentSelection;
     }
 
+    if (e.ModCtrl && e.KeyCode == GLFW_KEY_Z) {
+        if (m_OnUndo != nullptr) {
+            m_OnUndo();
+            if (!m_CurrentSelection.Valid()) {
+                SelectEntity(EntityWrapper::Invalid);
+            }
+        }
+    }
+
     if (e.ModCtrl && e.KeyCode == GLFW_KEY_V) {
         if (m_OnEntityPaste != nullptr) {
             EntityWrapper copy = m_OnEntityPaste(m_CopyTarget, m_CurrentSelection);
@@ -774,13 +783,13 @@ bool EditorGUI::compareCharArray(const char* c1, const char* c2)
 
 void EditorGUI::SetDirty(EntityWrapper entity)
 {
-    EntityWrapper baseParent = entity;
-    while (baseParent.Parent().Valid()) {
-        baseParent = baseParent.Parent();
-    }
+    EntityWrapper baseParent = entity.BaseParent();
     if (m_EntityFiles.find(baseParent) != m_EntityFiles.end()) {
         m_EntityFiles.at(baseParent).Dirty = true;
     }
+    if (m_OnDirty != nullptr) {
+        m_OnDirty(entity);
+    }
 }
 
 void EditorGUI::entityImport(World* world)
@@ -830,6 +839,7 @@ void EditorGUI::entityCreate(World* world, EntityWrapper parent)
             parent.World = world;
         }
         EntityWrapper newEntity = m_OnEntityCreate(parent);
+        SetDirty(newEntity);
         SelectEntity(newEntity);
     }
 }
@@ -845,9 +855,9 @@ void EditorGUI::entityDelete(EntityWrapper entity)
         if (boost::any_cast<EntityWrapper>(m_ModalData[modalName]) == entity) {
             EntityWrapper parent = entity.Parent();
             if (m_OnEntityDelete != nullptr) {
-                SetDirty(entity);
                 m_OnEntityDelete(entity);
                 m_EntityFiles.erase(entity);
+                SetDirty(parent);
             }
             if (!m_CurrentSelection.Valid()) {
                 SelectEntity(parent);
@@ -864,8 +874,8 @@ void EditorGUI::entityChangeParent(EntityWrapper entity, EntityWrapper parent)
     }
 
     if (m_OnEntityChangeParent != nullptr) {
-        SetDirty(entity);
         m_OnEntityChangeParent(entity, parent);
+        SetDirty(entity);
         LOG_DEBUG("Changed parent of %i to %i", entity.ID, parent.ID);
     }
 }

src/Engine/Editor/EditorSystem.cpp

@@ -33,6 +33,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_EditorGUI->SetComponentDeleteCallback(std::bind(&EditorSystem::OnComponentDelete, this, std::placeholders::_1, std::placeholders::_2));
     m_EditorGUI->SetWidgetModeCallback(std::bind(&EditorSystem::setWidgetMode, this, std::placeholders::_1));
     m_EditorGUI->SetWidgetSpaceCallback(std::bind(&EditorSystem::OnWidgetSpace, this, std::placeholders::_1));
+    m_EditorGUI->SetDirtyCallback(std::bind(&EditorSystem::OnDirty, this, std::placeholders::_1));
+    m_EditorGUI->SetUndoCallback(std::bind(&EditorSystem::OnUndo, this));
 
     EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress);
     EVENT_SUBSCRIBE_MEMBER(m_EWidgetDelta, &EditorSystem::OnWidgetDelta);
@@ -87,6 +89,11 @@ void EditorSystem::Update(double dt)
         glm::vec3& pos = cameraTransform["Position"];
         pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta;
     }
+
+    if (m_SaveUndoLevel) {
+        m_UndoLevels.push_back(*m_World);
+        m_SaveUndoLevel = false;
+    }
 }
 
 void EditorSystem::Enable()
@@ -185,6 +192,19 @@ void EditorSystem::OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace)
     m_WidgetSpace = widgetSpace;
 }
 
+void EditorSystem::OnDirty(EntityWrapper entity)
+{
+    m_SaveUndoLevel = true;
+}
+
+void EditorSystem::OnUndo()
+{
+    // The last "undo level" is always the most recent change
+    if (m_UndoLevels.size() >= 2) {
+        *m_World = m_UndoLevels.at(m_UndoLevels.size() - 2);
+    }
+}
+
 bool EditorSystem::OnMousePress(const Events::MousePress& e)
 {
     ImGuiIO& io = ImGui::GetIO();