mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 01:41:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adds warning and error messages on loading screen (#2941)

Browse Source 
Fixes task 1 of (#494)

* Removed loading screen progress bar

It was removed because it does not show an accurate estimation of load times and is rarely used (off by default)

* Add status info to the loading screen on warnings and errors 

Add: Warning logs and above to loading screen, fixes task 1 of (#494)
Removed code duplication in openspanceengine.cpp
Fixed some bugs where completed assets would not disappear from the screen

* Update the design & address PR comments

* Address PR comments & add bool to show/hide log msg

* Delete test_configuration.cpp

* Update Ghoul submodule

* Renders number of warnings and errors to screen

* Update renderengine.cpp

* Adapt new function to the coding style

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
This commit is contained in:
Andreas Engberg
2023-11-14 15:40:30 +01:00
committed by GitHub
parent c54e72136d
commit 9343c6315d
9 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/engine/openspaceengine.cpp
View File

@@ -62,6 +62,7 @@
#include <openspace/scripting/scriptengine.h>
#include <openspace/util/factorymanager.h>
#include <openspace/util/memorymanager.h>
#include <openspace/util/screenlog.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/timemanager.h>
#include <openspace/util/transformationmanager.h>
@@ -477,17 +478,13 @@ void OpenSpaceEngine::initializeGL() {
LoadingScreen::ShowNodeNames(
global::configuration->loadingScreen.isShowingNodeNames
),
LoadingScreen::ShowProgressbar(
global::configuration->loadingScreen.isShowingProgressbar
LoadingScreen::ShowLogMessages(
global::configuration->loadingScreen.isShowingLogMessages
)
);
);
_loadingScreen->render();
LTRACE("OpenSpaceEngine::initializeGL::Console::initialize(begin)");
try {
global::luaConsole->initialize();
@@ -743,6 +740,8 @@ void OpenSpaceEngine::loadAssets() {
_loadingScreen->setPhase(LoadingScreen::Phase::Construction);
_loadingScreen->postMessage("Loading assets");
std::unordered_set<const ResourceSynchronization*> finishedSynchronizations;
while (true) {
_loadingScreen->render();
_assetManager->update();
@@ -752,59 +751,20 @@ void OpenSpaceEngine::loadAssets() {
std::vector<const ResourceSynchronization*> allSyncs =
_assetManager->allSynchronizations();
for (const ResourceSynchronization* sync : allSyncs) {
ZoneScopedN("Update resource synchronization");
if (sync->isSyncing()) {
LoadingScreen::ProgressInfo progressInfo;
progressInfo.progress = [](const ResourceSynchronization* s) {
if (!s->nTotalBytesIsKnown()) {
return 0.f;
}
if (s->nTotalBytes() == 0) {
return 1.f;
}
return
static_cast<float>(s->nSynchronizedBytes()) /
static_cast<float>(s->nTotalBytes());
}(sync);
_loadingScreen->updateItem(
sync->identifier(),
sync->name(),
LoadingScreen::ItemStatus::Started,
progressInfo
);
// Filter already synchronized assets so we don't check them anymore
auto syncIt = std::remove_if(
allSyncs.begin(),
allSyncs.end(),
[&finishedSynchronizations](const ResourceSynchronization* sync) {
return finishedSynchronizations.contains(sync);
}
if (sync->isRejected()) {
_loadingScreen->updateItem(
sync->identifier(), sync->name(), LoadingScreen::ItemStatus::Failed,
LoadingScreen::ProgressInfo()
);
}
}
_loadingScreen->setItemNumber(static_cast<int>(allSyncs.size()));
if (_shouldAbortLoading) {
global::windowDelegate->terminate();
break;
}
bool finishedLoading = std::all_of(
allAssets.begin(),
allAssets.end(),
[](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
);
if (finishedLoading) {
break;
}
allSyncs.erase(syncIt, allSyncs.end());
auto it = allSyncs.begin();
while (it != allSyncs.end()) {
ZoneScopedN("Update resource synchronization");
if ((*it)->isSyncing()) {
LoadingScreen::ProgressInfo progressInfo;
@@ -835,7 +795,9 @@ void OpenSpaceEngine::loadAssets() {
}
else if ((*it)->isRejected()) {
_loadingScreen->updateItem(
(*it)->identifier(), (*it)->name(), LoadingScreen::ItemStatus::Failed,
(*it)->identifier(),
(*it)->name(),
LoadingScreen::ItemStatus::Failed,
LoadingScreen::ProgressInfo()
);
++it;
@@ -844,17 +806,33 @@ void OpenSpaceEngine::loadAssets() {
LoadingScreen::ProgressInfo progressInfo;
progressInfo.progress = 1.f;
_loadingScreen->tickItem();
_loadingScreen->updateItem(
(*it)->identifier(),
(*it)->name(),
LoadingScreen::ItemStatus::Finished,
progressInfo
);
finishedSynchronizations.insert(*it);
it = allSyncs.erase(it);
}
}
}
if (_shouldAbortLoading) {
global::windowDelegate->terminate();
break;
}
bool finishedLoading = std::all_of(
allAssets.begin(),
allAssets.end(),
[](const Asset* asset) { return asset->isInitialized() || asset->isFailed(); }
);
if (finishedLoading) {
break;
}
} // while(true)
if (_shouldAbortLoading) {
_loadingScreen = nullptr;
return;