aabb block shape WIP + common refactor

src/frontend/gui/GUI.cpp

@@ -12,6 +12,8 @@
 #include "../../window/input.h"
 #include "../../window/Camera.h"
 
+using glm::vec2;
+using glm::vec3;
 using std::string;
 using std::shared_ptr;
 using namespace gui;

src/frontend/gui/controls.cpp

@@ -11,6 +11,8 @@ using std::string;
 using std::wstring;
 using std::shared_ptr;
 using glm::vec2;
+using glm::vec3;
+using glm::vec4;
 
 #define KEY_ESCAPE 256
 #define KEY_ENTER 257

src/frontend/gui/panels.cpp

@@ -171,7 +171,7 @@ void Panel::refresh() {
         }
         if (resizing_) {
             if (maxLength_)
-                this->size(vec2(size.x, min(maxLength_, (int)(y+padding.w))));
+                this->size(vec2(size.x, glm::min(maxLength_, (int)(y+padding.w))));
             else
                 this->size(vec2(size.x, y+padding.w));
         }
@@ -193,7 +193,7 @@ void Panel::refresh() {
         bool increased = maxh > size.y;
         if (resizing_) {
             if (maxLength_)
-                this->size(vec2(min(maxLength_, (int)(x+padding.z)), size.y));
+                this->size(vec2(glm::min(maxLength_, (int)(x+padding.z)), size.y));
             else
                 this->size(vec2(x+padding.z, size.y));
         }

src/frontend/hud.cpp

@@ -91,11 +91,15 @@ HudRenderer::HudRenderer(Engine* engine,
 			   L" visible: "+std::to_wstring(level->chunks->visible);
 	})));
 	panel->add(shared_ptr<Label>(create_label([this](){
+		auto player = this->level->player;
+		auto indices = this->level->content->indices;
+		auto def = indices->getBlockDef(player->selectedVoxel.id);
 		std::wstringstream stream;
 		stream << std::hex << this->level->player->selectedVoxel.states;
-
-		auto player = this->level->player;
-		return L"block-selected: "+std::to_wstring(player->selectedVoxel.id)+
+		if (def) {
+			stream << L" (" << util::str2wstr_utf8(def->name) << L")";
+		}
+		return L"block: "+std::to_wstring(player->selectedVoxel.id)+
 		       L" "+stream.str();
 	})));
 	panel->add(shared_ptr<Label>(create_label([this](){
@@ -236,12 +240,17 @@ void HudRenderer::drawContentAccess(const GfxContext& ctx, Player* player) {
 		} else {
 			tint = vec4(1.0f);
 		}
-		
-		if (cblock->model == BlockModel::block){
-			batch->blockSprite(x, y, icon_size, icon_size, &cache->getRegion(cblock->id, 0), tint);
-		} else if (cblock->model == BlockModel::xsprite){
-			batch->sprite(x, y, icon_size, icon_size, cache->getRegion(cblock->id, 3), tint);
-		}
+		drawBlockPreview(cblock, x, y, icon_size, icon_size, tint);
+	}
+}
+
+void HudRenderer::drawBlockPreview(const Block* def, float x, float y, float w, float h, vec4 tint) {
+	if (def->model == BlockModel::block){
+		batch->blockSprite(x, y, w, h, &cache->getRegion(def->rt.id, 0), tint);
+	} else if (def->model == BlockModel::aabb) {
+		batch->blockSprite(x, y, w, h, &cache->getRegion(def->rt.id, 0), tint, def->hitbox.size());
+	} else if (def->model == BlockModel::xsprite){
+		batch->sprite(x, y, w, h, cache->getRegion(def->rt.id, 3), tint);
 	}
 }
 
@@ -311,11 +320,7 @@ void HudRenderer::draw(const GfxContext& ctx){
 	{
 		Block* cblock = contentIds->getBlockDef(player->choosenBlock);
 		assert(cblock != nullptr);
-		if (cblock->model == BlockModel::block){
-			batch->blockSprite(width-56, uicamera->fov - 56, 48, 48, &cache->getRegion(cblock->id, 0), vec4(1.0f));
-		} else if (cblock->model == BlockModel::xsprite){
-			batch->sprite(width-56, uicamera->fov - 56, 48, 48, cache->getRegion(cblock->id, 3), vec4(1.0f));
-		}
+		drawBlockPreview(cblock, width - 56, uicamera->fov - 56, 48, 48, vec4(1.0f));
 	}
 
 	if (pause) {

src/frontend/hud.h

@@ -4,11 +4,14 @@
 #include <string>
 #include <memory>
 
+#include <glm/glm.hpp>
+
 #include "../graphics/GfxContext.h"
 
 class Batch2D;
 class Camera;
 class Level;
+class Block;
 class Assets;
 class Player;
 class Level;
@@ -38,6 +41,8 @@ class HudRenderer {
 	gui::GUI* gui;
 	const ContentGfxCache* const cache;
 	WorldRenderer* renderer;
+
+	void drawBlockPreview(const Block* def, float x, float y, float w, float h, glm::vec4 tint);
 public:
 	HudRenderer(Engine* engine, 
 				Level* level,