#5231: Move child primitive OriginAdder/OriginRemover algorithm to sc…

…enelib
codereader · May 24, 2020 · 78d1019 · 78d1019
1 parent fc015cb
commit 78d1019
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/radiant/map/algorithm/ChildPrimitives.cpp → libs/scene/ChildPrimitives.cpp b/radiant/map/algorithm/ChildPrimitives.cpp → libs/scene/ChildPrimitives.cpp
@@ -6,7 +6,7 @@
 
 #include "registry/registry.h"
 
-namespace map
+namespace scene
 {
 
 // Local helper to add origins
@@ -15,18 +15,18 @@ class OriginAdder :
 {
 public:
 	// NodeVisitor implementation
-	bool pre(const scene::INodePtr& node)
+	bool pre(const scene::INodePtr& node) override
 	{
 		Entity* entity = Node_getEntity(node);
 
 		// Check for an entity
-		if (entity != NULL)
+		if (entity != nullptr)
 		{
 			// greebo: Check for a Doom3Group
 			scene::GroupNodePtr groupNode = Node_getGroupNode(node);
 
 			// Don't handle the worldspawn children, they're safe&sound
-			if (groupNode != NULL && !entity->isWorldspawn())
+			if (groupNode && !entity->isWorldspawn())
 			{
 				groupNode->addOriginToChildren();
 				// Don't traverse the children
@@ -42,18 +42,18 @@ class OriginRemover :
 	public scene::NodeVisitor
 {
 public:
-	bool pre(const scene::INodePtr& node)
+	bool pre(const scene::INodePtr& node) override
 	{
 		Entity* entity = Node_getEntity(node);
 
 		// Check for an entity
-		if (entity != NULL)
+		if (entity != nullptr)
 		{
 			// greebo: Check for a Doom3Group
 			scene::GroupNodePtr groupNode = Node_getGroupNode(node);
 
 			// Don't handle the worldspawn children, they're safe&sound
-			if (groupNode != NULL && !entity->isWorldspawn())
+			if (groupNode && !entity->isWorldspawn())
 			{
 				groupNode->removeOriginFromChildren();
 				// Don't traverse the children

diff --git a/radiant/map/algorithm/ChildPrimitives.h → libs/scene/ChildPrimitives.h b/radiant/map/algorithm/ChildPrimitives.h → libs/scene/ChildPrimitives.h
@@ -5,7 +5,7 @@
 // Forward Decl.
 namespace scene { class INode; typedef std::shared_ptr<INode> INodePtr; }
 
-namespace map
+namespace scene
 {
 
 /**

diff --git a/libs/scene/Makefile.am b/libs/scene/Makefile.am
@@ -4,6 +4,7 @@ pkglib_LTLIBRARIES = libscenegraph.la
 libscenegraph_la_LDFLAGS = -release @PACKAGE_VERSION@ $(LIBSIGC_LIBS)
 libscenegraph_la_LIBADD = $(top_builddir)/libs/math/libmath.la
 libscenegraph_la_SOURCES = InstanceWalkers.cpp \
+			 			  ChildPrimitives.cpp \
 			 			  TraversableNodeSet.cpp \
 						  LayerUsageBreakdown.cpp \
 						  SelectableNode.cpp \

diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -304,7 +304,6 @@ darkradiant_SOURCES = main.cpp \
 					  map/infofile/InfoFile.cpp \
 					  map/infofile/InfoFileExporter.cpp \
                       map/MapFileManager.cpp \
-					  map/algorithm/ChildPrimitives.cpp \
                       map/algorithm/Skins.cpp \
                       map/algorithm/Traverse.cpp \
 					  map/algorithm/MapExporter.cpp \

diff --git a/radiant/map/Map.cpp b/radiant/map/Map.cpp
@@ -56,7 +56,7 @@
 #include "MapPropertyInfoFileModule.h"
 
 #include <fmt/format.h>
-#include "algorithm/ChildPrimitives.h"
+#include "scene/ChildPrimitives.h"
 
 namespace map 
 {

diff --git a/radiant/map/MapResource.cpp b/radiant/map/MapResource.cpp
@@ -34,7 +34,7 @@
 #include "algorithm/MapExporter.h"
 #include "algorithm/Import.h"
 #include "infofile/InfoFileExporter.h"
-#include "algorithm/ChildPrimitives.h"
+#include "scene/ChildPrimitives.h"
 #include "messages/MapFileOperation.h"
 
 namespace map
@@ -330,7 +330,7 @@ bool MapResource::loadFile(std::istream& mapStream, const MapFormat& format, con
 		reader->readFromStream(mapStream);
 
 		// Prepare child primitives
-		addOriginToChildPrimitives(root);
+		scene::addOriginToChildPrimitives(root);
 
 		if (!format.allowInfoFileCreation())
 		{

diff --git a/radiant/map/algorithm/Import.cpp b/radiant/map/algorithm/Import.cpp
@@ -11,7 +11,7 @@
 #include "ientity.h"
 #include "iscenegraph.h"
 #include "scene/BasicRootNode.h"
-#include "map/algorithm/ChildPrimitives.h"
+#include "scene/ChildPrimitives.h"
 #include "map/Map.h"
 #include "scenelib.h"
 #include "entitylib.h"
@@ -355,7 +355,7 @@ void importFromStream(std::istream& stream)
         reader->readFromStream(stream);
 
         // Prepare child primitives
-        addOriginToChildPrimitives(importFilter.getRootNode());
+        scene::addOriginToChildPrimitives(importFilter.getRootNode());
 
         // Adjust all new names to fit into the existing map namespace
         prepareNamesForImport(GlobalMap().getRoot(), importFilter.getRootNode());

diff --git a/radiant/map/algorithm/MapExporter.cpp b/radiant/map/algorithm/MapExporter.cpp
@@ -13,7 +13,7 @@
 #include "registry/registry.h"
 #include "string/string.h"
 
-#include "ChildPrimitives.h"
+#include "scene/ChildPrimitives.h"
 #include "messages/MapFileOperation.h"
 
 namespace map
@@ -258,7 +258,7 @@ void MapExporter::finishScene()
 	// Emit the post-export event to give subscribers a chance to cleanup the scene
 	GlobalMapResourceManager().signal_onResourceExported().emit(_root);
 
-	addOriginToChildPrimitives(_root);
+	scene::addOriginToChildPrimitives(_root);
 
 	// Re-evaluate all brushes, to update the Winding calculations
 	recalculateBrushWindings();

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -211,7 +211,6 @@
     <ClCompile Include="..\..\radiant\map\aas\Doom3AasFile.cpp" />
     <ClCompile Include="..\..\radiant\map\aas\Doom3AasFileLoader.cpp" />
     <ClCompile Include="..\..\radiant\map\aas\Doom3AasFileSettings.cpp" />
-    <ClCompile Include="..\..\radiant\map\algorithm\ChildPrimitives.cpp" />
     <ClCompile Include="..\..\radiant\map\algorithm\Export.cpp" />
     <ClCompile Include="..\..\radiant\map\algorithm\Import.cpp" />
     <ClCompile Include="..\..\radiant\map\algorithm\MapExporter.cpp" />
@@ -912,7 +911,6 @@
     <ClInclude Include="..\..\radiant\map\aas\Doom3AasFileLoader.h" />
     <ClInclude Include="..\..\radiant\map\aas\Doom3AasFileSettings.h" />
     <ClInclude Include="..\..\radiant\map\aas\Util.h" />
-    <ClInclude Include="..\..\radiant\map\algorithm\ChildPrimitives.h" />
     <ClInclude Include="..\..\radiant\map\algorithm\Export.h" />
     <ClInclude Include="..\..\radiant\map\algorithm\Import.h" />
     <ClInclude Include="..\..\radiant\map\algorithm\MapExporter.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -634,9 +634,6 @@
     <ClCompile Include="..\..\radiant\map\algorithm\MapExporter.cpp">
       <Filter>src\map\algorithm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\map\algorithm\ChildPrimitives.cpp">
-      <Filter>src\map\algorithm</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\map\algorithm\MapImporter.cpp">
       <Filter>src\map\algorithm</Filter>
     </ClCompile>
@@ -1632,9 +1629,6 @@
     <ClInclude Include="..\..\radiant\map\algorithm\MapExporter.h">
       <Filter>src\map\algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\map\algorithm\ChildPrimitives.h">
-      <Filter>src\map\algorithm</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\map\algorithm\MapImporter.h">
       <Filter>src\map\algorithm</Filter>
     </ClInclude>

diff --git a/tools/msvc/scenelib.vcxproj b/tools/msvc/scenelib.vcxproj
@@ -114,6 +114,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\libs\scene\ChildPrimitives.cpp" />
     <ClCompile Include="..\..\libs\scene\InstanceWalkers.cpp" />
     <ClCompile Include="..\..\libs\scene\LayerUsageBreakdown.cpp" />
     <ClCompile Include="..\..\libs\scene\Node.cpp" />
@@ -123,6 +124,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\scene\BasicRootNode.h" />
+    <ClInclude Include="..\..\libs\scene\ChildPrimitives.h" />
     <ClInclude Include="..\..\libs\scene\InstanceWalkers.h" />
     <ClInclude Include="..\..\libs\scene\LayerUsageBreakdown.h" />
     <ClInclude Include="..\..\libs\scene\LayerValidityCheckWalker.h" />

diff --git a/tools/msvc/scenelib.vcxproj.filters b/tools/msvc/scenelib.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClCompile Include="..\..\libs\scene\LayerUsageBreakdown.cpp">
       <Filter>scene</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\scene\ChildPrimitives.cpp">
+      <Filter>scene</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\scene\InstanceWalkers.h">
@@ -52,5 +55,8 @@
     <ClInclude Include="..\..\libs\scene\LayerUsageBreakdown.h">
       <Filter>scene</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\scene\ChildPrimitives.h">
+      <Filter>scene</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>