allow face/turn selection of placed blocks

[blank.git] / src / hud.cpp

diff --git a/src/hud.cpp b/src/hud.cpp
index c43d7849fb3083acb73d44dc52ef4e2265e61483..266b80ae9dcbdc4f7aa29984817152501813c621 100644 (file)
--- 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,9 @@
 
 namespace blank {
 
-HUD::HUD()
-: block()
+HUD::HUD(const BlockTypeRegistry &types)
+: types(types)
+, block()
 , block_buf()
 , block_transform(1.0f)
 , block_visible(false)
@@ -22,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 },
@@ -46,9 +49,11 @@ void HUD::Viewport(float x, float y, float width, float height) {
 }
 
 
-void HUD::Display(const BlockType &type) {
+void HUD::Display(const Block &b) {
+       const BlockType &type = *types.Get(b.type);
+
        block_buf.Clear();
-       type.FillModel(block_buf);
+       type.FillModel(block_buf, b.Transform());
        block.Update(block_buf);
        block_visible = type.visible;
 }