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

Imgui per entity works

Browse Source 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
This commit is contained in:
AMZN-Olex
2021-07-26 21:59:19 -04:00
parent f29fd86a39
commit a2f3066fa3
13 changed files with 155 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.h
+7 -50
View File
@@ -7,7 +7,6 @@
*/
#pragma once
#include <GridMate/Drillers/ReplicaDriller.h>
#include "MultiplayerDebugByteReporter.h"
#include <AzCore/Component/EntityId.h>
@@ -22,66 +21,27 @@ namespace MultiplayerDiagnostics
* \brief GridMate network live analysis tool via ImGui.
*/
class MultiplayerDebugPerEntityReporter
: public AZ::Interface<MultilayerIPerEntityStats>::Registrar
: public AZ::Interface<MultiplayerIPerEntityStats>::Registrar
{
public:
MultiplayerDebugPerEntityReporter();
~MultiplayerDebugPerEntityReporter() override;
MultiplayerDebugPerEntityReporter() = default;
~MultiplayerDebugPerEntityReporter() override = default;
// main update loop
void OnImGuiUpdate();
//! MultilayerIPerEntityStats
// @{
void RecordEntitySerializeStart(AZ::EntityId entityId, const char* entityName);
void RecordEntitySerializeStop(AZ::EntityId entityId, const char* entityName);
void RecordEntitySerializeStart(AzNetworking::SerializerMode mode, AZ::EntityId entityId, const char* entityName) override;
void RecordComponentSerializeEnd(AzNetworking::SerializerMode mode, Multiplayer::NetComponentId netComponentId) override;
void RecordEntitySerializeStop(AzNetworking::SerializerMode mode, AZ::EntityId entityId, const char* entityName) override;
void RecordPropertySent(Multiplayer::NetComponentId netComponentId, Multiplayer::PropertyIndex propertyId, uint32_t totalBytes) override;
void RecordPropertyReceived(Multiplayer::NetComponentId netComponentId, Multiplayer::PropertyIndex propertyId, uint32_t totalBytes) override;
void RecordRpcSent(Multiplayer::NetComponentId netComponentId, Multiplayer::RpcIndex rpcId, uint32_t totalBytes) override;
// }@
/*void OnReceiveReplicaBegin(AZ::EntityId entityId, const void* data, size_t len) override;
void OnReceiveReplicaEnd(AZ::EntityId entityId) override;
void OnReceiveReplicaChunkEnd(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex) override;
void OnReceiveDataSet(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::DataSetBase* dataSet, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnReceiveRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;*/
// ReplicaDrillerBus - sending
/*void OnSendReplicaBegin(AZ::EntityId entityId) override;
void OnSendReplicaEnd(AZ::EntityId entityId, const void* data, size_t len) override;
void OnSendReplicaChunkEnd(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, const void* data, size_t len) override;
void OnSendDataSet(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::DataSetBase* dataSet, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;
void OnSendRpc(GridMate::ReplicaChunkBase* chunk, AZ::u32 chunkIndex, GridMate::Internal::RpcRequest* rpc, GridMate::PeerId from, GridMate::PeerId to, const void* data, size_t len) override;*/
//// CarrierDrillerBus
//void OnIncomingConnection (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
//void OnFailedToConnect (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::CarrierDisconnectReason reason) override;
//void OnConnectionEstablished (GridMate::Carrier* carrier, GridMate::ConnectionID id) override;
//void OnDisconnect (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::CarrierDisconnectReason reason) override;
//void OnDriverError (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// const GridMate::DriverError& error) override;
//void OnSecurityError (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// const GridMate::SecurityError& error) override;
//void OnUpdateStatistics (const GridMate::string& address,
// const GridMate::TrafficControl::Statistics& lastSecond,
// const GridMate::TrafficControl::Statistics& lifeTime,
// const GridMate::TrafficControl::Statistics& effectiveLastSecond,
// const GridMate::TrafficControl::Statistics& effectiveLifeTime) override;
//void OnConnectionStateChanged (GridMate::Carrier* carrier,
// GridMate::ConnectionID id,
// GridMate::Carrier::ConnectionStates newState) override;
private:
bool m_showServerReportWindow = false;
bool m_isTrackingMessages = false;
AZStd::map<AZStd::string, EntityReporter> m_sendingEntityReports{};
EntityReporter m_currentSendingEntityReport;
@@ -90,8 +50,5 @@ namespace MultiplayerDiagnostics
float m_replicatedStateKbpsWarn = 10.f;
float m_replicatedStateMaxSizeWarn = 30.f;
void UpdateTrafficStatistics();
AZStd::map<GridMate::string, GridMate::TrafficControl::Statistics> m_lastSecondStats;
};
}