From b7820f4649ea35f289979bea9e862ebca1cbde73 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 27 Feb 2023 15:43:49 +0100 Subject: [PATCH] Update SGCT repository --- apps/OpenSpace/ext/sgct | 2 +- apps/OpenSpace/main.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 4a555d7922..6f24259a55 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 4a555d7922d161a0ada27e060e3741cfd6c336fa +Subproject commit 6f24259a5560116e06f46f010c54a72ad620e80f diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 9c97586b33..beb302cd68 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -658,7 +658,7 @@ std::vector mainEncodeFun() { -void mainDecodeFun(const std::vector& data, unsigned int) { +void mainDecodeFun(const std::vector& data) { ZoneScoped LTRACE("main::mainDecodeFun(begin)"); @@ -711,9 +711,7 @@ void setSgctDelegateFunctions() { sgctDelegate.averageDeltaTime = []() { ZoneScoped - return Engine::instance().statistics().avgDt( - Engine::instance().currentFrameNumber() - ); + return Engine::instance().statistics().avgDt(); }; sgctDelegate.minDeltaTime = []() { ZoneScoped @@ -733,7 +731,7 @@ void setSgctDelegateFunctions() { sgctDelegate.applicationTime = []() { ZoneScoped - return sgct::Engine::getTime(); + return time(); }; sgctDelegate.currentWindowSize = []() { ZoneScoped @@ -1077,7 +1075,6 @@ int main(int argc, char* argv[]) { LogMgr.addLog(std::make_unique()); } #endif // WIN32 - } ghoul::initialize(); @@ -1366,7 +1363,7 @@ int main(int argc, char* argv[]) { Engine::instance().setSyncParameters(false, 15.f * 60.f); LINFO("Starting rendering loop"); - Engine::instance().render(); + Engine::instance().exec(); LINFO("Ending rendering loop"); global::openSpaceEngine->deinitializeGL();