#6021: Add IEntityClassManager::forEachEntityClass accepting a functi…

…on object
codereader · Jul 29, 2022 · ce7acbb · ce7acbb
1 parent bf24ebb
commit ce7acbb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/include/ieclass.h b/include/ieclass.h
@@ -301,6 +301,9 @@ class IEntityClassManager :
      */
     virtual void forEachEntityClass(EntityClassVisitor& visitor) = 0;
 
+    // Iterate over all entityDefs using the given function object
+    virtual void forEachEntityClass(const std::function<void(const IEntityClassPtr&)>& functor) = 0;
+
     /**
      * greebo: This reloads the entityDefs and modelDefs from all files. Does not
      * change the scenegraph, only the contents of the EClass objects are

diff --git a/radiantcore/eclass/EClassManager.cpp b/radiantcore/eclass/EClassManager.cpp
@@ -30,10 +30,18 @@ IEntityClassPtr EClassManager::findClass(const std::string& className)
 }
 
 void EClassManager::forEachEntityClass(EntityClassVisitor& visitor)
+{
+    forEachEntityClass([&](const IEntityClassPtr& eclass)
+    {
+        visitor.visit(eclass);
+    });
+}
+
+void EClassManager::forEachEntityClass(const std::function<void(const IEntityClassPtr&)>& functor)
 {
     GlobalDeclarationManager().foreachDeclaration(decl::Type::EntityDef, [&](const decl::IDeclaration::Ptr& decl)
     {
-        visitor.visit(std::static_pointer_cast<IEntityClass>(decl));
+        functor(std::static_pointer_cast<IEntityClass>(decl));
     });
 }
 

diff --git a/radiantcore/eclass/EClassManager.h b/radiantcore/eclass/EClassManager.h
@@ -31,6 +31,7 @@ class EClassManager final :
     IEntityClassPtr findOrInsert(const std::string& name, bool has_brushes) override;
     IEntityClassPtr findClass(const std::string& className) override;
     void forEachEntityClass(EntityClassVisitor& visitor) override;
+    void forEachEntityClass(const std::function<void(const IEntityClassPtr&)>& functor) override;
 
     // Find the modeldef with the given name
     IModelDef::Ptr findModel(const std::string& name) override;

diff --git a/test/EntityClass.cpp b/test/EntityClass.cpp
@@ -31,6 +31,22 @@ TEST_F(EntityClassTest, LookupEntityClass)
         GlobalEntityClassManager().findClass("LiGHT")) << "Lookup should be case-insensitive";
 }
 
+TEST_F(EntityClassTest, ForeachEntityClass)
+{
+    std::set<std::string> visitedNames;
+
+    // Nonexistent class should return null (but not throw or crash)
+    GlobalEntityClassManager().forEachEntityClass([&] (const IEntityClassPtr& eclass)
+    {
+        visitedNames.insert(eclass->getDeclName());
+    });
+
+    EXPECT_TRUE(visitedNames.count("light") > 0);
+    EXPECT_TRUE(visitedNames.count("light_extinguishable") > 0);
+    EXPECT_TRUE(visitedNames.count("dr:entity_using_modeldef") > 0);
+    EXPECT_TRUE(visitedNames.count("atdm:light_base") > 0);
+}
+
 TEST_F(EntityClassTest, EntityClassDefFilename)
 {
     auto cls = GlobalEntityClassManager().findClass("dr:entity_using_modeldef");