fggl/gfx/ogl4/debug.cpp

@@ -21,13 +21,14 @@
 #include "fggl/gfx/ogl4/debug.hpp"
 
 #include <cassert>
+#include <utility>
 
 namespace fggl::gfx::ogl4 {
 
-	DebugRenderer::DebugRenderer(GLuint shader) :
-		mvpMatrix(1.0f),
-		m_lineShader(shader),
-		m_lineShaderMVP(m_lineShader.uniform("u_MvpMatrix")) {
+	DebugRenderer::DebugRenderer(std::shared_ptr<ogl::Shader> shader) :
+		mvpMatrix(1.0F),
+		m_lineShader(std::move(shader)),
+		m_lineShaderMVP(m_lineShader->uniform("u_MvpMatrix")) {
 		// define our attributes
 		auto posAttr = ogl::attribute<dd::DrawVertex, math::vec3>(0);
 		auto colAttr = ogl::attribute<dd::DrawVertex, math::vec3>(sizeof(float) * 3);
@@ -42,8 +43,8 @@ namespace fggl::gfx::ogl4 {
 		assert(count > 0 && count <= DEBUG_DRAW_VERTEX_BUFFER_SIZE);
 
 		m_lineVao.bind();
-		m_lineShader.use();
-		m_lineShader.setUniformMtx(m_lineShaderMVP, mvpMatrix);
+		m_lineShader->use();
+		m_lineShader->setUniformMtx(m_lineShaderMVP, mvpMatrix);
 
 		if (depthEnabled) {
 			glEnable(GL_DEPTH_TEST);
@@ -54,7 +55,7 @@ namespace fggl::gfx::ogl4 {
 		m_lineVbo.bind();
 		m_lineVbo.replace<dd::DrawVertex>(count, lines);
 
-		m_lineVao.draw(ogl::Primative::LINE, 0, count);
+		m_lineVao.draw(ogl::Primitive::LINE, 0, count);
 
 		glUseProgram(0);
 		glBindVertexArray(0);