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

Cleans up more legacy code from ACE

Browse Source 
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>
This commit is contained in:
amzn-phist
2021-07-22 21:06:04 -05:00
parent 5b148b1f40
commit 976272d9cf
13 changed files with 14 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
-1
View File
@@ -13,7 +13,6 @@
#include <AzCore/std/string/conversions.h>
#include <AzCore/StringFunc/StringFunc.h>
#include <AudioControlsEditorUndo.h>
#include <IEditor.h>
namespace AudioControls
{
Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
-5
View File
@@ -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>
Gems/AudioSystem/Code/Source/Editor/AudioControl.cpp
-1
View File
@@ -14,7 +14,6 @@
#include <AudioControlsEditorPlugin.h>
#include <AudioControlsEditorUndo.h>
#include <IAudioSystemControl.h>
#include <IEditor.h>
#include <ImplementationManager.h>
namespace AudioControls
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp
+3 -9
View File
@@ -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);
}
}
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+11 -28
View File
@@ -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());
}
}
}
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
-1
View File
@@ -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>
Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
-1
View File
@@ -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>
Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
-1
View File
@@ -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>
Gems/AudioSystem/Code/Source/Editor/AudioSystemPanel.cpp
-3
View File
@@ -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>
Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <ATLControlsModel.h>
#include <AudioControlsEditorPlugin.h>
#include <IAudioSystemEditor.h>
#include <IConsole.h>
#include <IEditor.h>
//-----------------------------------------------------------------------------------------------//
Gems/AudioSystem/Code/Source/Editor/ImplementationManager.h
-3
View File
@@ -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
Gems/AudioSystem/Code/Source/Editor/InspectorPanel.cpp
-1
View File
@@ -12,7 +12,6 @@
#include <ACETypes.h>
#include <AudioControlsEditorPlugin.h>
#include <IAudioSystemControl.h>
#include <IEditor.h>
#include <QAudioControlEditorIcons.h>
#include <QMessageBox>
Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
-1
View File
@@ -14,7 +14,6 @@
#include <AudioControlsEditorPlugin.h>
#include <IAudioSystemControl.h>
#include <IAudioSystemEditor.h>
#include <IEditor.h>
#include <ImplementationManager.h>
#include <QDropEvent>