Feature/path normalization (#1674)

* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
This commit is contained in:
Alexander Bock
2021-07-01 23:46:22 +02:00
committed by GitHub
parent 20aa307ece
commit 87da9a27ab
56 changed files with 299 additions and 282 deletions
+3 -6
View File
@@ -865,7 +865,7 @@ void RenderableStars::loadPSFTexture() {
if (_pointSpreadFunctionTexture) {
LDEBUG(fmt::format(
"Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
"Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
));
_pointSpreadFunctionTexture->uploadTexture();
}
@@ -1267,10 +1267,7 @@ void RenderableStars::update(const UpdateData&) {
absPath(_colorTexturePath).string()
);
if (_colorTexture) {
LDEBUG(fmt::format(
"Loaded texture from '{}'",
absPath(_colorTexturePath)
));
LDEBUG(fmt::format("Loaded texture from {}", absPath(_colorTexturePath)));
_colorTexture->uploadTexture();
}
@@ -1293,7 +1290,7 @@ void RenderableStars::update(const UpdateData&) {
);
if (_otherDataColorMapTexture) {
LDEBUG(fmt::format(
"Loaded texture from '{}'",
"Loaded texture from {}",
absPath(_otherDataColorMapPath)
));
_otherDataColorMapTexture->uploadTexture();