mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code Cleanup (#2191)

Browse Source 
* constexpr const -> constexpr
* const char* -> std::string_view
This commit is contained in:
Alexander Bock
2022-07-25 15:57:45 +02:00
committed by GitHub
parent ea1f4bbf40
commit 9cc4c595a8
267 changed files with 1425 additions and 1565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/volume/rendering/basicvolumeraycaster.cpp
View File

@@ -38,10 +38,10 @@
#include <sstream>
namespace {
constexpr const char* GlslRaycastPath = "${MODULE_VOLUME}/shaders/raycast.glsl";
constexpr const char* GlslHelperPath = "${MODULE_VOLUME}/shaders/helper.glsl";
constexpr const char* GlslBoundsVsPath = "${MODULE_VOLUME}/shaders/boundsvs.glsl";
constexpr const char* GlslBoundsFsPath = "${MODULE_VOLUME}/shaders/boundsfs.glsl";
constexpr std::string_view GlslRaycast = "${MODULE_VOLUME}/shaders/raycast.glsl";
constexpr std::string_view GlslHelper = "${MODULE_VOLUME}/shaders/helper.glsl";
constexpr std::string_view GlslBoundsVs = "${MODULE_VOLUME}/shaders/boundsvs.glsl";
constexpr std::string_view GlslBoundsFs = "${MODULE_VOLUME}/shaders/boundsfs.glsl";
} // namespace
namespace openspace::volume {
@@ -162,19 +162,19 @@ bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
}
std::string BasicVolumeRaycaster::boundsVertexShaderPath() const {
return absPath(GlslBoundsVsPath).string();
return absPath(GlslBoundsVs).string();
}
std::string BasicVolumeRaycaster::boundsFragmentShaderPath() const {
return absPath(GlslBoundsFsPath).string();
return absPath(GlslBoundsFs).string();
}
std::string BasicVolumeRaycaster::raycasterPath() const {
return absPath(GlslRaycastPath).string();
return absPath(GlslRaycast).string();
}
std::string BasicVolumeRaycaster::helperPath() const {
return absPath(GlslHelperPath).string();
return absPath(GlslHelper).string();
}
void BasicVolumeRaycaster::setTransferFunction(