Scripts are now expected to be in assets folder

Author: adriengivry

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 + GetDefaultExtension()))
+			if (!RegisterBehaviour(*m_context.luaState, behaviour.get(), m_context.scriptRootFolder + behaviour.get().name))
 			{
 				++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 + GetDefaultExtension()))
+	if (!RegisterBehaviour(*m_context.luaState, p_toAdd, m_context.scriptRootFolder + p_toAdd.name))
 	{
 		++m_context.errorCount;
 	}
@@ -196,7 +196,7 @@ void OvCore::Scripting::LuaScriptEngineBase::RemoveBehaviour(OvCore::ECS::Compon
 
 	m_context.behaviours.erase(
 		std::remove_if(m_context.behaviours.begin(), m_context.behaviours.end(),
-			[&p_toRemove](std::reference_wrapper< OvCore::ECS::Components::Behaviour> behaviour) {
+			[&p_toRemove](std::reference_wrapper<OvCore::ECS::Components::Behaviour> behaviour) {
 				return &p_toRemove == &behaviour.get();
 			}
 		)

Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp

@@ -137,7 +137,7 @@ OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::st
 
 	/* Scripting */
 	scriptEngine = std::make_unique<OvCore::Scripting::ScriptEngine>();
-	scriptEngine->SetScriptRootFolder(projectScriptsPath);
+	scriptEngine->SetScriptRootFolder(projectAssetsPath);
 
 	/* Service Locator providing */
 	ServiceLocator::Provide<OvPhysics::Core::PhysicsEngine>(*physicsEngine);

Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp

@@ -793,17 +793,12 @@ void OvEditor::Core::EditorActions::PropagateFolderDestruction(std::string p_fol
 
 void OvEditor::Core::EditorActions::PropagateScriptRename(std::string p_previousName, std::string p_newName)
 {
-	p_previousName = GetScriptPath(p_previousName);
-	p_newName = GetScriptPath(p_newName);
-
 	if (auto currentScene = m_context.sceneManager.GetCurrentScene())
 		for (auto actor : currentScene->GetActors())
 			if (actor->RemoveBehaviour(p_previousName))
 				actor->AddBehaviour(p_newName);
 
 	PropagateFileRenameThroughSavedFilesOfType(p_previousName, p_newName, OvTools::Utils::PathParser::EFileType::SCENE);
-
-	EDITOR_PANEL(Panels::Inspector, "Inspector").Refresh();
 }
 
 void OvEditor::Core::EditorActions::PropagateFileRename(std::string p_previousName, std::string p_newName)
@@ -938,6 +933,9 @@ void OvEditor::Core::EditorActions::PropagateFileRename(std::string p_previousNa
 	case OvTools::Utils::PathParser::EFileType::SOUND:
 		PropagateFileRenameThroughSavedFilesOfType(p_previousName, p_newName, OvTools::Utils::PathParser::EFileType::SCENE);
 		break;
+	case OvTools::Utils::PathParser::EFileType::SCRIPT:
+		PropagateScriptRename(p_previousName, p_newName);
+		break;
 	}
 
 	EDITOR_PANEL(Panels::Inspector, "Inspector").Refresh();

Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp

@@ -1306,7 +1306,7 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod
 			std::make_pair(resourceFormatPath, &itemGroup)
 		);
 
-		contextMenu->RenamedEvent += [&ddSource, &clickableText, p_scriptFolder](std::string p_prev, std::string p_newPath)
+		contextMenu->RenamedEvent += [&ddSource, &clickableText](std::string p_prev, std::string p_newPath)
 		{
 			if (p_newPath != p_prev)
 			{
@@ -1316,16 +1316,9 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod
 					std::string elementName = OvTools::Utils::PathParser::GetElementName(p_newPath);
 					ddSource.data.first = OvTools::Utils::PathParser::GetContainingFolder(ddSource.data.first) + elementName;
 
-					if (!p_scriptFolder)
-					{
-						EDITOR_EXEC(PropagateFileRename(p_prev, p_newPath));
-						if (EDITOR_CONTEXT(sceneManager).GetCurrentSceneSourcePath() == p_prev) // Modify current scene source path if the renamed file is the current scene
-							EDITOR_CONTEXT(sceneManager).StoreCurrentSceneSourcePath(p_newPath);
-					}
-					else
-					{
-						EDITOR_EXEC(PropagateScriptRename(p_prev, p_newPath));
-					}
+					EDITOR_EXEC(PropagateFileRename(p_prev, p_newPath));
+					if (EDITOR_CONTEXT(sceneManager).GetCurrentSceneSourcePath() == p_prev) // Modify current scene source path if the renamed file is the current scene
+						EDITOR_CONTEXT(sceneManager).StoreCurrentSceneSourcePath(p_newPath);
 
 					clickableText.content = elementName;
 				}

Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp

@@ -163,32 +163,23 @@ OvEditor::Panels::Inspector::Inspector
 		// Add script button state updater
 		const auto updateAddScriptButton = [&addScriptButton, this](const std::string& p_script)
 		{
-			const std::string defaultScriptExtension = OVSERVICE(OvCore::Scripting::ScriptEngine).GetDefaultExtension();
-
-			const std::string realScriptPath =
-				EDITOR_CONTEXT(projectScriptsPath) +
-				p_script +
-				defaultScriptExtension;
+			const auto realPath = EDITOR_EXEC(GetRealPath(m_scriptSelectorWidget->content));
 
 			const auto targetActor = GetTargetActor();
-			const bool isScriptValid = std::filesystem::exists(realScriptPath) && targetActor && !targetActor->GetBehaviour(p_script);
+			const bool canAddScript = std::filesystem::exists(realPath) && targetActor && !targetActor->GetBehaviour(p_script);
 
-			addScriptButton.disabled = !isScriptValid;
-			addScriptButton.idleBackgroundColor = isScriptValid ? OvUI::Types::Color{ 0.7f, 0.5f, 0.f } : OvUI::Types::Color{ 0.1f, 0.1f, 0.1f };
+			addScriptButton.disabled = !canAddScript;
+			addScriptButton.idleBackgroundColor = canAddScript ? OvUI::Types::Color{ 0.7f, 0.5f, 0.f } : OvUI::Types::Color{ 0.1f, 0.1f, 0.1f };
 		};
 
 		m_scriptSelectorWidget->ContentChangedEvent += updateAddScriptButton;
 
-		addScriptButton.ClickedEvent += [updateAddScriptButton, this] {
-			const std::string defaultScriptExtension = OVSERVICE(OvCore::Scripting::ScriptEngine).GetDefaultExtension();
-
-			const std::string realScriptPath =
-				EDITOR_CONTEXT(projectScriptsPath) +
-				m_scriptSelectorWidget->content +
-				defaultScriptExtension;
+		addScriptButton.ClickedEvent += [updateAddScriptButton, this]
+		{
+			const auto realPath = EDITOR_EXEC(GetRealPath(m_scriptSelectorWidget->content));
 
 			// Ensure that the script is a valid one
-			if (std::filesystem::exists(realScriptPath))
+			if (std::filesystem::exists(realPath))
 			{
 				GetTargetActor()->AddBehaviour(m_scriptSelectorWidget->content);
 				updateAddScriptButton(m_scriptSelectorWidget->content);
@@ -197,7 +188,7 @@ OvEditor::Panels::Inspector::Inspector
 
 		ddTarget.DataReceivedEvent += [updateAddScriptButton, this](std::pair<std::string, Layout::Group*> p_data)
 		{
-			m_scriptSelectorWidget->content = EDITOR_EXEC(GetScriptPath(p_data.first));
+			m_scriptSelectorWidget->content = p_data.first;
 			updateAddScriptButton(m_scriptSelectorWidget->content);
 		};
 	}