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

Typedef vertices and color in DebugRenderer

Browse Source
This commit is contained in:
Erik Broberg
2016-06-21 12:35:15 -04:00
parent f4a1d12089
commit 5148380257
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/debugging/rendering/debugrenderer.cpp
View File

@@ -65,7 +65,7 @@ namespace openspace {
return _singleton;
}
void DebugRenderer::renderVertices(const std::vector<glm::vec4>& clippingSpacePoints, GLenum mode, glm::vec4 rgba) const {
void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode, RGBA rgba) const {
if (clippingSpacePoints.size() == 0) {
return;
}
@@ -114,7 +114,7 @@ namespace openspace {
}
void DebugRenderer::renderBoxFaces(const std::vector<glm::vec4>& clippingSpaceBoxCorners, glm::vec4 rgba) const {
void DebugRenderer::renderBoxFaces(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const {
const std::vector<glm::vec4>& V = clippingSpaceBoxCorners;
std::vector<glm::vec4> T;
@@ -143,7 +143,7 @@ namespace openspace {
renderVertices(T, GL_TRIANGLES, rgba);
}
void DebugRenderer::renderBoxEdges(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba) const {
void DebugRenderer::renderBoxEdges(const Vertices& clippingSpacePoints, RGBA rgba) const {
const std::vector<glm::vec4>& V = clippingSpacePoints;
std::vector<glm::vec4> lineVertices;
for (size_t i = 0; i < 4; i++) {
@@ -159,7 +159,7 @@ namespace openspace {
DebugRenderer::ref()->renderVertices(lineVertices, GL_LINES, rgba);
}
void DebugRenderer::renderNiceBox(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba) const {
void DebugRenderer::renderNiceBox(const Vertices& clippingSpacePoints, RGBA rgba) const {
renderBoxFaces(clippingSpacePoints, rgba);
glLineWidth(4.0f);
@@ -208,7 +208,7 @@ namespace openspace {
glEnable(GL_CULL_FACE);
}
void DebugRenderer::renderAABB2(const AABB2& screenSpaceAABB, glm::vec4 rgba) const {
void DebugRenderer::renderAABB2(const AABB2& screenSpaceAABB, RGBA rgba) const {
std::vector<vec4> vertices(4);
vertices[0] = vec4(screenSpaceAABB.min.x, screenSpaceAABB.min.y, 1, 1);
vertices[1] = vec4(screenSpaceAABB.min.x, screenSpaceAABB.max.y, 1, 1);
@@ -218,7 +218,7 @@ namespace openspace {
renderVertices(vertices, GL_LINES, rgba);
}
const std::vector<glm::vec4> DebugRenderer::screenSpacePointsFor(const AABB3& screenSpaceAABB) const {
const DebugRenderer::Vertices DebugRenderer::verticesFor(const AABB3& screenSpaceAABB) const {
std::vector<vec4> vertices(8);
for (size_t i = 0; i < 8; i++) {
bool cornerIsRight = i % 2 == 0;

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

@@ -52,18 +52,20 @@ namespace openspace {
static std::shared_ptr<DebugRenderer> ref();
typedef std::vector<glm::vec4> Vertices;
typedef glm::vec4 RGBA;
void renderVertices(const std::vector<glm::vec4>& clippingSpacePoints, GLenum mode, glm::vec4 rgba = {1, 0, 0, 1}) const;
void renderBoxFaces(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba = { 1, 0, 0, 1 }) const;
void renderBoxEdges(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba = { 1, 0, 0, 1 }) const;
void renderNiceBox(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba = { 1, 0, 0, 0.3 }) const;
void renderVertices(const Vertices& clippingSpacePoints, GLenum mode, RGBA = {1, 0, 0, 1}) const;
void renderBoxFaces(const Vertices& clippingSpacePoints, RGBA rgba = { 1, 0, 0, 1 }) const;
void renderBoxEdges(const Vertices& clippingSpacePoints, RGBA rgba = { 1, 0, 0, 1 }) const;
void renderNiceBox(const Vertices& clippingSpacePoints, RGBA rgba = { 1, 0, 0, 0.3 }) const;
void renderCameraFrustum(const RenderData& data, const Camera& otherCamera) const;
void renderAABB2(const AABB2& screenSpaceAABB, glm::vec4 rgba = { 1, 1, 1, 0.3 }) const;
void renderAABB2(const AABB2& screenSpaceAABB, RGBA rgba = { 1, 1, 1, 0.3 }) const;
const std::vector<glm::vec4> screenSpacePointsFor(const AABB3& screenSpaceAABB) const;
const Vertices verticesFor(const AABB3& screenSpaceAABB) const;
private: