X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=a475f3e796f1d4c8d2b2af82987db711d368beb5;hb=c0a5ece0f6bacea1b85157a908d710070fb0affd;hp=c46ef28c76fa91bbc6da470615319f69ad75bc73;hpb=4fbf5a3c1b0e530706023f5fc4be2f68d30ea645;p=blank.git diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp index c46ef28..a475f3e 100644 --- a/src/graphics/viewport.cpp +++ b/src/graphics/viewport.cpp @@ -3,7 +3,7 @@ #include "SkyBox.hpp" #include "Viewport.hpp" -#include "../app/init.hpp" +#include "../app/error.hpp" #include "../geometry/const.hpp" #include @@ -94,6 +94,7 @@ Viewport::Viewport() : cam() , canv() , cursor(1.0f) +, cam_offset(0.0f) , chunk_prog() , entity_prog() , sky_prog() @@ -102,7 +103,7 @@ Viewport::Viewport() glClearColor(0.0, 0.0, 0.0, 1.0); } -void Viewport::VSync(bool b) noexcept { +void Viewport::VSync(bool b) { if (SDL_GL_SetSwapInterval(b) != 0) { throw SDLError("SDL_GL_SetSwapInterval"); } @@ -263,9 +264,7 @@ BlendedSprite &Viewport::SpriteProgram() noexcept { void Viewport::WorldPosition(const glm::mat4 &t) noexcept { - const glm::vec3 offset(0.0f, 0.0f, 0.0f); - //const glm::vec3 offset(0.0f, 0.0f, -5.0f); - cam.View(glm::translate(glm::inverse(t), glm::vec3(t * glm::vec4(offset, 0.0f)))); + cam.View(glm::translate(glm::inverse(t), glm::vec3(t * glm::vec4(cam_offset, 0.0f)))); ChunkProgram().SetView(cam.View()); sky_prog.Activate(); SkyBoxProgram().SetView(cam.View());