mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-14 17:40:26 -05:00
Removing more CppCheck warnings
This commit is contained in:
Alexander Bock
@@ -41,123 +41,113 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
std::shared_ptr<DebugRenderer> DebugRenderer::_singleton = nullptr;
|
||||
DebugRenderer::DebugRenderer()
|
||||
: _programObject(OsEng.renderEngine().buildRenderProgram(
|
||||
"BasicDebugShader",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl"
|
||||
))
|
||||
{
|
||||
}
|
||||
|
||||
std::shared_ptr<DebugRenderer> DebugRenderer::ref() {
|
||||
static std::shared_ptr<DebugRenderer> renderer = std::make_shared<DebugRenderer>();
|
||||
return renderer;
|
||||
}
|
||||
|
||||
DebugRenderer::DebugRenderer() {
|
||||
_programObject = std::shared_ptr<ProgramObject>(OsEng.renderEngine().buildRenderProgram(
|
||||
"BasicDebugShader",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl"
|
||||
));
|
||||
|
||||
void DebugRenderer::renderVertices(const std::vector<glm::vec4>& clippingSpacePoints, GLenum mode, glm::vec4 rgba) const {
|
||||
if (clippingSpacePoints.size() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::shared_ptr<DebugRenderer> DebugRenderer::ref() {
|
||||
if (_singleton == nullptr) {
|
||||
try {
|
||||
_singleton = std::make_shared<DebugRenderer>();
|
||||
}
|
||||
catch (const ShaderObject::ShaderCompileError& e) {
|
||||
LERROR(e.what());
|
||||
}
|
||||
}
|
||||
return _singleton;
|
||||
GLuint _vaoID;
|
||||
glGenVertexArrays(1, &_vaoID);
|
||||
ghoul_assert(_vaoID != 0, "Could not generate vertex arrays");
|
||||
|
||||
GLuint _vertexBufferID;
|
||||
glGenBuffers(1, &_vertexBufferID);
|
||||
ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer");
|
||||
|
||||
_programObject->activate();
|
||||
_programObject->setUniform("color", rgba);
|
||||
|
||||
|
||||
glBindVertexArray(_vaoID);
|
||||
|
||||
|
||||
// Vertex buffer
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]),
|
||||
&clippingSpacePoints[0],
|
||||
GL_STATIC_DRAW);
|
||||
|
||||
glEnableVertexAttribArray(0);
|
||||
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0);
|
||||
|
||||
// uniforms
|
||||
|
||||
|
||||
|
||||
glDrawArrays(mode, 0, clippingSpacePoints.size());
|
||||
GLenum error = glGetError();
|
||||
if (error != GL_NO_ERROR) {
|
||||
LERROR(error);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderVertices(const std::vector<glm::vec4>& clippingSpacePoints, GLenum mode, glm::vec4 rgba) const {
|
||||
if (clippingSpacePoints.size() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
GLuint _vaoID;
|
||||
glGenVertexArrays(1, &_vaoID);
|
||||
ghoul_assert(_vaoID != 0, "Could not generate vertex arrays");
|
||||
|
||||
GLuint _vertexBufferID;
|
||||
glGenBuffers(1, &_vertexBufferID);
|
||||
ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer");
|
||||
|
||||
_programObject->activate();
|
||||
_programObject->setUniform("color", rgba);
|
||||
|
||||
|
||||
glBindVertexArray(_vaoID);
|
||||
|
||||
|
||||
// Vertex buffer
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]),
|
||||
&clippingSpacePoints[0],
|
||||
GL_STATIC_DRAW);
|
||||
|
||||
glEnableVertexAttribArray(0);
|
||||
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0);
|
||||
|
||||
// uniforms
|
||||
|
||||
|
||||
|
||||
glDrawArrays(mode, 0, clippingSpacePoints.size());
|
||||
GLenum error = glGetError();
|
||||
if (error != GL_NO_ERROR) {
|
||||
LERROR(error);
|
||||
}
|
||||
|
||||
glBindVertexArray(0);
|
||||
glBindVertexArray(0);
|
||||
|
||||
glDeleteVertexArrays(1, &_vaoID);
|
||||
glDeleteBuffers(1, &_vertexBufferID);
|
||||
_programObject->deactivate();
|
||||
glDeleteVertexArrays(1, &_vaoID);
|
||||
glDeleteBuffers(1, &_vertexBufferID);
|
||||
_programObject->deactivate();
|
||||
|
||||
}
|
||||
|
||||
void DebugRenderer::renderBoxFaces(const std::vector<glm::vec4>& clippingSpaceBoxCorners, glm::vec4 rgba) const {
|
||||
const std::vector<glm::vec4>& V = clippingSpaceBoxCorners;
|
||||
std::vector<glm::vec4> T;
|
||||
|
||||
// add "sides";
|
||||
|
||||
T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]);
|
||||
T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]);
|
||||
|
||||
T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]);
|
||||
T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]);
|
||||
|
||||
T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]);
|
||||
T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]);
|
||||
|
||||
T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]);
|
||||
T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]);
|
||||
|
||||
// add "top"
|
||||
T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]);
|
||||
T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]);
|
||||
|
||||
// add bottom
|
||||
T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]);
|
||||
T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]);
|
||||
|
||||
renderVertices(T, GL_TRIANGLES, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderBoxEdges(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba) const {
|
||||
const std::vector<glm::vec4>& V = clippingSpacePoints;
|
||||
std::vector<glm::vec4> lineVertices;
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
lineVertices.push_back(V[2 * i]);
|
||||
lineVertices.push_back(V[2 * i + 1]);
|
||||
lineVertices.push_back(V[i]);
|
||||
lineVertices.push_back(V[i + 4]);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderBoxFaces(const std::vector<glm::vec4>& clippingSpaceBoxCorners, glm::vec4 rgba) const {
|
||||
const std::vector<glm::vec4>& V = clippingSpaceBoxCorners;
|
||||
std::vector<glm::vec4> T;
|
||||
|
||||
// add "sides";
|
||||
|
||||
T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]);
|
||||
T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]);
|
||||
|
||||
T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]);
|
||||
T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]);
|
||||
|
||||
T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]);
|
||||
T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]);
|
||||
|
||||
T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]);
|
||||
T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]);
|
||||
|
||||
// add "top"
|
||||
T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]);
|
||||
T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]);
|
||||
|
||||
// add bottom
|
||||
T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]);
|
||||
T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]);
|
||||
|
||||
renderVertices(T, GL_TRIANGLES, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderBoxEdges(const std::vector<glm::vec4>& clippingSpacePoints, glm::vec4 rgba) const {
|
||||
const std::vector<glm::vec4>& V = clippingSpacePoints;
|
||||
std::vector<glm::vec4> lineVertices;
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
lineVertices.push_back(V[2 * i]);
|
||||
lineVertices.push_back(V[2 * i + 1]);
|
||||
lineVertices.push_back(V[i]);
|
||||
lineVertices.push_back(V[i + 4]);
|
||||
}
|
||||
lineVertices.push_back(V[0]); lineVertices.push_back(V[2]);
|
||||
lineVertices.push_back(V[1]); lineVertices.push_back(V[3]);
|
||||
lineVertices.push_back(V[4]); lineVertices.push_back(V[6]);
|
||||
lineVertices.push_back(V[5]); lineVertices.push_back(V[7]);
|
||||
DebugRenderer::ref()->renderVertices(lineVertices, GL_LINES, rgba);
|
||||
}
|
||||
lineVertices.push_back(V[0]); lineVertices.push_back(V[2]);
|
||||
lineVertices.push_back(V[1]); lineVertices.push_back(V[3]);
|
||||
lineVertices.push_back(V[4]); lineVertices.push_back(V[6]);
|
||||
lineVertices.push_back(V[5]); lineVertices.push_back(V[7]);
|
||||
DebugRenderer::ref()->renderVertices(lineVertices, GL_LINES, rgba);
|
||||
}
|
||||
|
||||
|
||||
} // namespace openspace
|
||||
} // namespace openspace
|
||||
|
||||
Reference in New Issue
Block a user