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

merging latest main

Browse Source 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
This commit is contained in:
kberg-amzn
2021-09-20 17:26:11 -07:00
parent bf113bb5d1 d7e29c00c7
commit 1000a07b3f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHitVolumesComponent.h
+1 -1
View File
@@ -64,7 +64,7 @@ namespace Multiplayer
void OnDeactivate(Multiplayer::EntityIsMigrating entityIsMigrating) override;
private:
void OnPreRender(float deltaTime, float blendFactor);
void OnPreRender(float deltaTime);
void OnTransformUpdate(const AZ::Transform& transform);
void OnSyncRewind();
Gems/Multiplayer/Code/Source/Components/NetworkHitVolumesComponent.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ namespace Multiplayer
NetworkHitVolumesComponent::NetworkHitVolumesComponent()
: m_syncRewindHandler([this]() { OnSyncRewind(); })
, m_preRenderHandler([this](float deltaTime, float blendFactor) { OnPreRender(deltaTime, blendFactor); })
, m_preRenderHandler([this](float deltaTime) { OnPreRender(deltaTime); })
, m_transformChangedHandler([this](const AZ::Transform&, const AZ::Transform& worldTm) { OnTransformUpdate(worldTm); })
{
;
@@ -135,7 +135,7 @@ namespace Multiplayer
EMotionFX::Integration::ActorComponentNotificationBus::Handler::BusDisconnect();
}
void NetworkHitVolumesComponent::OnPreRender([[maybe_unused]] float deltaTime, [[maybe_unused]] float blendFactor)
void NetworkHitVolumesComponent::OnPreRender([[maybe_unused]] float deltaTime)
{
if (m_animatedHitVolumes.size() <= 0)
{