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

Update submodules to fix compilation error on newer Clang and GCC (#2890)

Browse Source 
* Update submodules

* Update Ghoul
This commit is contained in:
Alexander Bock
2023-09-13 09:51:30 +02:00
committed by GitHub
parent a4af241cad
commit 7483b912e0
19 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/ext/sgct
+1 -1
Submodule apps/OpenSpace/ext/sgct updated: 654a594e2d...ada33efc9e
ext/ghoul
+1 -1
Submodule ext/ghoul updated: c50518fb79...fb549390c1
modules/base/rendering/renderablenodeline.cpp
+2 -2
View File
@@ -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()
));
}
});
modules/base/rendering/renderableplaneimageonline.cpp
+1 -1
View File
@@ -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;
}
modules/base/rendering/renderableplanetimevaryingimage.cpp
+2 -2
View File
@@ -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;
}
modules/base/rendering/renderablesphereimageonline.cpp
+1 -1
View File
@@ -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;
}
modules/base/rendering/screenspaceimagelocal.cpp
+3 -1
View File
@@ -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 {
modules/base/rendering/screenspaceimageonline.cpp
+1 -1
View File
@@ -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;
}
modules/cefwebgui/cefwebguimodule.cpp
+1 -1
View File
@@ -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<BrowserInstance>(
modules/gaia/rendering/renderablegaiastars.cpp
+1 -1
View File
@@ -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);
modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+5 -5
View File
@@ -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
modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+1 -1
View File
@@ -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) {
modules/space/horizonsfile.cpp
+4 -2
View File
@@ -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<std::string>(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
));
}
}
modules/space/rendering/renderableorbitalkepler.cpp
+1 -1
View File
@@ -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
));
}
modules/space/rendering/renderablestars.cpp
+2 -2
View File
@@ -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()));
}
});
modules/video/src/videoplayer.cpp
+2 -1
View File
@@ -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<int>(event->event_id), event->reply_userdata
));
break;
}
modules/vislab/rendering/renderabledistancelabel.cpp
+3 -1
View File
@@ -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;
}
}
src/navigation/pathnavigator.cpp
+1 -1
View File
@@ -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;
}
src/scene/assetmanager.cpp
+2 -2
View File
@@ -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 {