Files
o3de/Code/Tools/LuaIDE/Source/StandaloneToolsApplication.cpp
T
lumberyard-employee-dm 669caca9cc Updated Launching of Lua Editor to supply the project-path (#7706)
* Updated Launching of Lua Editor to supply the project-path

The Lua Launch logic also uses the AzFramework ProcessLauncher instead
of Qt. This has the benefit of being able to pass arguments as an array
instead of in a single string. Therefore paths with spaces in them also
work.

Tweak the Settings Registry logic to locate the
project-path/engine-path by scanning upwards for a
project.json/engine.json respectively to inject the found paths to the
front of the command line parameters instead of the back.
This has the effect of making sure that command line parameters for the
project-path/engine-path always takes precedence over scanning upwards
for a project.json/engine.json.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed prepend of EngineRoot in CheckProjectPathProvided

The Editor would attempt to validate that the project path supplied via
the command line contained a valid project.json file before contining
the Editor startup flow.

This was taking the engine root path and appending the project path to
it, which works when the project path is absolute

But when the project path is relative it is treated as relative to the
current working directory by the SettingsRegistry, but the logic in the
CheckProjectPathProvided was treating it has relative to the engine
root. Therefore supplying a relative path as part of the Editor.exe
launch command would fail.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed resolving of relative paths to absolute paths in the Editor

The Editor was changing the current working directory to the nearest
ancestor directory containing an `engine.json` file.
This resulted in the ConvertToAbsolutePath function resolving relative
paths to that directory instead of the launch directory of the Editor.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-02-18 10:11:16 -06:00

135 lines
5.1 KiB
C++

/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "StandaloneToolsApplication.h"
#include <AzCore/std/containers/array.h>
#include <AzCore/UserSettings/UserSettingsComponent.h>
#include <AzFramework/Asset/AssetCatalogComponent.h>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzFramework/TargetManagement/TargetManagementComponent.h>
#include <AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.h>
#include <AzFramework/API/ApplicationAPI.h>
#include <AzCore/Jobs/JobManagerComponent.h>
#include <AzCore/IO/Streamer/StreamerComponent.h>
namespace StandaloneTools
{
BaseApplication::BaseApplication(int argc, char** argv)
: LegacyFramework::Application(argc, argv)
{
AZ::UserSettingsFileLocatorBus::Handler::BusConnect();
}
BaseApplication::~BaseApplication()
{
AZ::UserSettingsFileLocatorBus::Handler::BusDisconnect();
}
void BaseApplication::RegisterCoreComponents()
{
LegacyFramework::Application::RegisterCoreComponents();
RegisterComponentDescriptor(LegacyFramework::IPCComponent::CreateDescriptor());
RegisterComponentDescriptor(AZ::UserSettingsComponent::CreateDescriptor());
RegisterComponentDescriptor(AzFramework::TargetManagementComponent::CreateDescriptor());
RegisterComponentDescriptor(AZ::JobManagerComponent::CreateDescriptor());
RegisterComponentDescriptor(AZ::StreamerComponent::CreateDescriptor());
}
void BaseApplication::CreateSystemComponents()
{
LegacyFramework::Application::CreateSystemComponents();
// AssetCatalogComponent was moved to the Application Entity to fulfil service requirements.
EnsureComponentRemoved(AzFramework::AssetCatalogComponent::RTTI_Type());
}
void BaseApplication::CreateApplicationComponents()
{
LegacyFramework::Application::CreateApplicationComponents();
EnsureComponentCreated(AZ::StreamerComponent::RTTI_Type());
EnsureComponentCreated(AZ::JobManagerComponent::RTTI_Type());
EnsureComponentCreated(AzFramework::TargetManagementComponent::RTTI_Type());
EnsureComponentCreated(LegacyFramework::IPCComponent::RTTI_Type());
// Check for user settings components already added (added by the app descriptor
AZStd::array<bool, AZ::UserSettings::CT_MAX> userSettingsAdded;
userSettingsAdded.fill(false);
for (const auto& component : m_applicationEntity->GetComponents())
{
if (const auto userSettings = azrtti_cast<AZ::UserSettingsComponent*>(component))
{
userSettingsAdded[userSettings->GetProviderId()] = true;
}
}
// For each provider not already added, add it.
for (AZ::u32 providerId = 0; providerId < userSettingsAdded.size(); ++providerId)
{
if (!userSettingsAdded[providerId])
{
// Don't need to add one for global, that's added by someone else
m_applicationEntity->AddComponent(aznew AZ::UserSettingsComponent(providerId));
}
}
}
void BaseApplication::OnApplicationEntityActivated()
{
[[maybe_unused]] bool launched = LaunchDiscoveryService();
AZ_Warning("EditorApplication", launched, "Could not launch GridHub; Only replay is available.");
}
void BaseApplication::SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations)
{
LegacyFramework::Application::SetSettingsRegistrySpecializations(specializations);
specializations.Append("standalone_tools");
}
AZStd::string BaseApplication::GetStoragePath() const
{
AZStd::string storagePath;
FrameworkApplicationMessages::Bus::BroadcastResult(storagePath, &FrameworkApplicationMessages::GetApplicationGlobalStoragePath);
if (storagePath.empty())
{
FrameworkApplicationMessages::Bus::BroadcastResult(storagePath, &FrameworkApplicationMessages::GetApplicationDirectory);
}
return storagePath;
}
AZStd::string BaseApplication::ResolveFilePath(AZ::u32 providerId)
{
AZStd::string appName;
FrameworkApplicationMessages::Bus::BroadcastResult(appName, &FrameworkApplicationMessages::GetApplicationName);
AZStd::string userStoragePath = GetStoragePath();
AzFramework::StringFunc::Path::Join(userStoragePath.c_str(), appName.c_str(), userStoragePath);
AZ::IO::SystemFile::CreateDir(userStoragePath.c_str());
AZStd::string fileName;
switch (providerId)
{
case AZ::UserSettings::CT_LOCAL:
fileName = AZStd::string::format("%s_UserSettings.xml", appName.c_str());
break;
case AZ::UserSettings::CT_GLOBAL:
fileName = "GlobalUserSettings.xml";
break;
}
AzFramework::StringFunc::Path::Join(userStoragePath.c_str(), fileName.c_str(), userStoragePath);
return userStoragePath;
}
}