X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=ddc609baad6599a88012ba8b8dd4128c31e600a2;hb=2e3774eb3f2d5d23a08731175b168566457e2192;hp=875da78d83c6ecb1913f5cfa61a45ebcc0cabbcb;hpb=8ab4ea13545cccbacbd1ed610968d3f481c1b3c8;p=blank.git

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index 875da78..ddc609b 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"
@@ -73,6 +74,19 @@ void Canvas::UpdateProjection() noexcept {
 }
 
 
+SkyBox::SkyBox(CubeMap &&tex)
+: texture(std::move(tex))
+, model() {
+	model.LoadUnitBox();
+}
+
+void SkyBox::Render(Viewport &viewport) noexcept {
+	SkyBoxShader &prog = viewport.SkyBoxProgram();
+	prog.SetTexture(texture);
+	model.Draw();
+}
+
+
 Viewport::Viewport()
 : cam()
 , canv()
@@ -134,13 +148,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 {
@@ -228,6 +238,7 @@ SkyBoxShader &Viewport::SkyBoxProgram() noexcept {
 	if (active_prog != SKY_BOX) {
 		sky_prog.Activate();
 		DisableBlending();
+		DisableBackfaceCulling();
 		EqualDepthTest();
 		active_prog = SKY_BOX;
 	}
@@ -246,7 +257,9 @@ BlendedSprite &Viewport::SpriteProgram() noexcept {
 
 void Viewport::WorldPosition(const glm::mat4 &t) noexcept {
 	cam.View(glm::inverse(t));
-	chunk_prog.SetView(cam.View());
+	ChunkProgram().SetView(cam.View());
+	sky_prog.Activate();
+	SkyBoxProgram().SetView(cam.View());
 }
 
 }