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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Editor/Source/Configuration/PhysXEditorSettingsRegistryManager.cpp
+13 -24
View File
@@ -19,6 +19,7 @@
#include <AzCore/JSON/prettywriter.h>
#include <AzCore/Serialization/Json/JsonSerialization.h>
#include <AzCore/Settings/SettingsRegistry.h>
#include <AzCore/Utils/Utils.h>
#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
namespace PhysX
@@ -78,30 +79,18 @@ namespace PhysX
: PhysXSettingsRegistryManager()
{
// Resolve path to the .setreg files
auto* fileIo = AZ::IO::FileIOBase::GetInstance();
if (fileIo == nullptr)
{
AZ_TracePrintf("PhysXSystemEditor", R"(Unable to resolve paths for PhysX configuration settings registry files, FileIOBase is null.\n)");
return;
}
if (!fileIo->ResolvePath(m_physXConfigurationFilePath, "@devassets@/Registry/physxsystemconfiguration.setreg"))
{
AZ_TracePrintf("PhysXSystemEditor", R"(Unable to resolve path "%s" to the PhysX configuration settings registry file\n)",
m_physXConfigurationFilePath.c_str());
return;
}
if (!fileIo->ResolvePath(m_defaultSceneConfigFilePath, "@devassets@/Registry/physxdefaultsceneconfiguration.setreg"))
{
AZ_TracePrintf("PhysXSystemEditor", R"(Unable to resolve path "%s" to the Default Scene Configuration settings registry file\n)",
m_defaultSceneConfigFilePath.c_str());
return;
}
if(!fileIo->ResolvePath(m_debugConfigurationFilePath, "@devassets@/Registry/physxdebugconfiguration.setreg"))
{
AZ_TracePrintf("PhysXSystemEditor", R"(Unable to resolve path "%s" to the PhysX Debug Configuration settings registry file\n)",
m_debugConfigurationFilePath.c_str());
return;
}
AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
projectPath /= "Registry";
m_physXConfigurationFilePath = projectPath;
m_physXConfigurationFilePath /= "physxsystemconfiguration.setreg";
m_defaultSceneConfigFilePath = projectPath;
m_defaultSceneConfigFilePath /= "physxdefaultsceneconfiguration.setreg";
m_debugConfigurationFilePath = projectPath;
m_debugConfigurationFilePath /= "physxdebugconfiguration.setreg";
m_initialized = true;
}