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/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);
}
}