mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -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/volume/rendering/renderabletimevaryingvolume.cpp
+4 -4
View File
@@ -172,8 +172,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
{
const Parameters p = codegen::bake<Parameters>(dictionary);
_sourceDirectory = absPath(p.sourceDirectory);
_transferFunctionPath = absPath(p.transferFunction);
_sourceDirectory = absPath(p.sourceDirectory).string();
_transferFunctionPath = absPath(p.transferFunction).string();
_transferFunction = std::make_shared<openspace::TransferFunction>(
_transferFunctionPath,
[](const openspace::TransferFunction&) {}
@@ -210,10 +210,10 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
RenderableTimeVaryingVolume::~RenderableTimeVaryingVolume() {}
void RenderableTimeVaryingVolume::initializeGL() {
std::string sequenceDir = absPath(_sourceDirectory);
std::filesystem::path sequenceDir = absPath(_sourceDirectory);
if (!std::filesystem::is_directory(sequenceDir)) {
LERROR(fmt::format("Could not load sequence directory '{}'", sequenceDir));
LERROR(fmt::format("Could not load sequence directory {}", sequenceDir));
return;
}