#5108: Move NodeCounter helper to separate file

codereader · Nov 26, 2020 · 439f290 · 439f290
1 parent f096507
commit 439f290
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 26 deletions.
diff --git a/radiantcore/map/MapResource.cpp b/radiantcore/map/MapResource.cpp
@@ -36,6 +36,7 @@
 #include "infofile/InfoFileExporter.h"
 #include "scene/ChildPrimitives.h"
 #include "messages/MapFileOperation.h"
+#include "NodeCounter.h"
 
 namespace map
 {
@@ -50,32 +51,6 @@ namespace
 			path_is_absolute(name.c_str()) ? name : GlobalFileSystem().findFile(name)
 		);
 	}
-
-	class NodeCounter :
-		public scene::NodeVisitor
-	{
-	private:
-		std::size_t _count;
-	public:
-		NodeCounter() :
-			_count(0)
-		{}
-
-		bool pre(const scene::INodePtr& node)
-		{
-			if (Node_isPrimitive(node) || Node_isEntity(node))
-			{
-				_count++;
-			}
-
-			return true;
-		}
-
-		std::size_t getCount() const
-		{
-			return _count;
-		}
-	};
 }
 
 std::string MapResource::_infoFileExt;

diff --git a/radiantcore/map/NodeCounter.h b/radiantcore/map/NodeCounter.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "inode.h"
+#include "ientity.h"
+#include "scenelib.h"
+
+namespace map
+{
+
+class NodeCounter :
+    public scene::NodeVisitor
+{
+private:
+    std::size_t _count;
+public:
+    NodeCounter() :
+        _count(0)
+    {}
+
+    bool pre(const scene::INodePtr& node)
+    {
+        if (Node_isPrimitive(node) || Node_isEntity(node))
+        {
+            _count++;
+        }
+
+        return true;
+    }
+
+    std::size_t getCount() const
+    {
+        return _count;
+    }
+};
+
+}
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -847,6 +847,7 @@
     <ClInclude Include="..\..\radiantcore\map\namespace\Namespace.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\NamespaceFactory.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\UniqueNameSet.h" />
+    <ClInclude Include="..\..\radiantcore\map\NodeCounter.h" />
     <ClInclude Include="..\..\radiantcore\map\PointFile.h" />
     <ClInclude Include="..\..\radiantcore\map\RegionManager.h" />
     <ClInclude Include="..\..\radiantcore\map\RegionWalkers.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2043,5 +2043,8 @@
     <ClInclude Include="..\..\radiantcore\vfs\FileVisitor.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\NodeCounter.h">
+      <Filter>src\map</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>