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
Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp
+11 -3
View File
@@ -17,8 +17,9 @@
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/EditContextConstants.inl>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
#include <AzFramework/Platform/PlatformDefaults.h>
#include <ISystem.h>
#include <AudioAllocators.h>
#include <AudioLogger.h>
#include <AudioSystemImplCVars.h>
@@ -111,7 +112,7 @@ namespace AudioEngineWwiseGem
#endif // AUDIO_ENGINE_WWISE_EDITOR
}
bool AudioEngineWwiseGemSystemComponent::Initialize(const SSystemInitParams* initParams)
bool AudioEngineWwiseGemSystemComponent::Initialize()
{
bool success = false;
@@ -143,7 +144,14 @@ namespace AudioEngineWwiseGem
AZ::AllocatorInstance<Audio::AudioImplAllocator>::Create(allocDesc);
}
m_engineWwise = AZStd::make_unique<Audio::CAudioSystemImpl_wwise>(initParams->assetsPlatform);
AZ::SettingsRegistryInterface::FixedValueString assetPlatform = AzFramework::OSPlatformToDefaultAssetPlatform(
AZ_TRAIT_OS_PLATFORM_CODENAME);
if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
{
AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, assetPlatform,
AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "assets");
}
m_engineWwise = AZStd::make_unique<Audio::CAudioSystemImpl_wwise>(assetPlatform.c_str());
if (m_engineWwise)
{
#if AZ_TRAIT_AUDIOENGINEWWISE_PROVIDE_IMPL_SECONDARY_POOL