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

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index 48bd5ee..e171966 100644
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -1,5 +1,6 @@
 #include "Camera.hpp"
 #include "Canvas.hpp"
+#include "SkyBox.hpp"
 #include "Viewport.hpp"
 
 #include "../app/init.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,12 +77,26 @@ 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)
 , chunk_prog()
 , entity_prog()
+, sky_prog()
 , sprite_prog()
 , active_prog(NONE) {
 	glClearColor(0.0, 0.0, 0.0, 1.0);
@@ -95,6 +113,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 +151,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 {
@@ -218,6 +237,17 @@ PlainColor &Viewport::HUDOutlineProgram() noexcept {
 	return outline_prog;
 }
 
+SkyBoxShader &Viewport::SkyBoxProgram() noexcept {
+	if (active_prog != SKY_BOX) {
+		sky_prog.Activate();
+		DisableBlending();
+		DisableBackfaceCulling();
+		EqualDepthTest();
+		active_prog = SKY_BOX;
+	}
+	return sky_prog;
+}
+
 BlendedSprite &Viewport::SpriteProgram() noexcept {
 	if (active_prog != SPRITE) {
 		sprite_prog.Activate();
@@ -229,8 +259,12 @@ BlendedSprite &Viewport::SpriteProgram() noexcept {
 
 
 void Viewport::WorldPosition(const glm::mat4 &t) noexcept {
-	cam.View(glm::inverse(t));
-	chunk_prog.SetView(cam.View());
+	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))));
+	ChunkProgram().SetView(cam.View());
+	sky_prog.Activate();
+	SkyBoxProgram().SetView(cam.View());
 }
 
 }