This commit is contained in:
Tobias Dahl
2014-03-03 20:22:47 +01:00
parent c60b490d01
commit 40d0db4dc2
6 changed files with 146 additions and 2 deletions
+25 -1
View File
@@ -5,6 +5,29 @@ Renderer::Renderer()
}
void Renderer::Draw()
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(1.0f, 1.0f, 0.0f, 1.0f);
glUseProgram(shaderProgram);
}
void Renderer::DrawText()
{
//DrawShitInTextForm
}
void Renderer::AddTextToDraw()
{
//Add to draw shit vector
}
void Renderer::AddObjectToDraw()
{
}
//Fixa med shaders, lägga in alla verts osv.
@@ -52,4 +75,5 @@ GLuint Renderer::CompileShader(GLenum shaderType, std::string fileName)
return shader;
}
}
+5 -1
View File
@@ -24,12 +24,16 @@ public:
GLuint shaderProgram;
GLuint VAO;
std::vector<std::vector<float>> Vertices;
std::vector<std::vector<float>> Normals;
std::vector<std::vector<float>> TextureCoords;
Renderer();
void Draw();
void DrawText();
void AddObjectToDraw();
void AddObjectToDraw(std::vector<float>, std::vector<float>, std::vector<float>);
void AddTextToDraw();
GLuint CompileShader(GLenum, std::string);