Fixed reference not found when in game

adriengivry · adriengivry · commit 64947553ce53 · 2025-03-29T18:45:21.000-04:00
diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h b/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h
@@ -273,9 +273,9 @@ namespace OvCore::ECS
 
 		/**
 		* Add a behaviour to the actor
-		* @param p_name
+		* @param p_scriptPath
 		*/
-		Components::Behaviour& AddBehaviour(const std::string& p_name);
+		Components::Behaviour& AddBehaviour(const std::string& p_scriptPath);
 
 		/**
 		* Remove a behaviour by refering to the given instance
@@ -284,21 +284,22 @@ namespace OvCore::ECS
 		bool RemoveBehaviour(Components::Behaviour& p_behaviour);
 
 		/**
-		* Remove a behaviour by refering to his name
-		* @param p_name
+		* Remove a behaviour given its script name
+		* @param p_scriptName
 		*/
-		bool RemoveBehaviour(const std::string& p_name);
+		bool RemoveBehaviour(const std::string& p_scriptName);
 
 		/**
-		* Try to get the given behaviour (Returns nullptr on failure)
-		* @param p_name
+		* Try to get the behaviour by refering to the given script name.
+		* Returns nullptr on failure.
+		* @param p_scriptName
 		*/
-		Components::Behaviour* GetBehaviour(const std::string& p_name);
+		Components::Behaviour* GetBehaviour(const std::string& p_scriptName);
 
 		/**
 		* Returns a reference to the vector of behaviours
 		*/
-		std::unordered_map<std::string, Components::Behaviour>& GetBehaviours();
+		std::unordered_map<std::string, std::unique_ptr<Components::Behaviour>>& GetBehaviours();
 
 		/**
 		* Serialize all the components
@@ -355,7 +356,7 @@ namespace OvCore::ECS
 
 		/* Actors components */
 		std::vector<std::shared_ptr<Components::AComponent>> m_components;
-		std::unordered_map<std::string, Components::Behaviour> m_behaviours;
+		std::unordered_map<std::string, std::unique_ptr<Components::Behaviour>> m_behaviours;
 
 	public:
 		Components::CTransform& transform;
diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h
@@ -15,17 +15,17 @@ namespace OvCore::ECS { class Actor; }
 namespace OvCore::ECS::Components
 {
 	/**
-	* ABehaviour is the base class for any behaviour.
-	* A Behaviour is a script that is used to manipulate an actor over time
+	* A Behaviour is a script that can be attached to an actor
 	*/
 	class Behaviour : public AComponent
 	{
 	public:
 		/**
-		* Constructor of a ABehaviour (Must be called by derived classes)
+		* Constructor of a Behaviour
 		* @param p_owner
+		* @param p_scriptPath
 		*/
-		Behaviour(ECS::Actor& p_owner, const std::string& p_name);
+		Behaviour(ECS::Actor& p_owner, const std::string& p_scriptPath);
 
 		/**
 		* Destructor
@@ -37,6 +37,16 @@ namespace OvCore::ECS::Components
 		*/
 		virtual std::string GetName() override;
 
+		/**
+		* Returns the script name associated with this behaviour
+		*/
+		std::string GetScriptName() const;
+
+		/**
+		* Returns the path of the script associated with this behaviour
+		*/
+		std::string GetScriptPath() const;
+
 		/**
 		* Sets the script associated with this behaviour
 		* @param p_script
@@ -154,10 +164,9 @@ namespace OvCore::ECS::Components
 		*/
 		virtual void OnInspector(OvUI::Internal::WidgetContainer & p_root) override;
 
-	public:
-		const std::string name;
-
 	private:
+		const std::string m_scriptName;
+		const std::string m_scriptPath;
 		std::unique_ptr<Scripting::Script> m_script;
 	};
 }
diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp
@@ -23,6 +23,8 @@
 #include "OvCore/ECS/Components/CAmbientSphereLight.h"
 #include "OvCore/ECS/Components/CPostProcessStack.h"
 
+#include <OvDebug/Assertion.h>
+
 OvTools::Eventing::Event<OvCore::ECS::Actor&> OvCore::ECS::Actor::DestroyedEvent;
 OvTools::Eventing::Event<OvCore::ECS::Actor&> OvCore::ECS::Actor::CreatedEvent;
 OvTools::Eventing::Event<OvCore::ECS::Actor&, OvCore::ECS::Actor&> OvCore::ECS::Actor::AttachEvent;
@@ -61,7 +63,7 @@ OvCore::ECS::Actor::~Actor()
 	DetachFromParent();
 
 	std::for_each(m_components.begin(), m_components.end(), [&](std::shared_ptr<Components::AComponent> p_component) { ComponentRemovedEvent.Invoke(*p_component); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto& p_behaviour) { BehaviourRemovedEvent.Invoke(std::ref(p_behaviour.second)); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto& p_behaviour) { BehaviourRemovedEvent.Invoke(std::ref(*p_behaviour.second)); });
 	std::for_each(m_children.begin(), m_children.end(),		[](Actor* p_element) { delete p_element; });
 }
 
@@ -207,40 +209,40 @@ void OvCore::ECS::Actor::OnAwake()
 {
 	m_awaked = true;
 	std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnAwake(); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnAwake(); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnAwake(); });
 }
 
 void OvCore::ECS::Actor::OnStart()
 {
 	m_started = true;
 	std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnStart(); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnStart(); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnStart(); });
 }
 
 void OvCore::ECS::Actor::OnEnable()
 {
 	std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnEnable(); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnEnable(); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnEnable(); });
 }
 
 void OvCore::ECS::Actor::OnDisable()
 {
 	std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnDisable(); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnDisable(); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnDisable(); });
 }
 
 void OvCore::ECS::Actor::OnDestroy()
 {
 	std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnDestroy(); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnDestroy(); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnDestroy(); });
 }
 
 void OvCore::ECS::Actor::OnUpdate(float p_deltaTime)
 {
 	if (IsActive())
 	{
 		std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnUpdate(p_deltaTime); });
-		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnUpdate(p_deltaTime); });
+		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnUpdate(p_deltaTime); });
 	}
 }
 
@@ -249,7 +251,7 @@ void OvCore::ECS::Actor::OnFixedUpdate(float p_deltaTime)
 	if (IsActive())
 	{
 		std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnFixedUpdate(p_deltaTime); });
-		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnFixedUpdate(p_deltaTime); });
+		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnFixedUpdate(p_deltaTime); });
 	}
 }
 
@@ -258,44 +260,44 @@ void OvCore::ECS::Actor::OnLateUpdate(float p_deltaTime)
 	if (IsActive())
 	{
 		std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnLateUpdate(p_deltaTime); });
-		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnLateUpdate(p_deltaTime); });
+		std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnLateUpdate(p_deltaTime); });
 	}
 }
 
 void OvCore::ECS::Actor::OnCollisionEnter(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionEnter(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionEnter(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionEnter(p_otherObject); });
 }
 
 void OvCore::ECS::Actor::OnCollisionStay(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionStay(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionStay(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionStay(p_otherObject); });
 }
 
 void OvCore::ECS::Actor::OnCollisionExit(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionExit(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionExit(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionExit(p_otherObject); });
 }
 
 void OvCore::ECS::Actor::OnTriggerEnter(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerEnter(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerEnter(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerEnter(p_otherObject); });
 }
 
 void OvCore::ECS::Actor::OnTriggerStay(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerStay(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerStay(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerStay(p_otherObject); });
 }
 
 void OvCore::ECS::Actor::OnTriggerExit(Components::CPhysicalObject& p_otherObject)
 {
 	std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerExit(p_otherObject); });
-	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerExit(p_otherObject); });
+	std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerExit(p_otherObject); });
 }
 
 bool OvCore::ECS::Actor::RemoveComponent(OvCore::ECS::Components::AComponent& p_component)
@@ -318,10 +320,13 @@ std::vector<std::shared_ptr<OvCore::ECS::Components::AComponent>>& OvCore::ECS::
 	return m_components;
 }
 
-OvCore::ECS::Components::Behaviour & OvCore::ECS::Actor::AddBehaviour(const std::string & p_name)
+OvCore::ECS::Components::Behaviour & OvCore::ECS::Actor::AddBehaviour(const std::string& p_scriptPath)
 {
-	m_behaviours.try_emplace(p_name, *this, p_name);
-	Components::Behaviour& newInstance = m_behaviours.at(p_name);
+	auto behaviour = std::make_unique<Components::Behaviour>(*this, p_scriptPath);
+	const auto key = behaviour->GetScriptName();
+	m_behaviours.try_emplace(key, std::move(behaviour));
+
+	Components::Behaviour& newInstance = *m_behaviours.at(key);
 	BehaviourAddedEvent.Invoke(newInstance);
 	if (m_playing && IsActive())
 	{
@@ -338,42 +343,42 @@ bool OvCore::ECS::Actor::RemoveBehaviour(Components::Behaviour& p_behaviour)
 
 	for (auto& [name, behaviour] : m_behaviours)
 	{
-		if (&behaviour == &p_behaviour)
+		if (behaviour.get() == &p_behaviour)
 		{
 			found = true;
 			break;
 		}
 	}
 
 	if (found)
-		return RemoveBehaviour(p_behaviour.name);
+		return RemoveBehaviour(p_behaviour.GetScriptPath());
 	else
 		return false;
 }
 
-bool OvCore::ECS::Actor::RemoveBehaviour(const std::string & p_name)
+bool OvCore::ECS::Actor::RemoveBehaviour(const std::string& p_scriptName)
 {
-	Components::Behaviour* found = GetBehaviour(p_name);
+	Components::Behaviour* found = GetBehaviour(p_scriptName);
 	if (found)
 	{
 		BehaviourRemovedEvent.Invoke(*found);
-		return m_behaviours.erase(p_name);
+		return m_behaviours.erase(p_scriptName);
 	}
 	else
 	{
 		return false;
 	}
 }
 
-OvCore::ECS::Components::Behaviour* OvCore::ECS::Actor::GetBehaviour(const std::string& p_name)
+OvCore::ECS::Components::Behaviour* OvCore::ECS::Actor::GetBehaviour(const std::string& p_scriptName)
 {
-	if (auto result = m_behaviours.find(p_name); result != m_behaviours.end())
-		return &result->second;
+	if (auto result = m_behaviours.find(p_scriptName); result != m_behaviours.end())
+		return result->second.get();
 	else
 		return nullptr;
 }
 
-std::unordered_map<std::string, OvCore::ECS::Components::Behaviour>& OvCore::ECS::Actor::GetBehaviours()
+std::unordered_map<std::string, std::unique_ptr<OvCore::ECS::Components::Behaviour>>& OvCore::ECS::Actor::GetBehaviours()
 {
 	return m_behaviours;
 }
@@ -426,7 +431,7 @@ void OvCore::ECS::Actor::OnSerialize(tinyxml2::XMLDocument & p_doc, tinyxml2::XM
 		behaviourNode->InsertEndChild(data);
 
 		/* Data serialization of the behaviour */
-		behaviour.second.OnSerialize(p_doc, data);
+		behaviour.second->OnSerialize(p_doc, data);
 	}
 }
 
diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp
@@ -4,6 +4,8 @@
 * @licence: MIT
 */
 
+#include <filesystem>
+
 #include <OvUI/Widgets/Texts/TextColored.h>
 #include <OvDebug/Logger.h>
 
@@ -12,8 +14,10 @@
 #include <OvCore/Global/ServiceLocator.h>
 #include <OvCore/Scripting/ScriptEngine.h>
 
-OvCore::ECS::Components::Behaviour::Behaviour(ECS::Actor& p_owner, const std::string& p_name) :
-	name(p_name), AComponent(p_owner)
+OvCore::ECS::Components::Behaviour::Behaviour(ECS::Actor& p_owner, const std::string& p_scriptPath) :
+	m_scriptPath(p_scriptPath), 
+	m_scriptName(std::filesystem::path{ p_scriptPath }.stem().string()), // TODO: Ideally this could be returned by the script engine, so it would match the internal type name
+	AComponent(p_owner)
 {
 	OVSERVICE(Scripting::ScriptEngine).AddBehaviour(*this);
 }
@@ -28,6 +32,16 @@ std::string OvCore::ECS::Components::Behaviour::GetName()
 	return "Behaviour";
 }
 
+std::string OvCore::ECS::Components::Behaviour::GetScriptName() const
+{
+	return m_scriptName;
+}
+
+std::string OvCore::ECS::Components::Behaviour::GetScriptPath() const
+{
+	return m_scriptPath;
+}
+
 void OvCore::ECS::Components::Behaviour::SetScript(std::unique_ptr<Scripting::Script>&& p_scriptContext)
 {
 	m_script = std::move(p_scriptContext);
diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/Lua/LuaScriptEngine.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/Lua/LuaScriptEngine.cpp
@@ -115,7 +115,7 @@ void OvCore::Scripting::LuaScriptEngine::CreateContext()
 	std::for_each(m_context.behaviours.begin(), m_context.behaviours.end(),
 		[this](std::reference_wrapper<OvCore::ECS::Components::Behaviour> behaviour)
 		{
-			if (!RegisterBehaviour(*m_context.luaState, behaviour.get(), m_context.scriptRootFolder + behaviour.get().name))
+			if (!RegisterBehaviour(*m_context.luaState, behaviour.get(), m_context.scriptRootFolder + behaviour.get().GetScriptPath()))
 			{
 				++m_context.errorCount;
 			}
@@ -180,7 +180,7 @@ void OvCore::Scripting::LuaScriptEngineBase::AddBehaviour(OvCore::ECS::Component
 
 	m_context.behaviours.push_back(std::ref(p_toAdd));
 
-	if (!RegisterBehaviour(*m_context.luaState, p_toAdd, m_context.scriptRootFolder + p_toAdd.name))
+	if (!RegisterBehaviour(*m_context.luaState, p_toAdd, m_context.scriptRootFolder + p_toAdd.GetScriptPath()))
 	{
 		++m_context.errorCount;
 	}
diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp
@@ -281,7 +281,7 @@ void OvEditor::Panels::Inspector::CreateActorInspector(OvCore::ECS::Actor& p_tar
 	auto& behaviours = p_target.GetBehaviours();
 
 	for (auto&[name, behaviour] : behaviours)
-		DrawBehaviour(behaviour);
+		DrawBehaviour(*behaviour);
 }
 
 void OvEditor::Panels::Inspector::DrawComponent(OvCore::ECS::Components::AComponent& p_component)
@@ -305,7 +305,7 @@ void OvEditor::Panels::Inspector::DrawBehaviour(OvCore::ECS::Components::Behavio
 {
 	if (auto inspectorItem = dynamic_cast<OvCore::API::IInspectorItem*>(&p_behaviour); inspectorItem)
 	{
-		auto& header = m_actorInfo->CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>(p_behaviour.name);
+		auto& header = m_actorInfo->CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>(p_behaviour.GetName());
 		header.closable = true;
 		header.CloseEvent += [this, &header, &p_behaviour]
 		{

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`#include "OvCore/ECS/Components/CAmbientSphereLight.h"`
`24`	`24`	`#include "OvCore/ECS/Components/CPostProcessStack.h"`
`25`	`25`
	`26`	`+#include <OvDebug/Assertion.h>`
	`27`	`+`
`26`	`28`	`OvTools::Eventing::Event<OvCore::ECS::Actor&> OvCore::ECS::Actor::DestroyedEvent;`
`27`	`29`	`OvTools::Eventing::Event<OvCore::ECS::Actor&> OvCore::ECS::Actor::CreatedEvent;`
`28`	`30`	`OvTools::Eventing::Event<OvCore::ECS::Actor&, OvCore::ECS::Actor&> OvCore::ECS::Actor::AttachEvent;`
`@@ -61,7 +63,7 @@ OvCore::ECS::Actor::~Actor()`
`61`	`63`	`DetachFromParent();`
`62`	`64`
`63`	`65`	`std::for_each(m_components.begin(), m_components.end(), [&](std::shared_ptr<Components::AComponent> p_component) { ComponentRemovedEvent.Invoke(*p_component); });`
`64`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto& p_behaviour) { BehaviourRemovedEvent.Invoke(std::ref(p_behaviour.second)); });`
	`66`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto& p_behaviour) { BehaviourRemovedEvent.Invoke(std::ref(*p_behaviour.second)); });`
`65`	`67`	`std::for_each(m_children.begin(), m_children.end(), [](Actor* p_element) { delete p_element; });`
`66`	`68`	`}`
`67`	`69`
`@@ -207,40 +209,40 @@ void OvCore::ECS::Actor::OnAwake()`
`207`	`209`	`{`
`208`	`210`	`m_awaked = true;`
`209`	`211`	`std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnAwake(); });`
`210`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnAwake(); });`
	`212`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnAwake(); });`
`211`	`213`	`}`
`212`	`214`
`213`	`215`	`void OvCore::ECS::Actor::OnStart()`
`214`	`216`	`{`
`215`	`217`	`m_started = true;`
`216`	`218`	`std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnStart(); });`
`217`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnStart(); });`
	`219`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnStart(); });`
`218`	`220`	`}`
`219`	`221`
`220`	`222`	`void OvCore::ECS::Actor::OnEnable()`
`221`	`223`	`{`
`222`	`224`	`std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnEnable(); });`
`223`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnEnable(); });`
	`225`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnEnable(); });`
`224`	`226`	`}`
`225`	`227`
`226`	`228`	`void OvCore::ECS::Actor::OnDisable()`
`227`	`229`	`{`
`228`	`230`	`std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnDisable(); });`
`229`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnDisable(); });`
	`231`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnDisable(); });`
`230`	`232`	`}`
`231`	`233`
`232`	`234`	`void OvCore::ECS::Actor::OnDestroy()`
`233`	`235`	`{`
`234`	`236`	`std::for_each(m_components.begin(), m_components.end(), [](auto element) { element->OnDestroy(); });`
`235`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second.OnDestroy(); });`
	`237`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [](auto & element) { element.second->OnDestroy(); });`
`236`	`238`	`}`
`237`	`239`
`238`	`240`	`void OvCore::ECS::Actor::OnUpdate(float p_deltaTime)`
`239`	`241`	`{`
`240`	`242`	`if (IsActive())`
`241`	`243`	`{`
`242`	`244`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnUpdate(p_deltaTime); });`
`243`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnUpdate(p_deltaTime); });`
	`245`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnUpdate(p_deltaTime); });`
`244`	`246`	`}`
`245`	`247`	`}`
`246`	`248`
`@@ -249,7 +251,7 @@ void OvCore::ECS::Actor::OnFixedUpdate(float p_deltaTime)`
`249`	`251`	`if (IsActive())`
`250`	`252`	`{`
`251`	`253`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnFixedUpdate(p_deltaTime); });`
`252`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnFixedUpdate(p_deltaTime); });`
	`254`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnFixedUpdate(p_deltaTime); });`
`253`	`255`	`}`
`254`	`256`	`}`
`255`	`257`
`@@ -258,44 +260,44 @@ void OvCore::ECS::Actor::OnLateUpdate(float p_deltaTime)`
`258`	`260`	`if (IsActive())`
`259`	`261`	`{`
`260`	`262`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnLateUpdate(p_deltaTime); });`
`261`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnLateUpdate(p_deltaTime); });`
	`263`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnLateUpdate(p_deltaTime); });`
`262`	`264`	`}`
`263`	`265`	`}`
`264`	`266`
`265`	`267`	`void OvCore::ECS::Actor::OnCollisionEnter(Components::CPhysicalObject& p_otherObject)`
`266`	`268`	`{`
`267`	`269`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionEnter(p_otherObject); });`
`268`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionEnter(p_otherObject); });`
	`270`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionEnter(p_otherObject); });`
`269`	`271`	`}`
`270`	`272`
`271`	`273`	`void OvCore::ECS::Actor::OnCollisionStay(Components::CPhysicalObject& p_otherObject)`
`272`	`274`	`{`
`273`	`275`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionStay(p_otherObject); });`
`274`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionStay(p_otherObject); });`
	`276`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionStay(p_otherObject); });`
`275`	`277`	`}`
`276`	`278`
`277`	`279`	`void OvCore::ECS::Actor::OnCollisionExit(Components::CPhysicalObject& p_otherObject)`
`278`	`280`	`{`
`279`	`281`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnCollisionExit(p_otherObject); });`
`280`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnCollisionExit(p_otherObject); });`
	`282`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnCollisionExit(p_otherObject); });`
`281`	`283`	`}`
`282`	`284`
`283`	`285`	`void OvCore::ECS::Actor::OnTriggerEnter(Components::CPhysicalObject& p_otherObject)`
`284`	`286`	`{`
`285`	`287`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerEnter(p_otherObject); });`
`286`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerEnter(p_otherObject); });`
	`288`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerEnter(p_otherObject); });`
`287`	`289`	`}`
`288`	`290`
`289`	`291`	`void OvCore::ECS::Actor::OnTriggerStay(Components::CPhysicalObject& p_otherObject)`
`290`	`292`	`{`
`291`	`293`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerStay(p_otherObject); });`
`292`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerStay(p_otherObject); });`
	`294`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerStay(p_otherObject); });`
`293`	`295`	`}`
`294`	`296`
`295`	`297`	`void OvCore::ECS::Actor::OnTriggerExit(Components::CPhysicalObject& p_otherObject)`
`296`	`298`	`{`
`297`	`299`	`std::for_each(m_components.begin(), m_components.end(), [&](auto element) { element->OnTriggerExit(p_otherObject); });`
`298`		`- std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second.OnTriggerExit(p_otherObject); });`
	`300`	`+ std::for_each(m_behaviours.begin(), m_behaviours.end(), [&](auto & element) { element.second->OnTriggerExit(p_otherObject); });`
`299`	`301`	`}`
`300`	`302`
`301`	`303`	`bool OvCore::ECS::Actor::RemoveComponent(OvCore::ECS::Components::AComponent& p_component)`
`@@ -318,10 +320,13 @@ std::vector<std::shared_ptr<OvCore::ECS::Components::AComponent>>& OvCore::ECS::`
`318`	`320`	`return m_components;`
`319`	`321`	`}`
`320`	`322`
`321`		`-OvCore::ECS::Components::Behaviour & OvCore::ECS::Actor::AddBehaviour(const std::string & p_name)`
	`323`	`+OvCore::ECS::Components::Behaviour & OvCore::ECS::Actor::AddBehaviour(const std::string& p_scriptPath)`
`322`	`324`	`{`
`323`		`- m_behaviours.try_emplace(p_name, *this, p_name);`
`324`		`- Components::Behaviour& newInstance = m_behaviours.at(p_name);`
	`325`	`+ auto behaviour = std::make_unique<Components::Behaviour>(*this, p_scriptPath);`
	`326`	`+ const auto key = behaviour->GetScriptName();`
	`327`	`+ m_behaviours.try_emplace(key, std::move(behaviour));`
	`328`	`+`
	`329`	`+ Components::Behaviour& newInstance = *m_behaviours.at(key);`
`325`	`330`	`BehaviourAddedEvent.Invoke(newInstance);`
`326`	`331`	`if (m_playing && IsActive())`
`327`	`332`	`{`
`@@ -338,42 +343,42 @@ bool OvCore::ECS::Actor::RemoveBehaviour(Components::Behaviour& p_behaviour)`
`338`	`343`
`339`	`344`	`for (auto& [name, behaviour] : m_behaviours)`
`340`	`345`	`{`
`341`		`- if (&behaviour == &p_behaviour)`
	`346`	`+ if (behaviour.get() == &p_behaviour)`
`342`	`347`	`{`
`343`	`348`	`found = true;`
`344`	`349`	`break;`
`345`	`350`	`}`
`346`	`351`	`}`
`347`	`352`
`348`	`353`	`if (found)`
`349`		`- return RemoveBehaviour(p_behaviour.name);`
	`354`	`+ return RemoveBehaviour(p_behaviour.GetScriptPath());`
`350`	`355`	`else`
`351`	`356`	`return false;`
`352`	`357`	`}`
`353`	`358`
`354`		`-bool OvCore::ECS::Actor::RemoveBehaviour(const std::string & p_name)`
	`359`	`+bool OvCore::ECS::Actor::RemoveBehaviour(const std::string& p_scriptName)`
`355`	`360`	`{`
`356`		`- Components::Behaviour* found = GetBehaviour(p_name);`
	`361`	`+ Components::Behaviour* found = GetBehaviour(p_scriptName);`
`357`	`362`	`if (found)`
`358`	`363`	`{`
`359`	`364`	`BehaviourRemovedEvent.Invoke(*found);`
`360`		`- return m_behaviours.erase(p_name);`
	`365`	`+ return m_behaviours.erase(p_scriptName);`
`361`	`366`	`}`
`362`	`367`	`else`
`363`	`368`	`{`
`364`	`369`	`return false;`
`365`	`370`	`}`
`366`	`371`	`}`
`367`	`372`
`368`		`-OvCore::ECS::Components::Behaviour* OvCore::ECS::Actor::GetBehaviour(const std::string& p_name)`
	`373`	`+OvCore::ECS::Components::Behaviour* OvCore::ECS::Actor::GetBehaviour(const std::string& p_scriptName)`
`369`	`374`	`{`
`370`		`- if (auto result = m_behaviours.find(p_name); result != m_behaviours.end())`
`371`		`- return &result->second;`
	`375`	`+ if (auto result = m_behaviours.find(p_scriptName); result != m_behaviours.end())`
	`376`	`+ return result->second.get();`
`372`	`377`	`else`
`373`	`378`	`return nullptr;`
`374`	`379`	`}`
`375`	`380`
`376`		`-std::unordered_map<std::string, OvCore::ECS::Components::Behaviour>& OvCore::ECS::Actor::GetBehaviours()`
	`381`	`+std::unordered_map<std::string, std::unique_ptr<OvCore::ECS::Components::Behaviour>>& OvCore::ECS::Actor::GetBehaviours()`
`377`	`382`	`{`
`378`	`383`	`return m_behaviours;`
`379`	`384`	`}`
`@@ -426,7 +431,7 @@ void OvCore::ECS::Actor::OnSerialize(tinyxml2::XMLDocument & p_doc, tinyxml2::XM`
`426`	`431`	`behaviourNode->InsertEndChild(data);`
`427`	`432`
`428`	`433`	`/* Data serialization of the behaviour */`
`429`		`- behaviour.second.OnSerialize(p_doc, data);`
	`434`	`+ behaviour.second->OnSerialize(p_doc, data);`
`430`	`435`	`}`
`431`	`436`	`}`
`432`	`437`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void OvCore::Scripting::LuaScriptEngine::CreateContext()`
`115`	`115`	`std::for_each(m_context.behaviours.begin(), m_context.behaviours.end(),`
`116`	`116`	`[this](std::reference_wrapper<OvCore::ECS::Components::Behaviour> behaviour)`
`117`	`117`	`{`
`118`		`- if (!RegisterBehaviour(*m_context.luaState, behaviour.get(), m_context.scriptRootFolder + behaviour.get().name))`
	`118`	`+ if (!RegisterBehaviour(*m_context.luaState, behaviour.get(), m_context.scriptRootFolder + behaviour.get().GetScriptPath()))`
`119`	`119`	`{`
`120`	`120`	`++m_context.errorCount;`
`121`	`121`	`}`
`@@ -180,7 +180,7 @@ void OvCore::Scripting::LuaScriptEngineBase::AddBehaviour(OvCore::ECS::Component`
`180`	`180`
`181`	`181`	`m_context.behaviours.push_back(std::ref(p_toAdd));`
`182`	`182`
`183`		`- if (!RegisterBehaviour(*m_context.luaState, p_toAdd, m_context.scriptRootFolder + p_toAdd.name))`
	`183`	`+ if (!RegisterBehaviour(*m_context.luaState, p_toAdd, m_context.scriptRootFolder + p_toAdd.GetScriptPath()))`
`184`	`184`	`{`
`185`	`185`	`++m_context.errorCount;`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void OvEditor::Panels::Inspector::CreateActorInspector(OvCore::ECS::Actor& p_tar`
`281`	`281`	`auto& behaviours = p_target.GetBehaviours();`
`282`	`282`
`283`	`283`	`for (auto&[name, behaviour] : behaviours)`
`284`		`- DrawBehaviour(behaviour);`
	`284`	`+ DrawBehaviour(*behaviour);`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`void OvEditor::Panels::Inspector::DrawComponent(OvCore::ECS::Components::AComponent& p_component)`
`@@ -305,7 +305,7 @@ void OvEditor::Panels::Inspector::DrawBehaviour(OvCore::ECS::Components::Behavio`
`305`	`305`	`{`
`306`	`306`	`if (auto inspectorItem = dynamic_cast<OvCore::API::IInspectorItem*>(&p_behaviour); inspectorItem)`
`307`	`307`	`{`
`308`		`- auto& header = m_actorInfo->CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>(p_behaviour.name);`
	`308`	`+ auto& header = m_actorInfo->CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>(p_behaviour.GetName());`
`309`	`309`	`header.closable = true;`
`310`	`310`	`header.CloseEvent += [this, &header, &p_behaviour]`
`311`	`311`	`{`