X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fhud.cpp;h=0747cffbca3424364e5a91c43bfe38c3eaa91af5;hb=d2d3cb877984b97fafb97254f5005cbf4bcf47a6;hp=d60401199e10f453096534c9f9685fef8c47fab5;hpb=82426ae2997d2b21703d2d5afb631a84736e975f;p=blank.git

diff --git a/src/hud.cpp b/src/hud.cpp
index d604011..0747cff 100644
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -1,6 +1,8 @@
 #include "hud.hpp"
 
+#include "block.hpp"
 #include "init.hpp"
+#include "shader.hpp"
 #include "shape.hpp"
 
 #include <glm/gtc/matrix_transform.hpp>
@@ -8,8 +10,10 @@
 
 namespace blank {
 
-HUD::HUD()
-: block()
+HUD::HUD(const BlockTypeRegistry &types)
+: types(types)
+, block()
+, block_buf()
 , block_transform(1.0f)
 , block_visible(false)
 , crosshair()
@@ -21,7 +25,7 @@ HUD::HUD()
 	block_transform = glm::translate(block_transform, glm::vec3(50.0f, 50.0f, 0.0f));
 	block_transform = glm::scale(block_transform, glm::vec3(50.0f));
 	block_transform = glm::rotate(block_transform, 3.5f, glm::vec3(1.0f, 0.0f, 0.0f));
-	block_transform = glm::rotate(block_transform, 0.85f, glm::vec3(0.0f, 1.0f, 0.0f));
+	block_transform = glm::rotate(block_transform, 0.35f, glm::vec3(0.0f, 1.0f, 0.0f));
 
 	crosshair.vertices = std::vector<glm::vec3>({
 		{ -10.0f,   0.0f, 0.0f }, { 10.0f,  0.0f, 0.0f },
@@ -45,9 +49,12 @@ void HUD::Viewport(float x, float y, float width, float height) {
 }
 
 
-void HUD::Display(const BlockType &type) {
-	block.Clear();
-	type.FillModel(block);
+void HUD::Display(const Block &b) {
+	const BlockType &type = *types.Get(b.type);
+
+	block_buf.Clear();
+	type.FillModel(block_buf, b.Transform());
+	block.Update(block_buf);
 	block_visible = type.visible;
 }
 
@@ -55,6 +62,8 @@ void HUD::Display(const BlockType &type) {
 void HUD::Render(DirectionalLighting &program) {
 	if (block_visible) {
 		program.SetLightDirection({ 1.0f, 3.0f, 5.0f });
+		// disable distance fog
+		program.SetFogDensity(0.0f);
 		GLContext::ClearDepthBuffer();
 		program.SetMVP(block_transform, view, projection);
 		block.Draw();