From 976272d9cf9d2e22dceb6eea011d2f993854d320 Mon Sep 17 00:00:00 2001
From: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
Date: Thu, 22 Jul 2021 21:06:04 -0500
Subject: [PATCH] Cleans up more legacy code from ACE

Rewrote some code to replace gEnv->pCryPak and ISystem usage.  One place
was grabbing a Camera view from ISystem, replaced with simple identity
matrix.  Cleaned up include headers.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
---
 .../Code/Source/Editor/ATLControlsModel.cpp   |  1 -
 .../Code/Source/Editor/ATLControlsPanel.cpp   |  5 ---
 .../Code/Source/Editor/AudioControl.cpp       |  1 -
 .../Editor/AudioControlsEditorPlugin.cpp      | 12 ++----
 .../Editor/AudioControlsEditorWindow.cpp      | 39 ++++++-------------
 .../Source/Editor/AudioControlsEditorWindow.h |  1 -
 .../Source/Editor/AudioControlsLoader.cpp     |  1 -
 .../Source/Editor/AudioResourceSelectors.cpp  |  1 -
 .../Code/Source/Editor/AudioSystemPanel.cpp   |  3 --
 .../Source/Editor/ImplementationManager.cpp   |  2 -
 .../Source/Editor/ImplementationManager.h     |  3 --
 .../Code/Source/Editor/InspectorPanel.cpp     |  1 -
 .../Code/Source/Editor/QConnectionsWidget.cpp |  1 -
 13 files changed, 14 insertions(+), 57 deletions(-)

diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
index 4fbc2a72c4..7bcce84ea4 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
@@ -13,7 +13,6 @@
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/StringFunc/StringFunc.h>
 #include <AudioControlsEditorUndo.h>
-#include <IEditor.h>
 
 namespace AudioControls
 {
diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
index 6503e83545..48a16e54e6 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
@@ -16,13 +16,8 @@
 #include <ATLControlsModel.h>
 #include <AudioControl.h>
 #include <AudioControlsEditorPlugin.h>
-#include <CryFile.h>
-#include <CryPath.h>
-#include <Cry_Camera.h>
-#include <IAudioSystem.h>
 #include <IAudioSystemControl.h>
 #include <IAudioSystemEditor.h>
-#include <IEditor.h>
 #include <QAudioControlEditorIcons.h>
 
 #include <QWidgetAction>
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
index 40c1cd3c79..c0a8fb8dde 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
@@ -14,7 +14,6 @@
 #include <AudioControlsEditorPlugin.h>
 #include <AudioControlsEditorUndo.h>
 #include <IAudioSystemControl.h>
-#include <IEditor.h>
 #include <ImplementationManager.h>
 
 namespace AudioControls
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
index b8761c4d62..973cb836a0 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
@@ -14,9 +14,6 @@
 #include <AudioControlsLoader.h>
 #include <AudioControlsWriter.h>
 
-#include <CryFile.h>
-#include <CryPath.h>
-#include <Cry_Camera.h>
 #include <Include/IResourceSelectorHost.h>
 
 #include <IAudioSystem.h>
@@ -28,7 +25,6 @@
 
 
 using namespace AudioControls;
-using namespace PathUtil;
 
 CATLControlsModel CAudioControlsEditorPlugin::ms_ATLModel;
 QATLTreeModel CAudioControlsEditorPlugin::ms_layoutModel;
@@ -152,20 +148,18 @@ void CAudioControlsEditorPlugin::ExecuteTrigger(const AZStd::string_view sTrigge
         Audio::AudioSystemRequestBus::BroadcastResult(ms_nAudioTriggerID, &Audio::AudioSystemRequestBus::Events::GetAudioTriggerID, sTriggerName.data());
         if (ms_nAudioTriggerID != INVALID_AUDIO_CONTROL_ID)
         {
-            const CCamera& camera = GetIEditor()->GetSystem()->GetViewCamera();
-
             Audio::SAudioRequest request;
             request.nFlags = Audio::eARF_PRIORITY_NORMAL;
 
-            const AZ::Matrix3x4 cameraMatrix = LYTransformToAZMatrix3x4(camera.GetMatrix());
+            const AZ::Matrix3x4 listenerTxfm = AZ::Matrix3x4::CreateIdentity();
 
-            Audio::SAudioListenerRequestData<Audio::eALRT_SET_POSITION> requestData(cameraMatrix);
+            Audio::SAudioListenerRequestData<Audio::eALRT_SET_POSITION> requestData(listenerTxfm);
             requestData.oNewPosition.NormalizeForwardVec();
             requestData.oNewPosition.NormalizeUpVec();
             request.pData = &requestData;
             Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, request);
 
-            ms_pIAudioProxy->SetPosition(cameraMatrix);
+            ms_pIAudioProxy->SetPosition(listenerTxfm);
             ms_pIAudioProxy->ExecuteTrigger(ms_nAudioTriggerID);
         }
     }
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
index d19cfe7adb..54a8ce616d 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
@@ -9,7 +9,6 @@
 
 #include <AudioControlsEditorWindow.h>
 
-#include <AzCore/StringFunc/StringFunc.h>
 #include <AzCore/Utils/Utils.h>
 
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@@ -18,22 +17,14 @@
 #include <ATLControlsPanel.h>
 #include <AudioControlsEditorPlugin.h>
 #include <AudioControlsEditorUndo.h>
+#include <AudioFileUtils.h>
 #include <AudioSystemPanel.h>
-
-
-#include <DockTitleBarWidget.h>
 #include <IAudioSystem.h>
 #include <ImplementationManager.h>
 #include <InspectorPanel.h>
-
-
-#include <CryFile.h>
-#include <CryPath.h>
-#include <ISystem.h>
-#include <Util/PathUtil.h>
-
 #include <QAudioControlEditorIcons.h>
 
+#include <DockTitleBarWidget.h>
 
 #include <QPaintEvent>
 #include <QPushButton>
@@ -41,6 +32,7 @@
 #include <QPainter>
 #include <QMessageBox>
 
+
 void InitACEResources()
 {
     Q_INIT_RESOURCE(AudioControlsEditorUI);
@@ -116,25 +108,16 @@ namespace AudioControls
     {
         m_fileSystemWatcher.addPath(folder.data());
 
-        AZStd::string search;
-        AZ::StringFunc::Path::Join(folder.data(), "*", search, true, false);
-        auto pCryPak = gEnv->pCryPak;
-        AZ::IO::ArchiveFileIterator handle = pCryPak->FindFirst(search.c_str());
-        if (handle)
+        auto fileIO = AZ::IO::FileIOBase::GetInstance();
+        auto foundFiles = Audio::FindFilesInPath(folder, "*");
+        for (auto& file : foundFiles)
         {
-            do
+            if (fileIO->IsDirectory(file.c_str()))
             {
-                AZStd::string sName = static_cast<AZStd::string_view>(handle.m_filename);
-                if (!sName.empty() && sName[0] != '.')
-                {
-                    if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) == AZ::IO::FileDesc::Attribute::Subdirectory)
-                    {
-                        AZ::StringFunc::Path::Join(folder.data(), sName.c_str(), sName);
-                        StartWatchingFolder(sName);
-                    }
-                }
-            } while (handle = pCryPak->FindNext(handle));
-            pCryPak->FindClose(handle);
+                AZ::IO::FixedMaxPath resolvedPath;
+                fileIO->ReplaceAlias(resolvedPath, file);
+                StartWatchingFolder(file.Native());
+            }
         }
     }
 
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
index bfa08828ac..761f0c1a8e 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
@@ -12,7 +12,6 @@
 #if !defined(Q_MOC_RUN)
 #include <ATLControlsModel.h>
 #include <AzCore/std/string/string_view.h>
-#include <IEditor.h>
 
 #include <QMainWindow>
 #include <QFileSystemWatcher>
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
index e0eba868d6..8714fd21da 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
@@ -10,7 +10,6 @@
 #include <AudioControlsLoader.h>
 
 #include <AzCore/std/string/conversions.h>
-#include <AzCore/StringFunc/StringFunc.h>
 #include <AzCore/Utils/Utils.h>
 
 #include <ACEEnums.h>
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
index 90c50ac741..f0c9ebe3d1 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
@@ -9,7 +9,6 @@
 
 #include <ATLControlsResourceDialog.h>
 #include <AudioControlsEditorPlugin.h>
-#include <IEditor.h>
 #include <Include/IResourceSelectorHost.h>
 #include <QAudioControlEditorIcons.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
index 99f615d1fe..deccfc1364 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
@@ -12,10 +12,7 @@
 #include <ATLControlsModel.h>
 #include <AudioControl.h>
 #include <AudioControlsEditorPlugin.h>
-#include <CryFile.h>
-#include <CryPath.h>
 #include <IAudioSystemEditor.h>
-#include <IEditor.h>
 #include <QAudioControlEditorIcons.h>
 
 #include <QWidgetAction>
diff --git a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
index fc146a109d..bee5c1dd51 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
@@ -14,8 +14,6 @@
 #include <ATLControlsModel.h>
 #include <AudioControlsEditorPlugin.h>
 #include <IAudioSystemEditor.h>
-#include <IConsole.h>
-#include <IEditor.h>
 
 
 //-----------------------------------------------------------------------------------------------//
diff --git a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
index dd6d61d310..70a99fcc0e 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
+++ b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
@@ -10,9 +10,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <AzCore/Module/DynamicModuleHandle.h>
-
 #include <QObject>
 #endif
 
diff --git a/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
index a9e2046348..318aea211c 100644
--- a/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
@@ -12,7 +12,6 @@
 #include <ACETypes.h>
 #include <AudioControlsEditorPlugin.h>
 #include <IAudioSystemControl.h>
-#include <IEditor.h>
 #include <QAudioControlEditorIcons.h>
 
 #include <QMessageBox>
diff --git a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
index 8a6fece85c..b65e690f1b 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
@@ -14,7 +14,6 @@
 #include <AudioControlsEditorPlugin.h>
 #include <IAudioSystemControl.h>
 #include <IAudioSystemEditor.h>
-#include <IEditor.h>
 #include <ImplementationManager.h>
 
 #include <QDropEvent>