From 7483b912e0f96eedaf3f4097c4179b33e706c0fa Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 13 Sep 2023 09:51:30 +0200 Subject: [PATCH] Update submodules to fix compilation error on newer Clang and GCC (#2890) * Update submodules * Update Ghoul --- apps/OpenSpace/ext/sgct | 2 +- ext/ghoul | 2 +- modules/base/rendering/renderablenodeline.cpp | 4 ++-- modules/base/rendering/renderableplaneimageonline.cpp | 2 +- .../base/rendering/renderableplanetimevaryingimage.cpp | 4 ++-- modules/base/rendering/renderablesphereimageonline.cpp | 2 +- modules/base/rendering/screenspaceimagelocal.cpp | 4 +++- modules/base/rendering/screenspaceimageonline.cpp | 2 +- modules/cefwebgui/cefwebguimodule.cpp | 2 +- modules/gaia/rendering/renderablegaiastars.cpp | 2 +- modules/globebrowsing/src/geojson/geojsoncomponent.cpp | 10 +++++----- .../rendering/renderablekameleonvolume.cpp | 2 +- modules/space/horizonsfile.cpp | 6 ++++-- modules/space/rendering/renderableorbitalkepler.cpp | 2 +- modules/space/rendering/renderablestars.cpp | 4 ++-- modules/video/src/videoplayer.cpp | 3 ++- modules/vislab/rendering/renderabledistancelabel.cpp | 4 +++- src/navigation/pathnavigator.cpp | 2 +- src/scene/assetmanager.cpp | 4 ++-- 19 files changed, 35 insertions(+), 28 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 654a594e2d..ada33efc9e 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 654a594e2d6e8f8784b1f73b02ae96ff33be0848 +Subproject commit ada33efc9e65fc6db36d1f75d9782afdcac80cef diff --git a/ext/ghoul b/ext/ghoul index c50518fb79..fb549390c1 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit c50518fb79edd741b41130f04143605232579495 +Subproject commit fb549390c101cfcaac34f490185854faeb18911d diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index 11a50606fd..a4b922c3f4 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -186,7 +186,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary) "Trying to use relative offsets for start node '{}' that has no " "bounding sphere. This will result in no offset. Use direct " "values by setting UseRelativeOffsets to false", - parent()->identifier(), _start + parent()->identifier(), _start.value() )); } }); @@ -204,7 +204,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary) "Trying to use relative offsets for end node '{}' that has no " "bounding sphere. This will result in no offset. Use direct " "values by setting UseRelativeOffsets to false", - parent()->identifier(), _end + parent()->identifier(), _end.value() )); } }); diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp index 65c9f4ffb1..a7d876237d 100644 --- a/modules/base/rendering/renderableplaneimageonline.cpp +++ b/modules/base/rendering/renderableplaneimageonline.cpp @@ -134,7 +134,7 @@ void RenderablePlaneImageOnline::update(const UpdateData& data) { if (imageFile.corrupted) { LERRORC( "ScreenSpaceImageOnline", - fmt::format("Error loading image from URL '{}'", _texturePath) + fmt::format("Error loading image from URL '{}'", _texturePath.value()) ); return; } diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp index 27c93f371a..b7d498ed47 100644 --- a/modules/base/rendering/renderableplanetimevaryingimage.cpp +++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp @@ -98,7 +98,7 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage( if (!std::filesystem::is_directory(absPath(_sourceFolder))) { LERROR(fmt::format( "Time varying image, {} is not a valid directory", - _sourceFolder + _sourceFolder.value() )); } @@ -176,7 +176,7 @@ bool RenderablePlaneTimeVaryingImage::extractMandatoryInfoFromDictionary() { if (_sourceFiles.empty()) { LERROR(fmt::format( "{}: Plane sequence filepath {} was empty", - _identifier, _sourceFolder + _identifier, _sourceFolder.value() )); return false; } diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp index d21e9d4bea..036fc52bcd 100644 --- a/modules/base/rendering/renderablesphereimageonline.cpp +++ b/modules/base/rendering/renderablesphereimageonline.cpp @@ -98,7 +98,7 @@ void RenderableSphereImageOnline::update(const UpdateData& data) { if (imageFile.corrupted) { LERRORC( "RenderableSphereImageOnline", - fmt::format("Error loading image from URL '{}'", _textureUrl) + fmt::format("Error loading image from URL '{}'", _textureUrl.value()) ); return; } diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp index d84cf9b011..2115750690 100644 --- a/modules/base/rendering/screenspaceimagelocal.cpp +++ b/modules/base/rendering/screenspaceimagelocal.cpp @@ -85,7 +85,9 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary if (!std::filesystem::is_regular_file(absPath(_texturePath))) { LWARNINGC( "ScreenSpaceImageLocal", - fmt::format("Image {} did not exist for {}", _texturePath, _identifier) + fmt::format( + "Image {} did not exist for {}", _texturePath.value(), _identifier + ) ); } else { diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp index 71160a3eb2..e39b422288 100644 --- a/modules/base/rendering/screenspaceimageonline.cpp +++ b/modules/base/rendering/screenspaceimageonline.cpp @@ -110,7 +110,7 @@ void ScreenSpaceImageOnline::update() { if (imageFile.corrupted) { LERRORC( "ScreenSpaceImageOnline", - fmt::format("Error loading image from URL '{}'", _texturePath) + fmt::format("Error loading image from URL '{}'", _texturePath.value()) ); return; } diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index 193a12a242..e9c81bd121 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -102,7 +102,7 @@ void CefWebGuiModule::startOrStopGui() { const bool isMaster = global::windowDelegate->isMaster(); if (_enabled && isMaster) { - LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url)); + LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url.value())); if (!_instance) { _instance = std::make_unique( diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp index 2b83ce82c0..cd2d5baded 100644 --- a/modules/gaia/rendering/renderablegaiastars.cpp +++ b/modules/gaia/rendering/renderablegaiastars.cpp @@ -511,7 +511,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary) _dataIsDirty = true; } else { - LWARNING(fmt::format("File not found: {}", _filePath)); + LWARNING(fmt::format("File not found: {}", _filePath.value())); } }); addProperty(_filePath); diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp index 1d876df11b..e87bf58e67 100644 --- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp +++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp @@ -369,7 +369,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary, else { LERROR(fmt::format( "Provided texture file does not exist: '{}'", - _defaultProperties.pointTexture + _defaultProperties.pointTexture.value() )); } }); @@ -593,7 +593,7 @@ void GeoJsonComponent::readFile() { std::ifstream file(_geoJsonFile); if (!file.good()) { - LERROR(fmt::format("Failed to open GeoJSON file: {}", _geoJsonFile)); + LERROR(fmt::format("Failed to open GeoJSON file: {}", _geoJsonFile.value())); return; } @@ -628,7 +628,7 @@ void GeoJsonComponent::readFile() { catch (const geos::util::GEOSException& e) { LERROR(fmt::format( "Error creating GeoJson layer with identifier '{}'. Problem reading " - "GeoJson file '{}'. Error: '{}'", identifier(), _geoJsonFile, e.what() + "GeoJson file '{}'. Error: '{}'", identifier(), _geoJsonFile.value(), e.what() )); } @@ -649,7 +649,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur // Null geometry => no geometries to add LWARNING(fmt::format( "Feature {} in GeoJson file '{}' is a null geometry and will not be loaded", - indexInFile, _geoJsonFile + indexInFile, _geoJsonFile.value() )); // @TODO (emmbr26) We should eventually support features with null geometry } @@ -702,7 +702,7 @@ void GeoJsonComponent::parseSingleFeature(const geos::io::GeoJSONFeature& featur LERROR(fmt::format( "Error creating GeoJson layer with identifier '{}'. Problem reading " "feature {} in GeoJson file '{}'.", - identifier(), indexInFile, _geoJsonFile + identifier(), indexInFile, _geoJsonFile.value() )); LERRORC(error.component, error.message); // Do nothing diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp index a4a45dd2f4..7a77315239 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp @@ -361,7 +361,7 @@ void RenderableKameleonVolume::load() { std::string RenderableKameleonVolume::cacheSuffix() const { glm::uvec3 dims = _dimensions; - return fmt::format(".{}.{}x{}x{}", _variable, dims[0], dims[1], dims[2]); + return fmt::format(".{}.{}x{}x{}", _variable.value(), dims[0], dims[1], dims[2]); } void RenderableKameleonVolume::loadFromPath(const std::string& path) { diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp index 6e4bb00c0f..83ceae3953 100644 --- a/modules/space/horizonsfile.cpp +++ b/modules/space/horizonsfile.cpp @@ -163,7 +163,9 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) { if (auto signature = answer.find("signature"); signature != answer.end()) { if (auto source = signature->find("source"); source != signature->end()) { if (*source != static_cast(ApiSource)) { - LWARNING(fmt::format("Horizons answer from unkown source '{}'", *source)); + LWARNING(fmt::format( + "Horizons answer from unknown source '{}'", source->dump() + )); } } else { @@ -178,7 +180,7 @@ HorizonsResultCode isValidHorizonsAnswer(const json& answer) { if (v != CurrentMajorVersion) { LWARNING(fmt::format( "Unknown Horizons major version '{}' found. The currently supported " - "major version is {}", *version, CurrentMajorVersion + "major version is {}", version->dump(), CurrentMajorVersion )); } } diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp index 722801c5eb..0b5174457c 100644 --- a/modules/space/rendering/renderableorbitalkepler.cpp +++ b/modules/space/rendering/renderableorbitalkepler.cpp @@ -313,7 +313,7 @@ void RenderableOrbitalKepler::updateBuffers() { if (_startRenderIdx >= _numObjects) { throw ghoul::RuntimeError(fmt::format( - "Start index {} out of range [0, {}]", _startRenderIdx, _numObjects + "Start index {} out of range [0, {}]", _startRenderIdx.value(), _numObjects )); } diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 87d8ca7d6b..9309473b57 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -662,7 +662,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary) _colorTextureIsDirty = true; } else { - LWARNING(fmt::format("File not found: {}", _colorTexturePath)); + LWARNING(fmt::format("File not found: {}", _colorTexturePath.value())); } }); _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; }); @@ -682,7 +682,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary) _otherDataColorMapIsDirty = true; } else { - LWARNING(fmt::format("File not found: {}", _otherDataColorMapPath)); + LWARNING(fmt::format("File not found: {}", _otherDataColorMapPath.value())); } }); diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp index 3b69a3f744..ca44dc492c 100644 --- a/modules/video/src/videoplayer.cpp +++ b/modules/video/src/videoplayer.cpp @@ -564,7 +564,8 @@ void VideoPlayer::handleMpvEvents() { } if (!checkMpvError(event->error)) { LWARNING(fmt::format( - "Error at mpv event : {} {}", event->event_id, event->reply_userdata + "Error at mpv event: {} {}", + static_cast(event->event_id), event->reply_userdata )); break; } diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp index 80c2fa3aac..76a04775b4 100644 --- a/modules/vislab/rendering/renderabledistancelabel.cpp +++ b/modules/vislab/rendering/renderabledistancelabel.cpp @@ -155,7 +155,9 @@ void RenderableDistanceLabel::update(const UpdateData&) { } } else { - LERROR(fmt::format("There is no scenegraph node with id {}", _nodelineId)); + LERROR(fmt::format( + "There is no scenegraph node with id {}", _nodelineId.value() + )); _errorThrown = true; } } diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp index 838df0eebb..a937ec4af5 100644 --- a/src/navigation/pathnavigator.cpp +++ b/src/navigation/pathnavigator.cpp @@ -414,7 +414,7 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const LDEBUG(fmt::format( "The scene graph node '{}' has no, or a very small, bounding sphere. Using " "minimal value of {}. This might lead to unexpected results", - node->identifier(), _minValidBoundingSphere + node->identifier(), _minValidBoundingSphere.value() )); result = _minValidBoundingSphere; } diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index 4181214ee7..f29e23fb14 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -826,8 +826,8 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path, "Loading asset {0} from {1} with enable state {3} different from " "initial loading from {2} with state {4}. Only {4} will have an " "effect", - path, retriever, a->firstParent()->path(), explicitEnable, - a->explicitEnabled() + path, retriever, a->firstParent()->path(), + explicitEnable.value_or(true), a->explicitEnabled().value_or(true) )); } else {