#5623: MergeAction type is now abstract

codereader · May 24, 2021 · c462f68 · c462f68
1 parent 4eb10c4
commit c462f68
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 9 deletions.
diff --git a/libs/scene/CMakeLists.txt b/libs/scene/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(scenegraph
             LayerUsageBreakdown.cpp
             ModelFinder.cpp
             Node.cpp
+            merge/MergeOperation.cpp
             merge/GraphComparer.cpp
             SelectableNode.cpp
             SelectionIndex.cpp

diff --git a/libs/scene/merge/MergeAction.h b/libs/scene/merge/MergeAction.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 namespace scene
 { 
 
@@ -11,23 +13,30 @@ enum class ActionType
 
 };
 
-// Represents a single operation during a merge process
-// There are various types of actions, i.e. brush addition,
-// entity removal, keyvalue change, etc.
+// Represents a single step of a merge process, like adding a brush,
+// removing an entity, setting a keyvalue, etc.
 class MergeAction
 {
 private:
     ActionType _type;
 
-public:
+protected:
     MergeAction(ActionType type) :
         _type(type)
     {}
 
+public:
+    using Ptr = std::shared_ptr<MergeAction>;
+
     ActionType getType() const
     {
         return _type;
     }
+
+    // Applies this action, changing the nodes affecting by it
+    // It's the caller's responsibility to set up any Undo operations.
+    // Implementations are allowed to throw std::runtime_errors on failure.
+    virtual bool apply() = 0;
 };
 
 

diff --git a/libs/scene/merge/MergeOperation.cpp b/libs/scene/merge/MergeOperation.cpp
@@ -0,0 +1,18 @@
+#include "MergeOperation.h"
+
+namespace scene
+{
+
+namespace merge
+{
+
+MergeOperation::Ptr MergeOperation::CreateFromComparisonResult(const ComparisonResult& comparisonResult)
+{
+    // TODO
+
+    return std::make_shared<MergeOperation>();
+}
+
+}
+
+}
diff --git a/libs/scene/merge/MergeOperation.h b/libs/scene/merge/MergeOperation.h
@@ -16,15 +16,12 @@ namespace merge
 class MergeOperation
 {
 private:
-    std::list<MergeAction> _actions;
+    std::list<MergeAction::Ptr> _actions;
 
 public:
     using Ptr = std::shared_ptr<MergeOperation>;
 
-    static MergeOperation::Ptr CreateFromComparisonResult(const ComparisonResult& comparisonResult)
-    {
-        return std::make_shared<MergeOperation>();
-    }
+    static MergeOperation::Ptr CreateFromComparisonResult(const ComparisonResult& comparisonResult);
 };
 
 }

diff --git a/tools/msvc/scenelib.vcxproj b/tools/msvc/scenelib.vcxproj
@@ -118,6 +118,7 @@
     <ClCompile Include="..\..\libs\scene\InstanceWalkers.cpp" />
     <ClCompile Include="..\..\libs\scene\LayerUsageBreakdown.cpp" />
     <ClCompile Include="..\..\libs\scene\merge\GraphComparer.cpp" />
+    <ClCompile Include="..\..\libs\scene\merge\MergeOperation.cpp" />
     <ClCompile Include="..\..\libs\scene\ModelFinder.cpp" />
     <ClCompile Include="..\..\libs\scene\Node.cpp" />
     <ClCompile Include="..\..\libs\scene\SelectableNode.cpp" />

diff --git a/tools/msvc/scenelib.vcxproj.filters b/tools/msvc/scenelib.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClCompile Include="..\..\libs\scene\merge\GraphComparer.cpp">
       <Filter>scene\merge</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\scene\merge\MergeOperation.cpp">
+      <Filter>scene\merge</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\scene\InstanceWalkers.h">