mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -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/basicvolumeraycaster.cpp
+4 -5
View File
@@ -162,22 +162,21 @@ bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
}
std::string BasicVolumeRaycaster::boundsVertexShaderPath() const {
return absPath(GlslBoundsVsPath);
return absPath(GlslBoundsVsPath).string();
}
std::string BasicVolumeRaycaster::boundsFragmentShaderPath() const {
return absPath(GlslBoundsFsPath);
return absPath(GlslBoundsFsPath).string();
}
std::string BasicVolumeRaycaster::raycasterPath() const {
return absPath(GlslRaycastPath);
return absPath(GlslRaycastPath).string();
}
std::string BasicVolumeRaycaster::helperPath() const {
return absPath(GlslHelperPath);
return absPath(GlslHelperPath).string();
}
void BasicVolumeRaycaster::setTransferFunction(
std::shared_ptr<openspace::TransferFunction> transferFunction)
{