#5623: Start creating a few object types to define a merge operation

libs/scene/merge/MergeAction.h

@@ -0,0 +1,36 @@
+#pragma once
+
+namespace scene
+{ 
+
+namespace merge
+{
+
+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.
+class MergeAction
+{
+private:
+    ActionType _type;
+
+public:
+    MergeAction(ActionType type) :
+        _type(type)
+    {}
+
+    ActionType getType() const
+    {
+        return _type;
+    }
+};
+
+
+}
+
+}

libs/scene/merge/MergeOperation.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <list>
+#include <memory>
+#include "../SceneGraphComparer.h"
+#include "MergeAction.h"
+
+namespace scene
+{
+
+namespace merge
+{
+
+// A MergeOperation groups one or more merge actions
+// together in order to apply a set of changes to an existing map
+class MergeOperation
+{
+private:
+    std::list<MergeAction> _actions;
+
+public:
+    using Ptr = std::shared_ptr<MergeOperation>;
+
+    static MergeOperation::Ptr CreateFromComparisonResult(const ComparisonResult& comparisonResult)
+    {
+        return std::make_shared<MergeOperation>();
+    }
+};
+
+}
+
+}

tools/msvc/scenelib.vcxproj

@@ -137,6 +137,8 @@
     <ClInclude Include="..\..\libs\scene\InstanceWalkers.h" />
     <ClInclude Include="..\..\libs\scene\LayerUsageBreakdown.h" />
     <ClInclude Include="..\..\libs\scene\LayerValidityCheckWalker.h" />
+    <ClInclude Include="..\..\libs\scene\merge\MergeAction.h" />
+    <ClInclude Include="..\..\libs\scene\merge\MergeOperation.h" />
     <ClInclude Include="..\..\libs\scene\ModelBreakdown.h" />
     <ClInclude Include="..\..\libs\scene\ModelFinder.h" />
     <ClInclude Include="..\..\libs\scene\Node.h" />

tools/msvc/scenelib.vcxproj.filters

@@ -4,6 +4,9 @@
     <Filter Include="scene">
       <UniqueIdentifier>{7effd458-1286-4c86-a9c4-cd4922f14c82}</UniqueIdentifier>
     </Filter>
+    <Filter Include="scene\merge">
+      <UniqueIdentifier>{b3592cff-e97d-4da2-ade5-caef2835f906}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\scene\InstanceWalkers.cpp">
@@ -103,5 +106,11 @@
     <ClInclude Include="..\..\libs\scene\SceneGraphComparer.h">
       <Filter>scene</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\scene\merge\MergeAction.h">
+      <Filter>scene\merge</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libs\scene\merge\MergeOperation.h">
+      <Filter>scene\merge</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>