Undo/Redo gizmo translate/rotate/scale multiple objects

vimontgames · Sep 29, 2024 · 0b773b5 · 0b773b5
1 parent 7e61cd0
commit 0b773b5
Show file tree

Hide file tree

Showing 16 changed files with 248 additions and 50 deletions.
diff --git a/src/core/IUndoRedo.h b/src/core/IUndoRedo.h
@@ -19,8 +19,12 @@ namespace vg::core
         virtual void Undo() = 0;
         virtual void Redo() = 0;
 
-        virtual string GetName() const = 0;
+        virtual string GetEntryName() const = 0;
+        virtual string GetObjectName() const = 0;
         virtual string GetDescription() const = 0;
+
+        virtual void AddSubEntry(IUndoRedoEntry * _subEntry) = 0;
+        virtual const vector<IUndoRedoEntry *> * GetSubEntries() const = 0;
     };
 
     struct UndoRedoTarget
@@ -46,7 +50,7 @@ namespace vg::core
 
         bool isEmpty() const
         {
-            return nullptr == m_object && nullptr == m_prop;
+            return nullptr == m_object;// && nullptr == m_prop; 
         }
 
         void clear()

diff --git a/src/core/UndoRedo/Entry/UndoRedoPropertyEntry.h b/src/core/UndoRedo/Entry/UndoRedoPropertyEntry.h
@@ -15,15 +15,16 @@ namespace vg::core
     class UndoRedoPropertyEntry final : public UndoRedoEntry
     {
     public:
-        UndoRedoPropertyEntry(IObject * _object, const IProperty * _prop, IObject * _originalObject, IGameObject * _prefab, IDynamicProperty * _propOverride);
+        UndoRedoPropertyEntry(IObject * _object, const IProperty * _prop, IObject * _originalObject = nullptr, IGameObject * _prefab = nullptr, IDynamicProperty * _propOverride = nullptr);
 
         void BeforeChange() final override;
         void AfterChange() final override;
 
         void Undo() final override;
         void Redo() final override;
 
-        string GetName() const final override;
+        string GetEntryName() const final override;
+        string GetObjectName() const final override;
         string GetDescription() const final override;
 
     private:

diff --git a/src/core/UndoRedo/Entry/UndoRedoPropertyEntry.hpp b/src/core/UndoRedo/Entry/UndoRedoPropertyEntry.hpp
@@ -10,7 +10,10 @@ namespace vg::core
     UndoRedoPropertyEntry::UndoRedoPropertyEntry(IObject * _object, const IProperty * _prop, IObject * _originalObject, IGameObject * _prefab, IDynamicProperty * _propOverride)
     {
         m_object = _object;
+        VG_ASSERT(m_object);
+
         m_prop = (IProperty *)_prop;
+        VG_ASSERT(m_prop);
 
         m_originalObject = _originalObject;
         m_prefab = _prefab;
@@ -32,11 +35,17 @@ namespace vg::core
     }
 
     //--------------------------------------------------------------------------------------
-    string UndoRedoPropertyEntry::GetName() const
+    string UndoRedoPropertyEntry::GetEntryName() const
     {
         return "Property";
     }
 
+    //--------------------------------------------------------------------------------------
+    string UndoRedoPropertyEntry::GetObjectName() const
+    {
+        return m_object->GetName();
+    }
+
     //--------------------------------------------------------------------------------------
     string UndoRedoPropertyEntry::GetDescription() const
     {
@@ -47,7 +56,7 @@ namespace vg::core
     void UndoRedoPropertyEntry::Undo()
     {
         // Restore the original value serialized in memory before change
-        VG_INFO("[Undo/Redo] Undo Property \"%s\" (0x%016X) from Object \"%s\" (0x%016X)", m_prop->GetName(), m_prop, m_originalObject->GetName().c_str(), m_object);
+        VG_INFO("[Undo/Redo] Undo Property \"%s\" (0x%016X) from Object \"%s\" (0x%016X)", m_prop->GetName(), m_prop, m_originalObject? m_originalObject->GetName().c_str() : m_object->GetName().c_str(), m_object);
 
         m_original.resetRead();
         Factory * factory = (Factory *)Kernel::getFactory();
@@ -69,7 +78,7 @@ namespace vg::core
     void UndoRedoPropertyEntry::Redo()
     {
         // Restore the modified value serialized in memory before change
-        VG_INFO("[Undo/Redo] Redo Property \"%s\" (0x%016X) from Object \"%s\" (0x%016X)", m_prop->GetName(), m_prop, m_originalObject->GetName().c_str(), m_object);
+        VG_INFO("[Undo/Redo] Redo Property \"%s\" (0x%016X) from Object \"%s\" (0x%016X)", m_prop->GetName(), m_prop, m_originalObject ? m_originalObject->GetName().c_str() : m_object->GetName().c_str(), m_object);
 
         m_modified.resetRead();
         Factory * factory = (Factory *)Kernel::getFactory();

diff --git a/src/core/UndoRedo/UndoRedo.cpp b/src/core/UndoRedo/UndoRedo.cpp
@@ -3,9 +3,11 @@
 #include "core/Kernel.h"
 #include "core/Object/Factory.h"
 #include "core/IGameObject.h"
+#include "core/string/string.h"
 
 #include "UndoRedoManager.hpp"
 #include "UndoRedoEntry.hpp"
+#include "UndoRedoEntryGroup.hpp"
 #include "Entry/UndoRedoPropertyEntry.hpp"
 
 namespace vg::core

diff --git a/src/core/UndoRedo/UndoRedoEntry.h b/src/core/UndoRedo/UndoRedoEntry.h
@@ -18,7 +18,10 @@ namespace vg::core
         void Undo() override= 0;
         void Redo() override= 0;
 
-        string GetName() const override = 0;
+        string GetEntryName() const override = 0;
         string GetDescription() const override = 0;
+
+        void AddSubEntry(IUndoRedoEntry * _subEntry) final override { VG_ASSERT(false); }
+        const vector<IUndoRedoEntry *> * GetSubEntries() const final override { return nullptr; }
     };
 }
diff --git a/src/core/UndoRedo/UndoRedoEntryGroup.h b/src/core/UndoRedo/UndoRedoEntryGroup.h
@@ -0,0 +1,32 @@
+#pragma once
+
+namespace vg::core
+{
+    class IObject;
+    class IProperty;
+    class IDynamicProperty;
+
+    class UndoRedoEntryGroup : public IUndoRedoEntry
+    {
+    public:
+        UndoRedoEntryGroup(const string & _name);
+        ~UndoRedoEntryGroup();
+
+        void BeforeChange() override;
+        void AfterChange() override;
+
+        void Undo() override;
+        void Redo() override;
+
+        string GetEntryName() const override;
+        string GetObjectName() const final override;
+        string GetDescription() const override;
+
+        void AddSubEntry(IUndoRedoEntry * _subEntry) final override;
+        const vector<IUndoRedoEntry *> * GetSubEntries() const final override;
+
+    private:
+        string m_name;
+        core::vector<IUndoRedoEntry *> m_subEntries;
+    };
+}
diff --git a/src/core/UndoRedo/UndoRedoEntryGroup.hpp b/src/core/UndoRedo/UndoRedoEntryGroup.hpp
@@ -0,0 +1,85 @@
+#include "UndoRedoEntryGroup.h"
+
+namespace vg::core
+{
+    //--------------------------------------------------------------------------------------
+    UndoRedoEntryGroup::UndoRedoEntryGroup(const string & _name) :
+        m_name(_name)
+    {
+
+    }
+
+    //--------------------------------------------------------------------------------------
+    UndoRedoEntryGroup::~UndoRedoEntryGroup()
+    {
+        for (auto * entry : m_subEntries)
+            VG_SAFE_DELETE(entry);
+        m_subEntries.clear();
+    }
+
+    //--------------------------------------------------------------------------------------
+    void UndoRedoEntryGroup::BeforeChange()
+    {
+        for (auto * entry : m_subEntries)
+            entry->BeforeChange();
+    }
+
+    //--------------------------------------------------------------------------------------
+    void UndoRedoEntryGroup::AfterChange()
+    {
+        for (auto * entry : m_subEntries)
+            entry->AfterChange();
+    }
+
+    //--------------------------------------------------------------------------------------
+    void UndoRedoEntryGroup::Undo()
+    {
+        VG_INFO("[Undo/Redo] Begin Undo Group \"%s\" (0x%016X)", GetEntryName().c_str(), this);
+
+        for (auto * entry : m_subEntries)
+            entry->Undo();
+
+        VG_INFO("[Undo/Redo] End Undo Group \"%s\" (0x%016X)", GetEntryName().c_str(), this);
+    }
+
+    //--------------------------------------------------------------------------------------
+    void UndoRedoEntryGroup::Redo()
+    {
+        VG_INFO("[Undo/Redo] Begin Redo Group \"%s\" (0x%016X)", GetEntryName().c_str(), this);
+
+        for (auto * entry : m_subEntries)
+            entry->Redo();
+
+        VG_INFO("[Undo/Redo] End Redo Group \"%s\" (0x%016X)", GetEntryName().c_str(), this);
+    }
+
+    //--------------------------------------------------------------------------------------
+    string UndoRedoEntryGroup::GetEntryName() const
+    {
+        return m_name;
+    }
+
+    //--------------------------------------------------------------------------------------
+    string UndoRedoEntryGroup::GetObjectName() const
+    {
+        return fmt::sprintf("%u Object%s", m_subEntries.size(), m_subEntries.size() > 1 ? "s" : "");
+    }
+
+    //--------------------------------------------------------------------------------------
+    string UndoRedoEntryGroup::GetDescription() const
+    {
+        return "";
+    }
+
+    //--------------------------------------------------------------------------------------
+    void UndoRedoEntryGroup::AddSubEntry(IUndoRedoEntry * _subEntry)
+    {
+        m_subEntries.push_back(_subEntry);
+    }
+
+    //--------------------------------------------------------------------------------------
+    const vector<IUndoRedoEntry *> * UndoRedoEntryGroup::GetSubEntries() const
+    {
+        return &m_subEntries;
+    }
+}
diff --git a/src/core/UndoRedo/UndoRedoManager.h b/src/core/UndoRedo/UndoRedoManager.h
@@ -2,6 +2,7 @@
 
 #include "core/IUndoRedo.h"
 #include "UndoRedoEntry.h"
+#include "UndoRedoEntryGroup.h"
 
 namespace vg::core
 {

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -159,6 +159,8 @@
     <ClInclude Include="UndoRedo\UndoRedo.h" />
     <ClInclude Include="UndoRedo\UndoRedoEntry.h" />
     <ClInclude Include="UndoRedo\UndoRedoEntry.hpp" />
+    <ClInclude Include="UndoRedo\UndoRedoEntryGroup.h" />
+    <ClInclude Include="UndoRedo\UndoRedoEntryGroup.hpp" />
     <ClInclude Include="UndoRedo\UndoRedoManager.h" />
     <ClInclude Include="UndoRedo\UndoRedoManager.hpp" />
     <ClInclude Include="UndoRedo\UndoRedo_consts.h" />

diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
@@ -441,6 +441,12 @@
     <ClInclude Include="UndoRedo\Entry\UndoRedoPropertyEntry.hpp">
       <Filter>UndoRedo\Entry</Filter>
     </ClInclude>
+    <ClInclude Include="UndoRedo\UndoRedoEntryGroup.h">
+      <Filter>UndoRedo</Filter>
+    </ClInclude>
+    <ClInclude Include="UndoRedo\UndoRedoEntryGroup.hpp">
+      <Filter>UndoRedo</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Math\Math.cpp">

diff --git a/src/editor/ImGui/Extensions/ImGuiExtensions.cpp b/src/editor/ImGui/Extensions/ImGuiExtensions.cpp
@@ -446,13 +446,13 @@ namespace ImGui
     void PushStyle(FontStyle _style)
     {
         auto * imGuiAdapter = Editor::get()->getRenderer()->GetImGuiAdapter();
-        imGuiAdapter->PushStyle(_style);
+        imGuiAdapter->PushFontStyle(_style);
     }
 
     //--------------------------------------------------------------------------------------
     void PopStyle()
     {
         auto * imGuiAdapter = Editor::get()->getRenderer()->GetImGuiAdapter();
-        imGuiAdapter->PopStyle();
+        imGuiAdapter->PopFontStyle();
     }
 }