mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use more filesystem::path where applicable

Browse Source
This commit is contained in:
Alexander Bock
2024-04-06 19:50:39 +02:00
parent 2af06fb641
commit 4328476d26
148 changed files with 712 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/space/rendering/renderablerings.cpp
View File

@@ -88,7 +88,7 @@ namespace {
struct [[codegen::Dictionary(RenderableRings)]] Parameters {
// [[codegen::verbatim(TextureInfo.description)]]
std::string texture;
std::filesystem::path texture;
// [[codegen::verbatim(SizeInfo.description)]]
float size;
@@ -128,7 +128,7 @@ RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
_size.onChange([this]() { _planeIsDirty = true; });
addProperty(_size);
_texturePath = absPath(p.texture).string();
_texturePath = p.texture.string();
_textureFile = std::make_unique<File>(_texturePath.value());
_offset = p.offset.value_or(_offset);
@@ -239,7 +239,7 @@ void RenderableRings::loadTexture() {
using namespace ghoul::io;
using namespace ghoul::opengl;
std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
absPath(_texturePath).string(),
absPath(_texturePath),
1
);