Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 11:22:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add total entity packets in stat (kbps)

Browse source
This commit is contained in:
SamGondelman 2017-08-28 13:47:27 -07:00 committed by Andrew Meadows
parent 6edba6d545
commit 247764b679
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/Stats.qml
View file

@ -206,6 +206,10 @@ Item {
text: "Audio Codec: " + root.audioCodec + " Noise Gate: " + text: "Audio Codec: " + root.audioCodec + " Noise Gate: " +
root.audioNoiseGate; root.audioNoiseGate;
} }
StatText {
visible: root.expanded;
text: "Entity Mixer In: " + root.entityPacketsInKbps + " kbps";
}
StatText { StatText {
visible: root.expanded; visible: root.expanded;
text: "Downloads: " + root.downloads + "/" + root.downloadLimit + text: "Downloads: " + root.downloads + "/" + root.downloadLimit +

3
interface/src/ui/Stats.cpp
View file

@ -180,10 +180,12 @@ void Stats::updateStats(bool force) {
int totalPingOctree = 0; int totalPingOctree = 0;
int octreeServerCount = 0; int octreeServerCount = 0;
int pingOctreeMax = 0; int pingOctreeMax = 0;
int totalEntityKbps = 0;
nodeList->eachNode([&](const SharedNodePointer& node) { nodeList->eachNode([&](const SharedNodePointer& node) {
// TODO: this should also support entities // TODO: this should also support entities
if (node->getType() == NodeType::EntityServer) { if (node->getType() == NodeType::EntityServer) {
totalPingOctree += node->getPingMs(); totalPingOctree += node->getPingMs();
totalEntityKbps += node->getInboundBandwidth();
octreeServerCount++; octreeServerCount++;
if (pingOctreeMax < node->getPingMs()) { if (pingOctreeMax < node->getPingMs()) {
pingOctreeMax = node->getPingMs(); pingOctreeMax = node->getPingMs();
@ -248,6 +250,7 @@ void Stats::updateStats(bool force) {
STAT_UPDATE(audioCodec, audioClient->getSelectedAudioFormat()); STAT_UPDATE(audioCodec, audioClient->getSelectedAudioFormat());
STAT_UPDATE(audioNoiseGate, audioClient->getNoiseGateOpen() ? "Open" : "Closed"); STAT_UPDATE(audioNoiseGate, audioClient->getNoiseGateOpen() ? "Open" : "Closed");
STAT_UPDATE(entityPacketsInKbps, octreeServerCount ? totalEntityKbps / octreeServerCount : -1);
auto loadingRequests = ResourceCache::getLoadingRequests(); auto loadingRequests = ResourceCache::getLoadingRequests();
STAT_UPDATE(downloads, loadingRequests.size()); STAT_UPDATE(downloads, loadingRequests.size());

2
interface/src/ui/Stats.h
View file

@ -85,6 +85,7 @@ class Stats : public QQuickItem {
STATS_PROPERTY(int, audioPacketLoss, 0) STATS_PROPERTY(int, audioPacketLoss, 0)
STATS_PROPERTY(QString, audioCodec, QString()) STATS_PROPERTY(QString, audioCodec, QString())
STATS_PROPERTY(QString, audioNoiseGate, QString()) STATS_PROPERTY(QString, audioNoiseGate, QString())
STATS_PROPERTY(int, entityPacketsInKbps, 0)
STATS_PROPERTY(int, downloads, 0) STATS_PROPERTY(int, downloads, 0)
STATS_PROPERTY(int, downloadLimit, 0) STATS_PROPERTY(int, downloadLimit, 0)
@ -212,6 +213,7 @@ signals:
void audioPacketLossChanged(); void audioPacketLossChanged();
void audioCodecChanged(); void audioCodecChanged();
void audioNoiseGateChanged(); void audioNoiseGateChanged();
void entityPacketsInKbpsChanged();
void downloadsChanged(); void downloadsChanged();
void downloadLimitChanged(); void downloadLimitChanged();