mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -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

2
modules/multiresvolume/rendering/brickmanager.cpp
View File

@@ -31,7 +31,7 @@
#include <glm/gtx/std_based_type.hpp>
namespace {
constexpr const char* _loggerCat = "BrickManager";
constexpr std::string_view _loggerCat = "BrickManager";
} // namespace
namespace openspace {

2
modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
View File

@@ -30,7 +30,7 @@
#include <ghoul/fmt.h>
namespace {
constexpr const char* _loggerCat = "LocalErrorHistogramManager";
constexpr std::string_view _loggerCat = "LocalErrorHistogramManager";
} // namespace
namespace openspace {

16
modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
View File

@@ -33,13 +33,13 @@
#include <ghoul/opengl/texture.h>
namespace {
constexpr const char* GlslRaycastPath =
constexpr std::string_view GlslRaycastPath =
"${MODULES}/multiresvolume/shaders/raycast.glsl";
constexpr const char* GlslHelperPath =
constexpr std::string_view GlslHelperPath =
"${MODULES}/multiresvolume/shaders/helper.glsl";
constexpr const char* GlslBoundsVsPath =
constexpr std::string_view GlslBoundsVsPath =
"${MODULES}/multiresvolume/shaders/boundsVs.glsl";
constexpr const char* GlslBoundsFsPath =
constexpr std::string_view GlslBoundsFsPath =
"${MODULES}/multiresvolume/shaders/boundsFs.glsl";
} // namespace
@@ -174,19 +174,19 @@ void MultiresVolumeRaycaster::postRaycast(const RaycastData&,
}
std::string MultiresVolumeRaycaster::boundsVertexShaderPath() const {
return GlslBoundsVsPath;
return std::string(GlslBoundsVsPath);
}
std::string MultiresVolumeRaycaster::boundsFragmentShaderPath() const {
return GlslBoundsFsPath;
return std::string(GlslBoundsFsPath);
}
std::string MultiresVolumeRaycaster::raycasterPath() const {
return GlslRaycastPath;
return std::string(GlslRaycastPath);
}
std::string MultiresVolumeRaycaster::helperPath() const {
return GlslHelperPath; // no helper file
return std::string(GlslHelperPath); // no helper file
}
void MultiresVolumeRaycaster::setModelTransform(glm::mat4 transform) {

14
modules/multiresvolume/rendering/renderablemultiresvolume.cpp
View File

@@ -59,14 +59,14 @@
#include <iterator>
namespace {
constexpr const char* _loggerCat = "RenderableMultiresVolume";
constexpr const char* KeyDataSource = "Source";
constexpr const char* KeyErrorHistogramsSource = "ErrorHistogramsSource";
constexpr const char* KeyTransferFunction = "TransferFunction";
constexpr std::string_view _loggerCat = "RenderableMultiresVolume";
constexpr std::string_view KeyDataSource = "Source";
constexpr std::string_view KeyErrorHistogramsSource = "ErrorHistogramsSource";
constexpr std::string_view KeyTransferFunction = "TransferFunction";
constexpr const char* KeyBrickSelector = "BrickSelector";
constexpr const char* KeyStartTime = "StartTime";
constexpr const char* KeyEndTime = "EndTime";
constexpr std::string_view KeyBrickSelector = "BrickSelector";
constexpr std::string_view KeyStartTime = "StartTime";
constexpr std::string_view KeyEndTime = "EndTime";
constexpr openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
"StepSizeCoefficient",

3
modules/multiresvolume/rendering/simpletfbrickselector.cpp
View File

@@ -32,14 +32,13 @@
#include <algorithm>
namespace {
constexpr const char* _loggerCat = "SimpleTfBrickSelector";
constexpr std::string_view _loggerCat = "SimpleTfBrickSelector";
bool compareSplitPoints(const openspace::BrickSelection& a,
const openspace::BrickSelection& b)
{
return a.splitPoints < b.splitPoints;
}
} // namespace
namespace openspace {

2
modules/multiresvolume/rendering/tsp.cpp
View File

@@ -35,7 +35,7 @@
#include <queue>
namespace {
constexpr const char* _loggerCat = "TSP";
constexpr std::string_view _loggerCat = "TSP";
} // namespace
namespace openspace {