#5231: Move selection set manager to core binary

codereader · May 26, 2020 · 44239d8 · 44239d8
1 parent 983352b
commit 44239d8
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 35 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -210,10 +210,6 @@ darkradiant_SOURCES = main.cpp \
                       selection/shaderclipboard/ShaderClipboard.cpp \
                       selection/shaderclipboard/Texturable.cpp \
 					  selection/shaderclipboard/ClosestTexturableFinder.cpp \
-                      selection/selectionset/SelectionSetManager.cpp \
-					  selection/selectionset/SelectionSetInfoFileModule.cpp \
-                      selection/selectionset/SelectionSet.cpp \
-                      selection/selectionset/SelectionSetModule.cpp \
                       selection/ManipulateMouseTool.cpp \
                       selection/SelectionMouseTools.cpp \
                       selection/SelectionTest.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -187,6 +187,10 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 scenegraph/SceneGraph.cpp \
                 scenegraph/Octree.cpp \
                 scenegraph/SceneGraphFactory.cpp \
+                selection/selectionset/SelectionSetManager.cpp \
+                selection/selectionset/SelectionSetInfoFileModule.cpp \
+                selection/selectionset/SelectionSet.cpp \
+                selection/selectionset/SelectionSetModule.cpp \
                 settings/Game.cpp \
                 settings/GameManager.cpp \
                 settings/LanguageManager.cpp \

diff --git a/...t/selection/selectionset/SelectionSet.cpp → ...e/selection/selectionset/SelectionSet.cpp b/...t/selection/selectionset/SelectionSet.cpp → ...e/selection/selectionset/SelectionSet.cpp
diff --git a/...ant/selection/selectionset/SelectionSet.h → ...ore/selection/selectionset/SelectionSet.h b/...ant/selection/selectionset/SelectionSet.h → ...ore/selection/selectionset/SelectionSet.h
diff --git a/...lectionset/SelectionSetInfoFileModule.cpp → ...lectionset/SelectionSetInfoFileModule.cpp b/...lectionset/SelectionSetInfoFileModule.cpp → ...lectionset/SelectionSetInfoFileModule.cpp
diff --git a/...selectionset/SelectionSetInfoFileModule.h → ...selectionset/SelectionSetInfoFileModule.h b/...selectionset/SelectionSetInfoFileModule.h → ...selectionset/SelectionSetInfoFileModule.h
diff --git a/...tion/selectionset/SelectionSetManager.cpp → ...tion/selectionset/SelectionSetManager.cpp b/...tion/selectionset/SelectionSetManager.cpp → ...tion/selectionset/SelectionSetManager.cpp
diff --git a/...ection/selectionset/SelectionSetManager.h → ...ection/selectionset/SelectionSetManager.h b/...ection/selectionset/SelectionSetManager.h → ...ection/selectionset/SelectionSetManager.h
diff --git a/...ction/selectionset/SelectionSetModule.cpp → ...ction/selectionset/SelectionSetModule.cpp b/...ction/selectionset/SelectionSetModule.cpp → ...ction/selectionset/SelectionSetModule.cpp
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -255,8 +255,6 @@
     <ClCompile Include="..\..\radiant\selection\manipulators\ScaleManipulator.cpp" />
     <ClCompile Include="..\..\radiant\selection\manipulators\TranslateManipulator.cpp" />
     <ClCompile Include="..\..\radiant\selection\SelectionMouseTools.cpp" />
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetInfoFileModule.cpp" />
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetModule.cpp" />
     <ClCompile Include="..\..\radiant\selection\shaderclipboard\ClosestTexturableFinder.cpp" />
     <ClCompile Include="..\..\radiant\settings\Win32Registry.cpp" />
     <ClCompile Include="..\..\radiant\uimanager\animationpreview\AnimationPreview.cpp" />
@@ -351,8 +349,6 @@
     <ClCompile Include="..\..\radiant\selection\algorithm\Transformation.cpp" />
     <ClCompile Include="..\..\radiant\selection\shaderclipboard\ShaderClipboard.cpp" />
     <ClCompile Include="..\..\radiant\selection\shaderclipboard\Texturable.cpp" />
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSet.cpp" />
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetManager.cpp" />
     <ClCompile Include="..\..\radiant\textool\TexTool.cpp" />
     <ClCompile Include="..\..\radiant\textool\TexToolItem.cpp" />
     <ClCompile Include="..\..\radiant\textool\item\BrushItem.cpp" />
@@ -517,7 +513,6 @@
     <ClInclude Include="..\..\radiant\selection\Rectangle.h" />
     <ClInclude Include="..\..\radiant\selection\SelectionMouseTools.h" />
     <ClInclude Include="..\..\radiant\selection\SelectionPool.h" />
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSetInfoFileModule.h" />
     <ClInclude Include="..\..\radiant\selection\shaderclipboard\ClosestTexturableFinder.h" />
     <ClInclude Include="..\..\radiant\selection\SingleItemSelector.h" />
     <ClInclude Include="..\..\radiant\settings\Win32Registry.h" />
@@ -650,8 +645,6 @@
     <ClInclude Include="..\..\radiant\selection\algorithm\Transformation.h" />
     <ClInclude Include="..\..\radiant\selection\shaderclipboard\ShaderClipboard.h" />
     <ClInclude Include="..\..\radiant\selection\shaderclipboard\Texturable.h" />
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSet.h" />
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSetManager.h" />
     <ClInclude Include="..\..\radiant\textool\Rectangle.h" />
     <ClInclude Include="..\..\radiant\textool\RenderableItem.h" />
     <ClInclude Include="..\..\radiant\textool\Selectable.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -44,9 +44,6 @@
     <Filter Include="src\selection\shaderclipboard">
       <UniqueIdentifier>{5c72415f-9f2a-4004-b3d0-e470cd1a9a0f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\selection\selectionset">
-      <UniqueIdentifier>{98b000d2-c908-4b15-9fb2-88e115aa76ab}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\textool">
       <UniqueIdentifier>{d3a05c23-9351-4bd7-aaee-8f88331f691d}</UniqueIdentifier>
     </Filter>
@@ -376,12 +373,6 @@
     <ClCompile Include="..\..\radiant\selection\shaderclipboard\Texturable.cpp">
       <Filter>src\selection\shaderclipboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSet.cpp">
-      <Filter>src\selection\selectionset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetManager.cpp">
-      <Filter>src\selection\selectionset</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\textool\TexTool.cpp">
       <Filter>src\textool</Filter>
     </ClCompile>
@@ -706,9 +697,6 @@
     <ClCompile Include="..\..\radiant\map\infofile\InfoFileExporter.cpp">
       <Filter>src\map\infofile</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetInfoFileModule.cpp">
-      <Filter>src\selection\selectionset</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\selection\group\SelectionGroupManager.cpp">
       <Filter>src\selection\group</Filter>
     </ClCompile>
@@ -883,9 +871,6 @@
     <ClCompile Include="..\..\radiant\selection\group\SelectionGroupModule.cpp">
       <Filter>src\selection\group</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetModule.cpp">
-      <Filter>src\selection\selectionset</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\filters\FilterOrthoContextMenuItem.cpp">
       <Filter>src\ui\filters</Filter>
     </ClCompile>
@@ -1194,12 +1179,6 @@
     <ClInclude Include="..\..\radiant\selection\shaderclipboard\Texturable.h">
       <Filter>src\selection\shaderclipboard</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSet.h">
-      <Filter>src\selection\selectionset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSetManager.h">
-      <Filter>src\selection\selectionset</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\textool\Rectangle.h">
       <Filter>src\textool</Filter>
     </ClInclude>
@@ -1599,9 +1578,6 @@
     <ClInclude Include="..\..\radiant\map\infofile\InfoFileExporter.h">
       <Filter>src\map\infofile</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\selection\selectionset\SelectionSetInfoFileModule.h">
-      <Filter>src\selection\selectionset</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\selection\group\SelectionGroup.h">
       <Filter>src\selection\group</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -573,6 +573,10 @@
     <ClCompile Include="..\..\radiantcore\scenegraph\Octree.cpp" />
     <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraph.cpp" />
     <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraphFactory.cpp" />
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSet.cpp" />
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetInfoFileModule.cpp" />
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetManager.cpp" />
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetModule.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\Game.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\GameManager.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\LanguageManager.cpp" />
@@ -788,6 +792,9 @@
     <ClInclude Include="..\..\radiantcore\scenegraph\OctreeNode.h" />
     <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraph.h" />
     <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraphFactory.h" />
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSet.h" />
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSetInfoFileModule.h" />
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSetManager.h" />
     <ClInclude Include="..\..\radiantcore\settings\Game.h" />
     <ClInclude Include="..\..\radiantcore\settings\GameManager.h" />
     <ClInclude Include="..\..\radiantcore\settings\LanguageManager.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -143,6 +143,12 @@
     <Filter Include="src\map\aas">
       <UniqueIdentifier>{0799e008-2d85-402f-8199-9c5774ff619c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\selection">
+      <UniqueIdentifier>{9ba6ecb9-87db-464f-959a-58cefc9f7dbc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\selection\selectionset">
+      <UniqueIdentifier>{b8e4f7ae-68a0-4db3-a4d0-f6fa1a3c1128}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -694,6 +700,18 @@
     <ClCompile Include="..\..\radiantcore\map\aas\AasFileManager.cpp">
       <Filter>src\map\aas</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSet.cpp">
+      <Filter>src\selection\selectionset</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetInfoFileModule.cpp">
+      <Filter>src\selection\selectionset</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetManager.cpp">
+      <Filter>src\selection\selectionset</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\selection\selectionset\SelectionSetModule.cpp">
+      <Filter>src\selection\selectionset</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -1401,5 +1419,14 @@
     <ClInclude Include="..\..\radiantcore\map\aas\AasFileManager.h">
       <Filter>src\map\aas</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSet.h">
+      <Filter>src\selection\selectionset</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSetInfoFileModule.h">
+      <Filter>src\selection\selectionset</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\selection\selectionset\SelectionSetManager.h">
+      <Filter>src\selection\selectionset</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>