Merge branch 'main' into LoadPipelineFromGitHub

Gems/AudioEngineWwise/AssetProcessorGemConfig.ini

@@ -1,12 +0,0 @@
-
-[Exclude AudioProject]
-pattern=.*\\/Sounds\\/.+_project.*
-
-[Exclude AudioTemp]
-pattern=.*\\/Sounds\\/.+\\.(txt|xml|dat)
-
-[RC audio]
-pattern=.*\\.(wav|pcm)
-params=copy
-productAssetType={2FC41C35-244B-41D3-A312-B1E222CAE762}
-server=skip

Gems/AudioEngineWwise/AssetProcessorGemConfig.setreg

@@ -0,0 +1,20 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Exclude AudioProject": {
+                    "pattern": ".*\\\\/Sounds\\\\/.+_project.*"
+                },
+                "Exclude AudioTemp": {
+                    "pattern": ".*\\\\/Sounds\\\\/.+\\\\.(txt|xml|dat)"
+                },
+                "RC audio": {
+                    "pattern": ".*\\\\.(wav|pcm)",
+                    "params": "copy",
+                    "productAssetType": "{2FC41C35-244B-41D3-A312-B1E222CAE762}",
+                    "server": "skip"
+                }
+            }
+        }
+    }
+}

Gems/AudioEngineWwise/Code/CMakeLists.txt

@@ -26,7 +26,7 @@ if (PAL_TRAIT_BUILD_SERVER_SUPPORTED OR PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB)
     ly_add_target(
         NAME AudioEngineWwise.Stub ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
         NAMESPACE Gem
-        OUTPUT_NAME Gem.AudioEngineWwise.Stub
+        OUTPUT_NAME AudioEngineWwise.Stub
         FILES_CMAKE
             audioenginewwise_stub_files.cmake
         BUILD_DEPENDENCIES
@@ -68,7 +68,6 @@ ly_add_target(
 ly_add_target(
     NAME AudioEngineWwise ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
-    OUTPUT_NAME Gem.AudioEngineWwise.67a80e2ac865406c990f2715feb55f7f.v0.1.0
     FILES_CMAKE
         audioenginewwise_shared_files.cmake
     INCLUDE_DIRECTORIES
@@ -201,9 +200,9 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     ly_add_target(
-        NAME AudioEngineWwise.Editor MODULE
+        NAME AudioEngineWwise.Editor GEM_MODULE
+
         NAMESPACE Gem
-        OUTPUT_NAME Gem.AudioEngineWwise.Editor.67a80e2ac865406c990f2715feb55f7f.v0.1.0
         FILES_CMAKE
             audioenginewwise_editor_shared_files.cmake
         COMPILE_DEFINITIONS
@@ -219,6 +218,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
         BUILD_DEPENDENCIES
             PRIVATE
                 Gem::AudioEngineWwise.Editor.Static
+        RUNTIME_DEPENDENCIES
+            Gem::AudioSystem.Editor
     )
 
     if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)

Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.cpp

@@ -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

Gems/AudioEngineWwise/Code/Source/AudioEngineWwiseGemSystemComponent.h

@@ -47,7 +47,7 @@ namespace AudioEngineWwiseGem
     protected:
         ////////////////////////////////////////////////////////////////////////
         // Audio::Gem::AudioEngineGemRequestBus interface implementation
-        bool Initialize(const SSystemInitParams* initParams) override;
+        bool Initialize() override;
         void Release() override;
         ////////////////////////////////////////////////////////////////////////
 

Gems/AudioEngineWwise/Code/Tests/AudioEngineWwiseBuilderTest.cpp

@@ -18,6 +18,7 @@
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
 
@@ -38,7 +39,7 @@ protected:
         const AZStd::string engineRoot = AZ::Test::GetEngineRootPath();
         AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engineRoot.c_str());
 
-        AZ::IO::Path assetRoot(engineRoot);
+        AZ::IO::Path assetRoot(AZ::Utils::GetProjectPath());
         assetRoot /= "Cache";
 
         AZ::IO::FileIOBase::GetInstance()->SetAlias("@root@", assetRoot.c_str());