X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=0fe24085739db91a49385b635028497f2c358e6f;hb=f4729fcfcf6f4802dd2439aa23dc3a4faf39827d;hp=48bd5ee32ce017751f436a25a8228a51f5703059;hpb=a32b120a2c06d3c7ad6a217bc46bba9e76d75d93;p=blank.git

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index 48bd5ee..0fe2408 100644
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -1,9 +1,10 @@
 #include "Camera.hpp"
 #include "Canvas.hpp"
+#include "SkyBox.hpp"
 #include "Viewport.hpp"
 
-#include "../app/init.hpp"
-#include "../model/geometry.hpp"
+#include "../app/error.hpp"
+#include "../geometry/const.hpp"
 
 #include <GL/glew.h>
 #include <glm/gtc/matrix_transform.hpp>
@@ -44,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);
@@ -73,20 +77,40 @@ void Canvas::UpdateProjection() noexcept {
 }
 
 
+SkyBox::SkyBox(CubeMap &&tex)
+: texture(std::move(tex))
+, mesh() {
+	mesh.LoadUnitBox();
+}
+
+void SkyBox::Render(Viewport &viewport) noexcept {
+	SkyBoxShader &prog = viewport.SkyBoxProgram();
+	prog.SetTexture(texture);
+	mesh.Draw();
+}
+
+
 Viewport::Viewport()
 : cam()
 , canv()
 , cursor(1.0f)
+, cam_offset(0.0f)
 , chunk_prog()
 , entity_prog()
+, sky_prog()
 , sprite_prog()
 , active_prog(NONE) {
 	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");
+		if (b) {
+			throw SDLError("SDL_GL_SetSwapInterval(1)");
+		} else {
+			// allow failure, because this usually means there's no vsync
+			// support at all, i.e. "it's off"
+		}
 	}
 }
 
@@ -95,6 +119,11 @@ void Viewport::EnableDepthTest() noexcept {
 	glDepthFunc(GL_LESS);
 }
 
+void Viewport::EqualDepthTest() noexcept {
+	glEnable(GL_DEPTH_TEST);
+	glDepthFunc(GL_LEQUAL);
+}
+
 void Viewport::DisableDepthTest() noexcept {
 	glDisable(GL_DEPTH_TEST);
 }
@@ -128,13 +157,9 @@ void Viewport::Resize(int w, int h) noexcept {
 	cam.Aspect(fw, fh);
 	canv.Resize(fw, fh);
 
-	chunk_prog.SetProjection(Perspective());
-	if (active_prog == HUD) {
-		entity_prog.SetProjection(Ortho());
-	} else {
-		entity_prog.SetProjection(Perspective());
-	}
-	sprite_prog.SetProjection(Ortho());
+	ChunkProgram().SetProjection(Perspective());
+	SkyBoxProgram().SetProjection(Perspective());
+	SpriteProgram().SetProjection(Ortho());
 }
 
 void Viewport::Clear() noexcept {
@@ -146,20 +171,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;
@@ -200,22 +229,33 @@ 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 color_prog;
+}
+
+SkyBoxShader &Viewport::SkyBoxProgram() noexcept {
+	if (active_prog != SKY_BOX) {
+		sky_prog.Activate();
+		DisableBlending();
+		DisableBackfaceCulling();
+		EqualDepthTest();
+		active_prog = SKY_BOX;
 	}
-	return outline_prog;
+	return sky_prog;
 }
 
 BlendedSprite &Viewport::SpriteProgram() noexcept {
@@ -229,8 +269,10 @@ BlendedSprite &Viewport::SpriteProgram() noexcept {
 
 
 void Viewport::WorldPosition(const glm::mat4 &t) noexcept {
-	cam.View(glm::inverse(t));
-	chunk_prog.SetView(cam.View());
+	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());
 }
 
 }