X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=038aa1aebbcd16a7ad4a1ae4a50830e4b41b59d1;hb=d18be10ef3f0a7b61c6f5c4c4096ca2b776c75b3;hp=de7a39ea48add859bcebda28a3f9fcfbe6efe00a;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git

diff --git a/src/app.cpp b/src/app.cpp
index de7a39e..038aa1a 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -7,9 +7,9 @@
 namespace {
 
 constexpr GLfloat vtx_coords[] = {
-	-1.0f, -1.0f, -5.0f,
-	 1.0f, -1.0f, -5.0f,
-	 0.0f,  1.0f, -5.0f,
+	-1.0f, -1.0f, 0.0f,
+	 1.0f, -1.0f, 0.0f,
+	 0.0f,  1.0f, 0.0f,
 };
 
 }
@@ -18,12 +18,14 @@ namespace blank {
 
 Application::Application()
 : init_sdl()
+, init_img()
 , init_gl()
 , window()
 , ctx(window.CreateContext())
 , init_glew()
 , program()
 , cam()
+, model()
 , vtx_buf(0)
 , mvp_handle(0)
 , running(false) {
@@ -60,6 +62,8 @@ Application::Application()
 	glBindBuffer(GL_ARRAY_BUFFER, vtx_buf);
 	glBufferData(GL_ARRAY_BUFFER, sizeof(vtx_coords), vtx_coords, GL_STATIC_DRAW);
 
+	model.Position(glm::vec3(0, 0, -4));
+
 	mvp_handle = program.UniformLocation("MVP");
 
 	glClearColor(0.0, 0.0, 0.0, 1.0);
@@ -114,8 +118,7 @@ void Application::Render() {
 
 	program.Use();
 
-	glm::mat4 model(1.0f); // identity: no transformation
-	glm::mat4 mvp(cam.MakeMVP(model));
+	glm::mat4 mvp(cam.MakeMVP(model.Transform()));
 	glUniformMatrix4fv(mvp_handle, 1, GL_FALSE, &mvp[0][0]);
 
 	glEnableVertexAttribArray(0);