mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

Browse Source
This commit is contained in:
Alexander Bock
2021-05-17 00:23:15 +02:00
parent ccdc5a5dc3
commit 92432caed2
102 changed files with 431 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderablepoints.cpp
+4 -4
View File
@@ -138,7 +138,7 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
addProperty(_opacity);
registerUpdateRenderBinFromOpacity();
_speckFile = absPath(p.file);
_speckFile = absPath(p.file).string();
if (p.unit.has_value()) {
switch (*p.unit) {
@@ -175,7 +175,7 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
addProperty(_pointColor);
if (p.texture.has_value()) {
_spriteTexturePath = absPath(*p.texture);
_spriteTexturePath = absPath(*p.texture).string();
_spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
_spriteTexturePath.value()
);
@@ -188,7 +188,7 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
}
if (p.colorMap.has_value()) {
_colorMapFile = absPath(*p.colorMap);
_colorMapFile = absPath(*p.colorMap).string();
_hasColorMapFile = true;
}
@@ -360,7 +360,7 @@ void RenderablePoints::update(const UpdateData&) {
_spriteTexture = nullptr;
if (!_spriteTexturePath.value().empty()) {
_spriteTexture = ghoul::io::TextureReader::ref().loadTexture(
absPath(_spriteTexturePath)
absPath(_spriteTexturePath).string()
);
if (_spriteTexture) {
LDEBUG(fmt::format(