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/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+2 -2
View File
@@ -681,7 +681,7 @@ void RenderablePlanetProjection::loadColorTexture() {
_baseTexture = nullptr;
if (selectedPath != NoImageText) {
_baseTexture = ghoul::io::TextureReader::ref().loadTexture(
absPath(selectedPath)
absPath(selectedPath).string()
);
if (_baseTexture) {
ghoul::opengl::convertTextureFormat(*_baseTexture, Texture::Format::RGB);
@@ -703,7 +703,7 @@ void RenderablePlanetProjection::loadHeightTexture() {
_heightMapTexture = nullptr;
if (selectedPath != NoImageText) {
_heightMapTexture = ghoul::io::TextureReader::ref().loadTexture(
absPath(selectedPath)
absPath(selectedPath).string()
);
if (_heightMapTexture) {
ghoul::opengl::convertTextureFormat(*_heightMapTexture, Texture::Format::RGB);