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

more fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 10:09:44 -07:00
parent cf6c7c4d8d
commit a35464ca08
43 changed files with 28 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Engine/ATL.cpp
-2
View File
@@ -1155,7 +1155,6 @@ namespace Audio
EAudioRequestStatus eResult = eARS_FAILURE;
const TAudioObjectID nATLObjectID = pAudioObject->GetID();
const TAudioControlID nATLTriggerID = pTrigger->GetID();
const TObjectTriggerImplStates& rTriggerImplStates = pAudioObject->GetTriggerImpls();
for (auto const triggerImpl : pTrigger->m_cImplPtrs)
@@ -1357,7 +1356,6 @@ namespace Audio
{
EAudioRequestStatus eResult = eARS_FAILURE;
const TAudioObjectID nATLObjectID = pAudioObject->GetID();
const TAudioControlID nATLTriggerID = pTrigger->GetID();
TObjectEventSet rEvents = pAudioObject->GetActiveEvents();
Gems/AudioSystem/Code/Source/Engine/ATLAudioObject.cpp
+2 -1
View File
@@ -1042,7 +1042,8 @@ namespace Audio
auxGeom.SetRenderFlags(newRenderFlags);
const bool drawRays = CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::DrawRays);
const bool drawLabels = CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::RayLabels);
// ToDo: Update to work with Atom? LYN-3677
//const bool drawLabels = CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::RayLabels);
size_t numRays = m_obstOccType == eAOOCT_SINGLE_RAY ? 1 : s_maxRaysPerObject;
for (size_t rayIndex = 0; rayIndex < numRays; ++rayIndex)
Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp
+1 -3
View File
@@ -284,10 +284,9 @@ namespace Audio
///////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////
CAudioObjectManager::CAudioObjectManager(CAudioEventManager& refAudioEventManager)
CAudioObjectManager::CAudioObjectManager([[maybe_unused]] CAudioEventManager& refAudioEventManager)
: m_cObjectPool(Audio::CVars::s_AudioObjectPoolSize, AudioObjectIDFactory::s_minValidAudioObjectID)
, m_fTimeSinceLastVelocityUpdateMS(0.0f)
, m_refAudioEventManager(refAudioEventManager)
#if !defined(AUDIO_RELEASE)
, m_pDebugNameStore(nullptr)
#endif // !AUDIO_RELEASE
@@ -1777,7 +1776,6 @@ namespace Audio
static float const fItemPlayingColor[4] = { 0.3f, 0.6f, 0.3f, 0.9f };
static float const fItemLoadingColor[4] = { 0.9f, 0.2f, 0.2f, 0.9f };
static float const fItemOtherColor[4] = { 0.8f, 0.8f, 0.8f, 0.9f };
static float const fNoImplColor[4] = { 1.0f, 0.6f, 0.6f, 0.9f };
rAuxGeom.Draw2dLabel(fPosX, fPosY, 1.6f, fHeaderColor, false, "Audio Events [%zu]", m_cActiveAudioEvents.size());
fPosX += 20.0f;
Gems/AudioSystem/Code/Source/Engine/ATLComponents.h
-2
View File
@@ -160,8 +160,6 @@ namespace Audio
CInstanceManager<CATLAudioObject, TAudioObjectID> m_cObjectPool;
float m_fTimeSinceLastVelocityUpdateMS;
CAudioEventManager& m_refAudioEventManager;
AudioRaycastManager m_raycastManager;
};
Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ namespace Audio
PushRequestBlocking(request);
m_audioSystemThread.Deactivate();
const bool bSuccess = m_oATL.ShutDown();
m_oATL.ShutDown();
m_bSystemInitialized = false;
}
Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
+1 -1
View File
@@ -841,7 +841,7 @@ namespace Audio
streamer->SetRequestCompleteCallback(
audioFileEntry->m_asyncStreamRequest,
[this](AZ::IO::FileRequestHandle request)
[](AZ::IO::FileRequestHandle request)
{
AZ_PROFILE_FUNCTION(Audio);
AudioFileCacheManagerNotficationBus::QueueBroadcast(