mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update SGCT repository

Browse Source
This commit is contained in:
Alexander Bock
2023-02-27 15:43:49 +01:00
parent 087cb0a710
commit b7820f4649
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 4a555d7922...6f24259a55

11
apps/OpenSpace/main.cpp
View File

@@ -658,7 +658,7 @@ std::vector<std::byte> mainEncodeFun() {
void mainDecodeFun(const std::vector<std::byte>& data, unsigned int) {
void mainDecodeFun(const std::vector<std::byte>& 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<ghoul::logging::VisualStudioOutputLog>());
}
#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();