From 0c12bb5a4ea613697599d77ad3970cdb0390596f Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 2 Nov 2015 18:47:18 -0800 Subject: [PATCH] Remove idleTimer and call idle directly from paintGL. --- interface/src/Application.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6d41679bea..4c55e05b01 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -160,7 +160,6 @@ static QTimer balanceUpdateTimer; static QTimer identityPacketTimer; static QTimer billboardPacketTimer; static QTimer checkFPStimer; -static QTimer idleTimer; static const QString SNAPSHOT_EXTENSION = ".jpg"; static const QString SVO_EXTENSION = ".svo"; @@ -844,7 +843,6 @@ void Application::cleanupBeforeQuit() { identityPacketTimer.stop(); billboardPacketTimer.stop(); checkFPStimer.stop(); - idleTimer.stop(); QMetaObject::invokeMethod(&_settingsTimer, "stop", Qt::BlockingQueuedConnection); // save state @@ -982,9 +980,6 @@ void Application::initializeGL() { connect(&checkFPStimer, &QTimer::timeout, this, &Application::checkFPS); checkFPStimer.start(1000); - // call our idle function whenever we can - connect(&idleTimer, &QTimer::timeout, this, &Application::idle); - idleTimer.start(TARGET_SIM_FRAME_PERIOD_MS); _idleLoopStdev.reset(); // update before the first render @@ -1048,6 +1043,9 @@ void Application::initializeUi() { } void Application::paintGL() { + + idle(); + PROFILE_RANGE(__FUNCTION__); PerformanceTimer perfTimer("paintGL");