birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
+3 -4
View File
@@ -24,12 +24,11 @@ namespace ProjectSettingsTool
if (serialize)
{
serialize->Class<BaseSettings>()
->Version(1)
->Version(2)
->Field("project_name", &BaseSettings::m_projectName)
->Field("product_name", &BaseSettings::m_productName)
->Field("executable_name", &BaseSettings::m_executableName)
->Field("sys_game_folder", &BaseSettings::m_sysGameFolder)
->Field("sys_dll_game", &BaseSettings::m_sysDllGame)
->Field("project_path", &BaseSettings::m_projectPath)
->Field("project_output_folder", &BaseSettings::m_projectOutputFolder)
->Field("code_folder", &BaseSettings::m_codeFolder)
;
@@ -52,7 +51,7 @@ namespace ProjectSettingsTool
->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
->Attribute(Attributes::PropertyIdentfier, Identfiers::ExecutableName)
->Attribute(Attributes::LinkedProperty, Identfiers::IosExecutableName)
->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_sysGameFolder, "Game Folder", "The name of the project's folder.")
->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectPath, "Project Path", "The project root folder path .")
->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileNameOrEmpty))
->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
Code/Sandbox/Plugins/ProjectSettingsTool/PlatformSettings_Base.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace ProjectSettingsTool
: m_projectName("")
, m_productName("")
, m_executableName("")
, m_sysGameFolder("")
, m_projectPath("")
, m_sysDllGame("")
, m_projectOutputFolder("")
, m_codeFolder("")
@@ -37,7 +37,7 @@ namespace ProjectSettingsTool
AZStd::string m_projectName;
AZStd::string m_productName;
AZStd::string m_executableName;
AZStd::string m_sysGameFolder;
AZStd::string m_projectPath;
AZStd::string m_sysDllGame;
AZStd::string m_projectOutputFolder;
AZStd::string m_codeFolder;
Code/Sandbox/Plugins/ProjectSettingsTool/Utils.cpp
+5 -4
View File
@@ -16,6 +16,7 @@
#include <AzCore/IO/SystemFile.h>
#include <AzCore/std/algorithm.h>
#include <AzCore/Utils/Utils.h>
#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
@@ -72,15 +73,15 @@ namespace
template<>
AZStd::string GetProjectName()
{
AZStd::string projectRoot = GetAbsoluteProjectRoot<AZStd::string>();
return projectRoot.substr(projectRoot.find_last_of('/') + 1);
auto projectName = AZ::Utils::GetProjectName();
return AZStd::string{projectName.c_str()};
}
template<>
QString GetProjectName()
{
QString projectRoot = GetAbsoluteProjectRoot<QString>();
return projectRoot.mid(projectRoot.lastIndexOf('/'));
auto projectName = AZ::Utils::GetProjectName();
return QString::fromUtf8(projectName.c_str(), aznumeric_cast<int>(projectName.size()));
}
}