X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fhud.cpp;h=266b80ae9dcbdc4f7aa29984817152501813c621;hb=88620c3c816c47b32a90758f40efe5d02c50bbfa;hp=ed5767dfeac9216f995c28351755ca94397dce5a;hpb=4422bc40677f5a8e476fc89ada56b33c50f25bd8;p=blank.git

diff --git a/src/hud.cpp b/src/hud.cpp
index ed5767d..266b80a 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,12 +25,15 @@ 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 },
 		{   0.0f, -10.0f, 0.0f }, {  0.0f, 10.0f, 0.0f },
 	});
+	crosshair.indices = std::vector<OutlineModel::Index>({
+		0, 1, 2, 3
+	});
 	crosshair.colors.resize(4, { 10.0f, 10.0f, 10.0f });
 	crosshair.Invalidate();
 }
@@ -42,9 +49,12 @@ void HUD::Viewport(float x, float y, float width, float height) {
 }
 
 
-void HUD::Display(const BlockType &type) {
-	block.Clear();
-	type.FillModel({ 0.0f, 0.0f, 0.0f }, 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;
 }