X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;h=038aa1aebbcd16a7ad4a1ae4a50830e4b41b59d1;hb=d18be10ef3f0a7b61c6f5c4c4096ca2b776c75b3;hp=7ecbb744ac65ce5be365e8548fac7ef13788a275;hpb=e1e349bb6035463529bc341c472987d229e1cdca;p=blank.git diff --git a/src/app.cpp b/src/app.cpp index 7ecbb74..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, }; } @@ -25,6 +25,7 @@ Application::Application() , init_glew() , program() , cam() +, model() , vtx_buf(0) , mvp_handle(0) , running(false) { @@ -61,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); @@ -115,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);