diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.cpp index 38a1a27dcd..361f9d943d 100644 --- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.cpp +++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.cpp @@ -169,7 +169,6 @@ namespace Multiplayer m_currentComponentReport = nullptr; } - m_gdeDirtyBytes.ReportAggregateBytes(); MultiplayerDebugByteReporter::ReportAggregateBytes(); } @@ -183,7 +182,6 @@ namespace Multiplayer } SetEntityName(other.GetEntityName()); - m_gdeDirtyBytes.Combine(other.m_gdeDirtyBytes); } void MultiplayerDebugEntityReporter::Reset() @@ -191,7 +189,6 @@ namespace Multiplayer MultiplayerDebugByteReporter::Reset(); m_componentReports.clear(); - m_gdeDirtyBytes.Reset(); } AZStd::map& MultiplayerDebugEntityReporter::GetComponentReports() diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.h index 934c6f3aac..279f7fb360 100644 --- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.h +++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugByteReporter.h @@ -58,8 +58,6 @@ namespace Multiplayer using Report = AZStd::pair; AZStd::vector GetFieldReports(); - AZStd::size_t GetTotalDirtyBits() const { return m_componentDirtyBytes.GetTotalBytes(); } - float GetAvgDirtyBits() const { return m_componentDirtyBytes.GetAverageBytes(); } void Combine(const MultiplayerDebugComponentReporter& other); @@ -87,13 +85,10 @@ namespace Multiplayer } AZStd::map& GetComponentReports(); - AZStd::size_t GetTotalDirtyBits() const { return m_gdeDirtyBytes.GetTotalBytes(); } - float GetAvgDirtyBits() const { return m_gdeDirtyBytes.GetAverageBytes(); } private: MultiplayerDebugComponentReporter* m_currentComponentReport = nullptr; AZStd::map m_componentReports; - MultiplayerDebugByteReporter m_gdeDirtyBytes; AZStd::string m_entityName; }; } diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp index f892ee9724..0e015fc86d 100644 --- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp @@ -341,16 +341,20 @@ namespace Multiplayer if (m_displayPerEntityStats) { - // This overrides @net_DebugNetworkEntity_ShowBandwidth value if (ImGui::Begin("Multiplayer Per Entity Stats", &m_displayPerEntityStats, ImGuiWindowFlags_AlwaysAutoResize)) { - if (m_reporter) + if (ImGui::Checkbox("Show Bandwidth over Entities", &m_displayPerEntityBandwidth)) { - m_reporter->OnImGuiUpdate(); + // This overrides @net_DebugNetworkEntity_ShowBandwidth value + if (m_reporter == nullptr) + { + ShowEntityBandwidthDebugOverlay(); + } } - else + + if (m_reporter) { - ShowEntityBandwidthDebugOverlay(); + m_reporter->OnImGuiUpdate(); } } } diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h index 87b238c79b..9be53cca02 100644 --- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h +++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h @@ -60,7 +60,9 @@ namespace Multiplayer private: bool m_displayNetworkingStats = false; bool m_displayMultiplayerStats = false; + bool m_displayPerEntityStats = false; + bool m_displayPerEntityBandwidth = false; AZStd::unique_ptr m_reporter; };