mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup code with designated initializer lists

Browse Source
This commit is contained in:
Alexander Bock
2023-01-22 23:01:32 +01:00
parent 3c6fc51ac2
commit d52c5dd0d9
69 changed files with 532 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/debugging/debuggingmodule_lua.inl
View File

@@ -28,8 +28,8 @@ constexpr const char RenderedPathIdentifier[] = "CurrentCameraPath";
constexpr const char RenderedPointsIdentifier[] = "CurrentPathControlPoints";
constexpr const char DebuggingGuiPath[] = "/Debugging";
constexpr glm::vec3 PathColor = { 1.0, 1.0, 0.0 };
constexpr glm::vec3 OrientationLineColor = { 0.0, 1.0, 1.0 };
constexpr glm::vec3 PathColor = glm::vec3(1.0, 1.0, 0.0);
constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
// Conver the input string to a format that is valid as an identifier
std::string makeIdentifier(std::string s) {

10
modules/debugging/rendering/debugrenderer.h
View File

@@ -68,7 +68,7 @@ public:
* Render the vector of clipping space points in the specified mode and color.
*/
void renderVertices(const Vertices& clippingSpacePoints, GLenum mode,
const glm::vec4& color = { 1.f, 0.f, 0.f, 1.f }) const;
const glm::vec4& color = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
/**
* Takes a vector of exactly 8 vertices, i.e. corner points in a box.
@@ -84,7 +84,7 @@ public:
*
*/
void renderBoxFaces(const Vertices& clippingSpaceBoxCorners,
const glm::vec4& rgba = { 1.f, 0.f, 0.f, 1.f }) const;
const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
/**
* Takes a vector of exactly 8 vertices, i.e. corner points in a box.
@@ -100,7 +100,7 @@ public:
*
*/
void renderBoxEdges(const Vertices& clippingSpaceBoxCorners,
const glm::vec4& rgba = { 1.f, 0.f, 0.f, 1.f }) const;
const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const;
/**
* Takes a vector of exactly 8 vertices, i.e. corner points in a box.
@@ -116,7 +116,7 @@ public:
*
*/
void renderNiceBox(const Vertices& clippingSpaceBoxCorners,
const glm::vec4& rgba = { 1.f, 0.f, 0.f, 0.3f }) const;
const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 0.3f)) const;
/**
* Input arguments:
@@ -126,7 +126,7 @@ public:
* 3. RGBA rgba Color to draw the view frustum with
*/
void renderCameraFrustum(const RenderData& data, const Camera& otherCamera,
const glm::vec4& rgba = { 1.f, 1.f, 1.f, 0.3f }) const;
const glm::vec4& rgba = glm::vec4(1.f, 1.f, 1.f, 0.3f)) const;
protected:
std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;