Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fps calculation now based on moving average

Browse source 
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
This commit is contained in:
Anthony J. Thibault 2015-11-03 11:19:49 -08:00
parent 0c12bb5a4e
commit c139b62217
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/src/Application.cpp
View file

@ -159,7 +159,7 @@ static QTimer locationUpdateTimer;
static QTimer balanceUpdateTimer; static QTimer balanceUpdateTimer;
static QTimer identityPacketTimer; static QTimer identityPacketTimer;
static QTimer billboardPacketTimer; static QTimer billboardPacketTimer;
static QTimer checkFPStimer; static QTimer pingTimer;
static const QString SNAPSHOT_EXTENSION = ".jpg"; static const QString SNAPSHOT_EXTENSION = ".jpg";
static const QString SVO_EXTENSION = ".svo"; static const QString SVO_EXTENSION = ".svo";
@ -183,9 +183,7 @@ static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS
static const QString INFO_HELP_PATH = "html/interface-welcome.html"; static const QString INFO_HELP_PATH = "html/interface-welcome.html";
static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html"; static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html";
static const unsigned int TARGET_SIM_FRAMERATE = 60;
static const unsigned int THROTTLED_SIM_FRAMERATE = 15; static const unsigned int THROTTLED_SIM_FRAMERATE = 15;
static const int TARGET_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / TARGET_SIM_FRAMERATE;
static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE; static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;
#ifndef __APPLE__ #ifndef __APPLE__
@ -842,7 +840,7 @@ void Application::cleanupBeforeQuit() {
balanceUpdateTimer.stop(); balanceUpdateTimer.stop();
identityPacketTimer.stop(); identityPacketTimer.stop();
billboardPacketTimer.stop(); billboardPacketTimer.stop();
checkFPStimer.stop(); pingTimer.stop();
QMetaObject::invokeMethod(&_settingsTimer, "stop", Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(&_settingsTimer, "stop", Qt::BlockingQueuedConnection);
// save state // save state
@ -977,8 +975,8 @@ void Application::initializeGL() {
_entityEditSender.initialize(_enableProcessOctreeThread); _entityEditSender.initialize(_enableProcessOctreeThread);
// call our timer function every second // call our timer function every second
connect(&checkFPStimer, &QTimer::timeout, this, &Application::checkFPS); connect(&pingTimer, &QTimer::timeout, this, &Application::ping);
checkFPStimer.start(1000); pingTimer.start(1000);
_idleLoopStdev.reset(); _idleLoopStdev.reset();
@ -1312,7 +1310,6 @@ void Application::paintGL() {
{ {
PerformanceTimer perfTimer("makeCurrent"); PerformanceTimer perfTimer("makeCurrent");
_offscreenContext->makeCurrent(); _offscreenContext->makeCurrent();
_frameCount++;
Stats::getInstance()->setRenderDetails(renderArgs._details); Stats::getInstance()->setRenderDetails(renderArgs._details);
// Reset the gpu::Context Stages // Reset the gpu::Context Stages
@ -1321,6 +1318,24 @@ void Application::paintGL() {
batch.resetStages(); batch.resetStages();
}); });
} }
// update fps moving average
{
uint64_t now = usecTimestampNow();
static uint64_t lastPaintEnd{ now };
uint64_t diff = now - lastPaintEnd;
if (diff != 0) {
_framesPerSecond.updateAverage((float)USECS_PER_SECOND / (float)diff);
}
lastPaintEnd = now;
// update fps once a second
if (now - _lastFramesPerSecondUpdate > USECS_PER_SECOND) {
_fps = _framesPerSecond.getAverage();
_lastFramesPerSecondUpdate = now;
}
_frameCount++;
}
} }
void Application::runTests() { void Application::runTests() {
@ -2085,17 +2100,11 @@ bool Application::acceptSnapshot(const QString& urlString) {
return true; return true;
} }
// Every second, check the frame rates and other stuff // Every second, send a ping, if menu item is checked.
void Application::checkFPS() { void Application::ping() {
if (Menu::getInstance()->isOptionChecked(MenuOption::TestPing)) { if (Menu::getInstance()->isOptionChecked(MenuOption::TestPing)) {
DependencyManager::get<NodeList>()->sendPingPackets(); DependencyManager::get<NodeList>()->sendPingPackets();
} }
float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0f;
_fps = (float)_frameCount / diffTime;
_frameCount = 0;
_timerStart.start();
} }
void Application::idle() { void Application::idle() {

4
interface/src/Application.h
View file

@ -306,7 +306,7 @@ public slots:
private slots: private slots:
void clearDomainOctreeDetails(); void clearDomainOctreeDetails();
void checkFPS(); void ping();
void idle(); void idle();
void aboutToQuit(); void aboutToQuit();
@ -541,6 +541,8 @@ private:
EntityItemID _keyboardFocusedItem; EntityItemID _keyboardFocusedItem;
quint64 _lastAcceptedKeyPress = 0; quint64 _lastAcceptedKeyPress = 0;
SimpleMovingAverage _framesPerSecond{10};
quint64 _lastFramesPerSecondUpdate = 0;
SimpleMovingAverage _simsPerSecond{10}; SimpleMovingAverage _simsPerSecond{10};
int _simsPerSecondReport = 0; int _simsPerSecondReport = 0;
quint64 _lastSimsPerSecondUpdate = 0; quint64 _lastSimsPerSecondUpdate = 0;