mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 02:20:11 -05: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
modules/base/rendering/renderablenodeline.cpp
+5 -8
View File
@@ -39,9 +39,6 @@
#include <ghoul/opengl/programobject.h>
namespace {
constexpr const char* ProgramName = "NodeLineProgram";
constexpr const char* Root = "Root";
constexpr openspace::properties::Property::PropertyInfo StartNodeInfo = {
"StartNode",
"Start Node",
@@ -108,8 +105,8 @@ documentation::Documentation RenderableNodeLine::Documentation() {
RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
: Renderable(dictionary)
, _start(StartNodeInfo, Root)
, _end(EndNodeInfo, Root)
, _start(StartNodeInfo, "Root")
, _end(EndNodeInfo, "Root")
, _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
, _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f)
{
@@ -145,10 +142,10 @@ std::string RenderableNodeLine::end() const {
void RenderableNodeLine::initializeGL() {
_program = BaseModule::ProgramObjectManager.request(
ProgramName,
"NodeLineProgram",
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
return global::renderEngine->buildRenderProgram(
ProgramName,
"NodeLineProgram",
absPath("${MODULE_BASE}/shaders/line_vs.glsl"),
absPath("${MODULE_BASE}/shaders/line_fs.glsl")
);
@@ -175,7 +172,7 @@ void RenderableNodeLine::deinitializeGL() {
_vBufferId = 0;
BaseModule::ProgramObjectManager.release(
ProgramName,
"NodeLineProgram",
[](ghoul::opengl::ProgramObject* p) {
global::renderEngine->removeRenderProgram(p);
}