mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-22 12:11:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/warnings (#1885)

Browse Source 
Remove many warnings from MSVC, Clang, and GCC
This commit is contained in:
Alexander Bock
2022-02-16 18:33:12 +01:00
committed by GitHub
parent 40ed640bc8
commit e8072495ec
47 changed files with 92 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/openspaceengine.cpp
View File

@@ -740,7 +740,6 @@ void OpenSpaceEngine::loadAssets() {
_loadingScreen->setPhase(LoadingScreen::Phase::Construction);
_loadingScreen->postMessage("Loading assets");
bool loading = true;
while (true) {
_loadingScreen->render();
_assetManager->update();
@@ -756,16 +755,16 @@ void OpenSpaceEngine::loadAssets() {
if (sync->isSyncing()) {
LoadingScreen::ProgressInfo progressInfo;
progressInfo.progress = [](const ResourceSynchronization* sync) {
if (!sync->nTotalBytesIsKnown()) {
progressInfo.progress = [](const ResourceSynchronization* s) {
if (!s->nTotalBytesIsKnown()) {
return 0.f;
}
if (sync->nTotalBytes() == 0) {
if (s->nTotalBytes() == 0) {
return 1.f;
}
return
static_cast<float>(sync->nSynchronizedBytes()) /
static_cast<float>(sync->nTotalBytes());
static_cast<float>(s->nSynchronizedBytes()) /
static_cast<float>(s->nTotalBytes());
}(sync);
_loadingScreen->updateItem(
@@ -801,7 +800,6 @@ void OpenSpaceEngine::loadAssets() {
break;
}
loading = false;
auto it = allSyncs.begin();
while (it != allSyncs.end()) {
if ((*it)->isSyncing()) {
@@ -824,7 +822,6 @@ void OpenSpaceEngine::loadAssets() {
progressInfo.totalSize = (*it)->nTotalBytes();
}
loading = true;
_loadingScreen->updateItem(
(*it)->identifier(),
(*it)->name(),