Добавил фильтрацию по типу в GetActorsByTag

Core/Game/World/World.hpp

@@ -31,10 +31,10 @@ public:
     void load(std::shared_ptr<SaveMap> save) override;
 #pragma endregion
     
-    template<class T, class Container = std::vector<std::weak_ptr<T>>>
+    template<class T, template<class...> class Container = std::vector>
-    Container GetActorsByClass()
+    Container<std::weak_ptr<T>> GetActorsByClass()
     {
-        Container list;
+        Container<std::weak_ptr<T>> list;
         for (auto i = actors_map.cbegin(); i != actors_map.cend(); ++i)
         {
             if (RTTI::dyn_cast<T, Actor>(i->second.get()))
@@ -57,18 +57,21 @@ public:
 
     void DestroyActor(std::weak_ptr<Actor> ptr);
 
-    template<class T, class Container = std::vector<std::weak_ptr<T>>>
+    template<class T, template<class...> class Container = std::vector>
-    Container GetActorsByTag(std::string tag)
+    Container<std::weak_ptr<T>> GetActorsByTag(std::string tag)
     {
-        Container container;
+        Container<std::weak_ptr<T>> container;
 
         for (auto& i : actors_map)
         {
-            const std::list<std::string>& tags = i.second->GetTags();
+            if (RTTI::dyn_cast<T, Actor>(i.second.get()))
-            for (auto& j : tags)
             {
-                if (j == tag)
+                const std::list<std::string>& tags = i.second->GetTags();
-                    container.push_back(i.second);
+                for (auto& j : tags)
+                {
+                    if (j == tag)
+                        container.push_back(i.second);
+                }
             }
         }
         

Tests/World/WorldTest.cpp

@@ -175,7 +175,7 @@ R"(
 	CoreInstance tmp_core;
 	
 	// Test find by class
-	std::vector<std::weak_ptr<TestActor>> test_actors = tmp_core.GetGameInstance()->GetWorld()->GetActorsByClass<TestActor>();
+	std::list<std::weak_ptr<TestActor>> test_actors = tmp_core.GetGameInstance()->GetWorld()->GetActorsByClass<TestActor, std::list>();
 	ASSERT_EQ(test_actors.size(), 1);
 	
 	// Test find by tag