Address clang tidy complaints

Update Ghoul repository
Update SGCT repository
This commit is contained in:
Alexander Bock
2018-11-30 15:34:09 -05:00
parent 752750bee8
commit c7a96a6b59
121 changed files with 626 additions and 670 deletions
@@ -55,8 +55,6 @@ DebugRenderer::DebugRenderer(std::unique_ptr<ghoul::opengl::ProgramObject> progr
// nothing to do
}
DebugRenderer::~DebugRenderer() { }
const DebugRenderer& DebugRenderer::ref() {
if (!_reference) {
try {
@@ -70,7 +68,7 @@ const DebugRenderer& DebugRenderer::ref() {
}
void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode,
const glm::vec4& rgba) const
const glm::vec4& color) const
{
if (clippingSpacePoints.empty()) {
return;
@@ -88,7 +86,7 @@ void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum m
// Activate the shader program and set the uniform color within the shader
_programObject->activate();
_programObject->setUniform("color", rgba);
_programObject->setUniform("color", color);
glBindVertexArray(_vaoID);
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
+1 -1
View File
@@ -61,7 +61,7 @@ public:
* Instantiate a new DebugRenderer with a custom shader program
*/
DebugRenderer(std::unique_ptr<ghoul::opengl::ProgramObject> programObject);
~DebugRenderer();
~DebugRenderer() = default;
/**
* Access the static reference
@@ -173,8 +173,6 @@ RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
setBoundingSphere(_size);
}
RenderableDebugPlane::~RenderableDebugPlane() {}
bool RenderableDebugPlane::isReady() const {
bool ready = true;
if (!_shader) {
@@ -220,7 +218,7 @@ void RenderableDebugPlane::render(const RenderData& data, RendererTasks&) {
_shader->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
_shader->setUniform("ModelTransform", transform);
setPscUniforms(*_shader.get(), data.camera, data.position);
setPscUniforms(*_shader, data.camera, data.position);
ghoul::opengl::TextureUnit unit;
unit.activate();
@@ -48,7 +48,7 @@ struct UpdateStructure;
class RenderableDebugPlane : public Renderable {
public:
RenderableDebugPlane(const ghoul::Dictionary& dictionary);
~RenderableDebugPlane();
~RenderableDebugPlane() = default;
void initializeGL() override;
void deinitializeGL() override;