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

15
modules/base/rendering/renderabletrail.cpp
View File

@@ -39,17 +39,14 @@
#include <optional>
namespace {
constexpr const char* ProgramName = "EphemerisProgram";
constexpr const char* KeyTranslation = "Translation";
#ifdef __APPLE__
constexpr const std::array<const char*, 12> UniformNames = {
constexpr std::array<const char*, 12> UniformNames = {
"opacity", "modelViewTransform", "projectionTransform", "color", "useLineFade",
"lineFade", "vertexSortingMethod", "idOffset", "nVertices", "stride", "pointSize",
"renderPhase"
};
#else
constexpr const std::array<const char*, 14> UniformNames = {
constexpr std::array<const char*, 14> UniformNames = {
"opacity", "modelViewTransform", "projectionTransform", "color", "useLineFade",
"lineFade", "vertexSortingMethod", "idOffset", "nVertices", "stride", "pointSize",
"renderPhase", "viewport", "lineWidth"
@@ -200,7 +197,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
addProperty(_opacity);
_translation = Translation::createFromDictionary(
dictionary.value<ghoul::Dictionary>(KeyTranslation)
dictionary.value<ghoul::Dictionary>("Translation")
);
addPropertySubOwner(_translation.get());
@@ -248,10 +245,10 @@ void RenderableTrail::initializeGL() {
);
#else
_programObject = BaseModule::ProgramObjectManager.request(
ProgramName,
"EphemerisProgram",
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
return global::renderEngine->buildRenderProgram(
ProgramName,
"EphemerisProgram",
absPath("${MODULE_BASE}/shaders/renderabletrail_vs.glsl"),
absPath("${MODULE_BASE}/shaders/renderabletrail_fs.glsl")
);
@@ -264,7 +261,7 @@ void RenderableTrail::initializeGL() {
void RenderableTrail::deinitializeGL() {
BaseModule::ProgramObjectManager.release(
ProgramName,
"EphemerisProgram",
[](ghoul::opengl::ProgramObject* p) {
global::renderEngine->removeRenderProgram(p);
}