X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=cb446191ab8b0458769c21e0bd21916528af3fe4;hb=831183e2cbab7ebf42bf4cace86f7bf9db482ed1;hp=ad58b58be677d033962a2687d88f961e6ebe71e1;hpb=3542823a1af7f5063d7cc8da84efa248eb889b8a;p=blank.git

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index ad58b58..cb44619 100644
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -4,7 +4,7 @@
 #include "Viewport.hpp"
 
 #include "../app/init.hpp"
-#include "../model/geometry.hpp"
+#include "../geometry/const.hpp"
 
 #include <GL/glew.h>
 #include <glm/gtc/matrix_transform.hpp>
@@ -45,6 +45,9 @@ void Camera::Clip(float n, float f) noexcept {
 	UpdateProjection();
 }
 
+void Camera::View(const glm::mat4 &v) noexcept {
+	view = v;
+}
 
 void Camera::UpdateProjection() noexcept {
 	projection = glm::perspective(fov, aspect, near, far);
@@ -91,6 +94,7 @@ Viewport::Viewport()
 : cam()
 , canv()
 , cursor(1.0f)
+, cam_offset(0.0f)
 , chunk_prog()
 , entity_prog()
 , sky_prog()
@@ -99,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");
 	}
@@ -162,20 +166,24 @@ void Viewport::ClearDepth() noexcept {
 }
 
 
-void Viewport::SetCursor(const glm::vec3 &pos) {
+glm::vec2 Viewport::GetPosition(const glm::vec2 &off, Gravity grav) const noexcept {
+	return align(grav, canv.Size(), off + canv.Offset());
+}
+
+void Viewport::SetCursor(const glm::vec3 &pos) noexcept {
 	cursor[3].x = pos.x;
 	cursor[3].y = pos.y;
 	cursor[3].z = pos.z;
 }
 
-void Viewport::SetCursor(const glm::vec3 &pos, Gravity grav) {
-	glm::vec2 p(align(grav, canv.Size(), glm::vec2(pos) + canv.Offset()));
+void Viewport::SetCursor(const glm::vec3 &pos, Gravity grav) noexcept {
+	glm::vec2 p(GetPosition(glm::vec2(pos), grav));
 	cursor[3].x = p.x;
 	cursor[3].y = p.y;
 	cursor[3].z = pos.z;
 }
 
-void Viewport::MoveCursor(const glm::vec3 &d) {
+void Viewport::MoveCursor(const glm::vec3 &d) noexcept {
 	cursor[3].x += d.x;
 	cursor[3].y += d.y;
 	cursor[3].z += d.z;
@@ -216,22 +224,22 @@ DirectionalLighting &Viewport::HUDProgram() noexcept {
 	return entity_prog;
 }
 
-PlainColor &Viewport::WorldOutlineProgram() noexcept {
-	if (active_prog != OUTLINE_WORLD) {
-		outline_prog.Activate();
-		outline_prog.SetVP(cam.View(), cam.Projection());
-		active_prog = OUTLINE_WORLD;
+PlainColor &Viewport::WorldColorProgram() noexcept {
+	if (active_prog != COLOR_WORLD) {
+		color_prog.Activate();
+		color_prog.SetVP(cam.View(), cam.Projection());
+		active_prog = COLOR_WORLD;
 	}
-	return outline_prog;
+	return color_prog;
 }
 
-PlainColor &Viewport::HUDOutlineProgram() noexcept {
-	if (active_prog != OUTLINE_HUD) {
-		outline_prog.Activate();
-		outline_prog.SetVP(canv.View(), canv.Projection());
-		active_prog = OUTLINE_HUD;
+PlainColor &Viewport::HUDColorProgram() noexcept {
+	if (active_prog != COLOR_HUD) {
+		color_prog.Activate();
+		color_prog.SetVP(canv.View(), canv.Projection());
+		active_prog = COLOR_HUD;
 	}
-	return outline_prog;
+	return color_prog;
 }
 
 SkyBoxShader &Viewport::SkyBoxProgram() noexcept {
@@ -256,7 +264,7 @@ BlendedSprite &Viewport::SpriteProgram() noexcept {
 
 
 void Viewport::WorldPosition(const glm::mat4 &t) noexcept {
-	cam.View(glm::inverse(t));
+	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());