4 files changed, 78 insertions, 4 deletions
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 5862bae..a040608 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -90,6 +90,18 @@ protected:
 	 */
 	template <typename T>
 	RefVector<T> get_components_by_id(game_object_id_t id) const;
+	/**
+	 * \copydoc ComponentManager::get_components_by_name
+	 * \see ComponentManager::get_components_by_name
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_name(const std::string & name) const;
+	/**
+	 * \copydoc ComponentManager::get_components_by_tag
+	 * \see ComponentManager::get_components_by_tag
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_tag(const std::string & tag) const;
 
 	/**
 	 * \brief Log a message using Log::logf
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 45f1ff1..16e0dc5 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -20,10 +20,7 @@ T & Script::get_component() const {
 
 template <typename T>
 RefVector<T> Script::get_components() const {
-	Mediator & mediator = this->mediator;
-	ComponentManager & mgr = mediator.component_manager;
-
-	return mgr.get_components_by_id<T>(this->game_object_id);
+	return this->get_components_by_id<T>(this->game_object_id);
 }
 
 template <typename... Args>
@@ -56,4 +53,26 @@ void Script::subscribe(const EventHandler<EventType> & callback) {
 	this->subscribe_internal(callback, EventManager::CHANNEL_ALL);
 }
 
+template <typename T>
+RefVector<T> Script::get_components_by_id(game_object_id_t id) const {
+	Mediator & mediator = this->mediator;
+	ComponentManager & mgr = mediator.component_manager;
+
+	return mgr.get_components_by_id<T>(id);
+}
+template <typename T>
+RefVector<T> Script::get_components_by_name(const std::string & name) const {
+	Mediator & mediator = this->mediator;
+	ComponentManager & mgr = mediator.component_manager;
+
+	return mgr.get_components_by_name<T>(name);
+}
+template <typename T>
+RefVector<T> Script::get_components_by_tag(const std::string & tag) const {
+	Mediator & mediator = this->mediator;
+	ComponentManager & mgr = mediator.component_manager;
+
+	return mgr.get_components_by_tag<T>(tag);
+}
+
 } // namespace crepe
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index 5f2cf3c..4e53954 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -135,10 +135,30 @@ public:
 	 */
 	template <typename T>
 	RefVector<T> get_components_by_type() const;
+	/**
+	 * \brief Get all components of a specific type on a GameObject with name \c name
+	 * 
+	 * \tparam T The type of the component
+	 * \param name Metadata::name for the same game_object_id as the returned components
+	 * \return Components matching criteria
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_name(const std::string & name) const;
+	/**
+	 * \brief Get all components of a specific type on a GameObject with tag \c tag
+	 * 
+	 * \tparam T The type of the component
+	 * \param name Metadata::tag for the same game_object_id as the returned components
+	 * \return Components matching criteria
+	 */
+	template <typename T>
+	RefVector<T> get_components_by_tag(const std::string & tag) const;
 
 private:
 	template <typename T>
 	std::set<game_object_id_t> get_objects_by_predicate(const std::function<bool (const T &)> & pred) const;
+	template <typename T>
+	RefVector<T> get_components_by_ids(const std::set<game_object_id_t> & ids) const;
 
 	std::set<game_object_id_t> get_objects_by_name(const std::string & name) const;
 	std::set<game_object_id_t> get_objects_by_tag(const std::string & tag) const;
diff --git a/src/crepe/manager/ComponentManager.hpp b/src/crepe/manager/ComponentManager.hpp
index 25c2747..52df368 100644
--- a/src/crepe/manager/ComponentManager.hpp
+++ b/src/crepe/manager/ComponentManager.hpp
@@ -167,4 +167,27 @@ std::set<game_object_id_t> ComponentManager::get_objects_by_predicate(const std:
 	return objects;
 }
 
+template <typename T>
+RefVector<T> ComponentManager::get_components_by_ids(const std::set<game_object_id_t> & ids) const {
+	using namespace std;
+	
+	RefVector<T> out = {};
+	for (game_object_id_t id : ids) {
+		RefVector<T> components = get_components_by_id<T>(id);
+		out.insert(out.end(), components.begin(), components.end());
+	}
+
+	return out;
+}
+
+template <typename T>
+RefVector<T> ComponentManager::get_components_by_name(const std::string & name) const {
+	return this->get_components_by_ids<T>(this->get_objects_by_name(name));
+}
+
+template <typename T>
+RefVector<T> ComponentManager::get_components_by_tag(const std::string & tag) const {
+	return this->get_components_by_ids<T>(this->get_objects_by_tag(tag));
+}
+
 } // namespace crepe