From 0c35eeb0721e7ed7c86947597492bbe195c993bc Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 30 Nov 2023 14:48:38 +0300
Subject: [PATCH 1/2] aabb block shape WIP + common refactor

---
 res/textures/blocks/pane.png        | Bin 0 -> 8111 bytes
 res/textures/blocks/pane_side.png   | Bin 0 -> 7047 bytes
 res/textures/blocks/pane_side_2.png | Bin 0 -> 7030 bytes
 src/content/Content.cpp             |   6 ++-
 src/definitions.cpp                 |  12 +++++
 src/frontend/gui/GUI.cpp            |   2 +
 src/frontend/gui/controls.cpp       |   2 +
 src/frontend/gui/panels.cpp         |   4 +-
 src/frontend/hud.cpp                |  33 ++++++++------
 src/frontend/hud.h                  |   5 +++
 src/graphics/Batch2D.cpp            |  37 +++++++++++-----
 src/graphics/Batch2D.h              |  14 +++---
 src/graphics/BlocksRenderer.cpp     |  66 +++++++++++++++++++++++++++-
 src/graphics/BlocksRenderer.h       |   2 +
 src/graphics/Font.cpp               |  18 +-------
 src/graphics/Texture.cpp            |  12 +++--
 src/graphics/Texture.h              |   8 ++--
 src/logic/PlayerController.cpp      |   2 +-
 src/voxels/Block.h                  |   8 +++-
 src/voxels/WorldGenerator.cpp       |  20 ++++-----
 src/world/Level.h                   |   2 +-
 21 files changed, 177 insertions(+), 76 deletions(-)
 create mode 100644 res/textures/blocks/pane.png
 create mode 100644 res/textures/blocks/pane_side.png
 create mode 100644 res/textures/blocks/pane_side_2.png

diff --git a/res/textures/blocks/pane.png b/res/textures/blocks/pane.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9e2a5d77c941ac0aa79042b71796691d6154dde
GIT binary patch
literal 8111
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
CCh!0N

literal 0
HcmV?d00001

diff --git a/res/textures/blocks/pane_side.png b/res/textures/blocks/pane_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d68d745fb040d30c4c890d50a89196566242afa
GIT binary patch
literal 7047
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

literal 0
HcmV?d00001

diff --git a/res/textures/blocks/pane_side_2.png b/res/textures/blocks/pane_side_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd6ba273cde18684c18a528aba1550ea732a1b1
GIT binary patch
literal 7030
zcmeHLc~}$I7LO0beW4Ur)EJ~9I%H-tlgvyL0Rbfnihv6)*vZTU0@+A{1S?h+SKN2d
ziW{g^aJN$T1#v;dtyWtWDOzyBQl)6M@@@hmy!!0(we>IgzL4B|&-tDGoI5i&V8qb&
zZMwJN@p$d!zTSc0yA${{Z)FSq&)#?J0gq>MV`}g?Qy?9~*Bf+7m73$5V)Y!KGpm$5
zp7~bh%E+uTmv%#H_s$FX*Yx<14)Ofz4$5bbt9&nJ-upgqc%i3{qs^ILqqZhJFYfL1
zA~Bgz1zcD+Y?$4u&d|g@<{!pRlKD*fJ$BBbpEEk%r$gJVC~<p!`D#jSdH<s!8{3>a
z+Vz(ywplgt2JvULut~hM!p^HaH-Ma#RKx3O6Fu7@sOkltbib(PWm5U`F3NtfH>Y=d
zHtpN_526zTSL^!B-Cpx>MqXO;Z2@*umyk==@7So=F3h#>TXsmABMhB6(p6ZIc>YwG
z{k+XGCy%Oic~8FiVtc>mgPzgpPcP(OS$O)<Z@1E%AIaApL%x}fRQ8;7J!yG{{Wbg2
zrEt|?{hpQ1`{t*4=5KevI&LkprDO-p8*tat$5G#HLFt|~-$)|#qn_QJ|EZA)p;qP1
zTyvT?g6h#eKX7w$;sl$}_?4577To%J$HVTVxH2il4;IUfs|$<6k73xEfw3D?{0g%Z
zCQI8oX#EU(b9a!$I%>~~k}Ywe%eEg+&BQ+a*N&=NpSW!bny_~v8{gRv`yuAesLEWP
z<H;i1u%B&Ra=aDGU6gnIlBCqr;I4+wciOf(JO9(etb=^UkJ6emseX}eJ#={fj_Qw`
z&v^uGPPi`pF2FscCm!tYcX42d_-h3&zryxUUwilV*uCt<l|lJ8jpwfCT)((1tfnL<
z^0t6*%-p;*c~xLUPKLwE0b|DcZLKaH?snwCu(3y9xQ^Ahq-9(jACVm!o_;-l5|ux9
z-PFpW;X5UTF6k3=hpv99J9c4G%VC<c1+>!w>9pmeCSP+=?{ME=yk$s7JaqHj(=Rs8
zN+;bv3GdZUoD$!4K)iWf^MC?rici1M9qbF)&TSWx$gEZ3+osgh9sxQ<k0**6_iTyQ
zvwG3NDla!b(-(;oSC>!stPIl@2i$*LoZ-_txnNrRu)s|v)rWSLt>}61_g-r=&bFv^
ziB=5=P5xXii*Owh!KSa@vp0WsSB-F6=B`1>QRR7;XF0^}T;KO_Uf)jN2i_30CQ}Vp
zhsAYkuDv-S<_4Ej5>YfrJo2#rk5#wwuayt#ay%gT(5kkp7VjLjAeikYAALku>o|H>
z%L%JwY1`C2f9+T?XYB232g;uk@}bGXmA4j+37WpI>SmAIcko`<c9-uTw)4&$>MMhf
z(TB|Tnb=>m#=-uAJoCY*7W*@iuMTWFQQJPP#nxXn9XkxVNv52Nl^i%Oy*YD*-Jwgr
z{_xw}keH=+$vBtG2j+?p-O=v%4{$COyX<b`d!Rlqf5bzN%--4C>9J8&9J9Fl<YkHN
zg8Ln%PJW@;<e76W^$N}7HJhpO@(Pf9dA%xeP}pnZmdJchc{t`w4oaUM-17lnuyg|z
z(#av}n(N0K25)s39}Q<eX`71m?eDfQA@anDMLAz3ChyJakd?rH+N|_m>E?2Q^Gjj>
zeRHZy4)%UjDXT1MHhBM8Y`ey>!1TS}>5U54Bd)fgmlx2cja}?gLe8x1n{(MPt?*Rt
zjYF+2MZ{HJy1Yp_(Dtc!X^3*QxXQNbNrpyW)UU(t!#h4ovtN{A@+=*iHK5nAsQm1K
zKj$q@@yoNHJtt?P{Q&>GUowVBeH_Q&U;Z+4d9LeEQ2zMcdG~6{gzc11R&ZHY9S65d
z9+%MEuFZLu^{sl?jgJl-*f-q$)=BsB-<%Eo%UowHVVXIIFP`N7wD*h3Z_keyVV0k8
zDR@~*^mg+2tjpHXjz2yBE-IqmjM{Douk?5s=&<@(-y>HFP7d`b7VD!53zo}D3@y8w
zQ8s9bv%7zvH7$xRm9M$tQ41C9zgs<~IJd%P@#d^j$?+3?;M7eIsyjcb46l4xEUJDv
zotHowGVc`-hk3k@&#OSs9p~>yF*=PK&FU1Kn^~g=J(<Uox|{Vh6UmwQ3NB2gl?fgl
zIws(&Sealf?hpIxy|{3d?^FX9G<8HUGc}SSS%LeYHc~SM05qJ5=9@KYt&uXz1Xf%M
z{I+Zh1$--sDN-gF=O4iL(iu2D=7zb!kdIk41r-cx!<QOZB^BsBq#gpSWP)&$Nlyud
zF)=Z2F(NmeAxwynBq@YZA&NqP0y4&GO|%)(8l5Z<br{~9kuj+BCY4Uhw_wr=U9?Fi
z5P)-jJvcaJe9U08UVvq7g*Td5p&TqQU=JV=qA*NAFbbihurWV4_4jY!)*9=*2>dBD
z(|RG|1`9QsCLBhS&y?5l-pFAL2BS|H$QgCf28Q#Q!f8!TjfLvf(Z<Fyqm7(p%c{4U
zRSJPpR>_TdhRXc|8h9*j3{z?JRt^hwV@j53pwmYi)K(gn5prry0~9d=WTXkbNu_)p
zpeFWMPX3?>5Z8d;g!+}gth!kJN_p#;Xp2y}w@hHsmtu8{ilwYS37lpbREa}4fg%v5
zL}*B%0EvK;G=p)dh^9HT5tLkOG|^gyvp@lGHx<B9(zt}hL<Gd*2n%7Xf`b$+Lqj5^
z1Q(+OK}$$cBZ!d(6{rMS-B>FN6bqnG0%vec#6dJCCLs*QB@nGpNFaixVHiVc4k7Ba
zvBZJ$43NtNs2gkrx9$X}X_HcC(8vUSDs8m+^+B*o!v&dWi_;JZjEF=M93u%_LLk^{
zqA{Go2$I}_iNJ0MVLf3PY6w82L9(edbQmYpYs0JumatI37~ojiQX2r-x({rjybK&|
z(iwtvI<-t-(Ts0_w3ZZKT3;-bpN_FIT8TN<Qg8JYH<%6+T9;Dc+lc>w6cnzD(f)5Z
zuSpwFJPoE8ogs3hVWc90V@z+yc@uF1QXuGcMw1~{{wGHL2c5JoU3~$s&Jf#3eh?Q`
zx2kJMYL(She7>~_P&8BLej`1FW33?oeylrU!f9<72fA&2slD1)y(x`hoFGN865>!6
z1(m?S5Xp)~kP;T59L*|W7&PZ5f{i+*DTX$1o?##dK%7BoS>w!iv1VWYrqnUvoF%nj
zR0JUigy6vlO2H(BV*_9j1;c{6h}UPpKVu@s5{yKmU?CB~fJ#L%5|kHA17%<_!w@V?
zFm*}a;K09bB7#xqdo&T1(1ZxaFi3>a5(pEcFhr9Q24Z2*Jvfd<XvyDcq9hnbC=fpc
zd4Ew9iE)gRummuX;~)%EAdrF(;Sjhyh%kgCL@ZL*B>$c$lEDZ`VK{}L@6SY1sl*tG
z7=~CBi~tN3iy?vrp#=F$!vqbBfzeH?>;FmA_h%16vM?f%&=AUixM47-gb0L{KnffI
z6PBR~6sG^WJ+FETiUgx5g^4Lt^!`jlB}xJ&KtiGfsemv9Q-X_xgoVV6n4}RL6Dtwr
zUpKL-JyN0NKKg1pNG&%ue}Ag+{E%91bd=mOxPzkgdbNr(G@UE2=Ino=Ys6na)BlXU
zF<BkAmrfrG?mXe9kulo0ihl!P9fF^V;j~8G+f;8%Qs<UN*LI+D-5z)x08bafhR2Kg
zsR|m!KlxWbH2+BveEtU^@8sVP?)u=ack;kH5r4?85AJ#=54;ochwS>>+|}mw3rbE4
zo|9w1>&J&qaihVjOIyY8q29bxyzRWtecFjU!A@(vZ-|k{Yin=$G~=bN?Fu$qn&kdI
zEq`j;t2Km7&!~z6TiJ4N&)}|CTbyV%?370*kIU}M)XO?I-`z@J4qQ}5O6RK78|GDr
z)k_P%tdc!@VXoN~IX8-)*W=R2mJvwhwgOxFrmHa5CcFEV;bjl2<A<zBD|Q$fVDFM$
zl3|*ZDDFf#YX$^OtST*wNLtUEbK)6loc2K9GRJdt_7(^InW#^~Y=Q=dhbO?lLkC+Y
z!0ncdUvQO7@OX|F`3|R#byV+Gba=eD;`vJRgo>E+YtiBxDUb0!0^Y%H#0#5!qf~Py
T`!1OQjNr+AMtElp{w(3&TjuL6

literal 0
HcmV?d00001

diff --git a/src/content/Content.cpp b/src/content/Content.cpp
index 4b61b9e0..6184edb7 100644
--- a/src/content/Content.cpp
+++ b/src/content/Content.cpp
@@ -22,10 +22,12 @@ Content* ContentBuilder::build() {
     vector<Block*> blockDefsIndices;
     for (const string& name : blockIds) {
         Block* def = blockDefs[name];
-        def->id = blockDefsIndices.size();
+        
+        // Generating runtime info
+        def->rt.id = blockDefsIndices.size();
         def->rt.emissive = *((uint32_t*)def->emission);
         
-        // build hitbox grid 3d for raycasts
+        // building hitbox grid 3d for raycasts
         const AABB& hitbox = def->hitbox;
         for (uint gy = 0; gy < BLOCK_AABB_GRID; gy++) {
             for (uint gz = 0; gz < BLOCK_AABB_GRID; gz++) {
diff --git a/src/definitions.cpp b/src/definitions.cpp
index 7deec6dc..fbdac15d 100644
--- a/src/definitions.cpp
+++ b/src/definitions.cpp
@@ -106,6 +106,18 @@ void setup_definitions(ContentBuilder* builder) {
 	block = new Block("base:blue_lamp", "blue_lamp");
 	block->emission[2] = 15;
 	builder->add(block);
+
+	// block added for test
+	block = new Block("base:pane", "pane");
+	block->textureFaces[FACE_MX] = "pane_side";
+	block->textureFaces[FACE_PX] = "pane_side";
+	block->textureFaces[FACE_MY] = "pane_side_2";
+	block->textureFaces[FACE_PY] = "pane_side_2";
+	block->model = BlockModel::aabb;
+	block->hitbox.scale(vec3(1.0f, 1.0f, 0.2f), vec3(0.5f, 0.5f, 0.0f));
+	block->lightPassing = true;
+	block->skyLightPassing = true;
+	builder->add(block);
 }
 
 void setup_bindings() {
diff --git a/src/frontend/gui/GUI.cpp b/src/frontend/gui/GUI.cpp
index 5aeda08c..4710b4c4 100644
--- a/src/frontend/gui/GUI.cpp
+++ b/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;
diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp
index b9dba5f9..35f9cc57 100644
--- a/src/frontend/gui/controls.cpp
+++ b/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
diff --git a/src/frontend/gui/panels.cpp b/src/frontend/gui/panels.cpp
index 87771cd8..6c77eaa3 100644
--- a/src/frontend/gui/panels.cpp
+++ b/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));
         }
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 475177af..0d2bfa07 100644
--- a/src/frontend/hud.cpp
+++ b/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) {
diff --git a/src/frontend/hud.h b/src/frontend/hud.h
index cdb7d3fa..25f595af 100644
--- a/src/frontend/hud.h
+++ b/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, 
diff --git a/src/graphics/Batch2D.cpp b/src/graphics/Batch2D.cpp
index 6885e752..a44dc9b6 100644
--- a/src/graphics/Batch2D.cpp
+++ b/src/graphics/Batch2D.cpp
@@ -7,6 +7,10 @@
 
 #define VERTEX_SIZE 8
 
+using glm::vec2;
+using glm::vec3;
+using glm::vec4;
+
 Batch2D::Batch2D(size_t capacity) : capacity(capacity), offset(0), color(1.0f, 1.0f, 1.0f, 1.0f){
 	const vattr attrs[] = {
 		{2}, {2}, {4}, {0}
@@ -47,8 +51,8 @@ void Batch2D::vertex(float x, float y,
 	buffer[index++] = a;
 }
 void Batch2D::vertex(vec2 point,
-		vec2 uvpoint,
-		float r, float g, float b, float a) {
+					vec2 uvpoint,
+					float r, float g, float b, float a) {
 	buffer[index++] = point.x;
 	buffer[index++] = point.y;
 	buffer[index++] = uvpoint.x;
@@ -299,8 +303,11 @@ void Batch2D::sprite(float x, float y, float w, float h, int atlasRes, int index
 	rect(x, y, w, h, u, v, scale, scale, tint.r, tint.g, tint.b, tint.a);
 }
 
-void Batch2D::blockSprite(float x, float y, float w, float h, const UVRegion regions[], vec4 tint){
-	// TODO: rewrite it
+
+#include <iostream>
+
+void Batch2D::blockSprite(float x, float y, float w, float h, const UVRegion regions[], vec4 tint, vec3 size){
+	// TODO: replace it using actual 3D with ortho projection
 	float uu = (regions[3].u1);
 	float vu = (regions[3].v1);
 
@@ -313,16 +320,24 @@ void Batch2D::blockSprite(float x, float y, float w, float h, const UVRegion reg
 	if (this->index + 18*VERTEX_SIZE >= capacity)
 		render();
 
+	float d = (w + h) * 0.5f;
 	float ar = 0.88f;
 	float ox = x + (w * 0.5f);
 	float sx = w * 0.5f * ar;
-	vec2 points[7] =   {vec2(ox,        y+(h*0.5f)),
-						vec2(ox-sx,     y+(h*0.25f)),
-						vec2(ox,        y),
-						vec2(ox+sx,     y+(h*0.25f)),
-						vec2(ox+sx,     y+(h*0.75f)),
-						vec2(ox,        y+h),
-						vec2(ox-sx,     y+(h*0.75f))};
+	float hh = h * 0.25f;
+	float ww = w * 0.25f;
+	float dd = d * 0.25f;
+
+	vec3 half = size * h * 0.25f;
+
+	y += hh * 2.0f;
+	vec2 points[7] =   {vec2(ox-ww+half.x+dd-half.z,    	y+hh-half.y), // center
+						vec2(ox-sx+ww-half.x+dd-half.z,   y-half.y+ww-half.x), // left
+						vec2(ox+ww-half.x-dd+half.z,      y-hh-half.y+ww-half.x+dd-half.z), // top
+						vec2(ox+sx-ww+half.x-dd+half.z,   y-half.y+dd-half.z), // right
+						vec2(ox+sx-ww+half.x-dd+half.z,   y+half.y+dd-half.z), // b-right
+						vec2(ox-ww+half.x+dd-half.z,      y+hh+half.y), // bottom
+						vec2(ox-sx+ww-half.x+dd-half.z,   y+half.y+ww-half.x)}; // b-left
 
 	vec2 uvpoints[8] = {vec2(uu,        vu),
 						vec2(uu+scalex,  vu),
diff --git a/src/graphics/Batch2D.h b/src/graphics/Batch2D.h
index c19becf3..6269795d 100644
--- a/src/graphics/Batch2D.h
+++ b/src/graphics/Batch2D.h
@@ -6,8 +6,6 @@
 
 #include "UVRegion.h"
 
-using namespace glm;
-
 class Mesh;
 class Texture;
 class Sprite;
@@ -25,8 +23,8 @@ class Batch2D {
 	void vertex(float x, float y,
 			float u, float v,
 			float r, float g, float b, float a);
-	void vertex(vec2 point,
-			vec2 uvpoint,
+	void vertex(glm::vec2 point,
+			glm::vec2 uvpoint,
 			float r, float g, float b, float a);
 
 public:
@@ -37,10 +35,10 @@ public:
 
 	void begin();
 	void texture(Texture* texture);
-	void sprite(float x, float y, float w, float h, const UVRegion& region, vec4 tint);
+	void sprite(float x, float y, float w, float h, const UVRegion& region, glm::vec4 tint);
 	void sprite(Sprite* sprite);
-	void sprite(float x, float y, float w, float h, int atlasRes, int index, vec4 tint);
-	void blockSprite(float x, float y, float w, float h, const UVRegion regions[], vec4 tint);
+	void sprite(float x, float y, float w, float h, int atlasRes, int index, glm::vec4 tint);
+	void blockSprite(float x, float y, float w, float h, const UVRegion regions[], glm::vec4 tint, glm::vec3 size=glm::vec3(1.0f, 1.0f, 1.0f));
 	void point(float x, float y, float r, float g, float b, float a);
 	void line(float x1, float y1, float x2, float y2, float r, float g, float b, float a);
 	void rect(float x, float y,
@@ -48,7 +46,7 @@ public:
 			float ox, float oy,
 			float angle, UVRegion region,
 			bool flippedX, bool flippedY,
-			vec4 tint);
+			glm::vec4 tint);
 
 	void rect(float x, float y, float w, float h);
 	void rect(float x, float y, float w, float h,
diff --git a/src/graphics/BlocksRenderer.cpp b/src/graphics/BlocksRenderer.cpp
index 8f3edc61..1e75ee93 100644
--- a/src/graphics/BlocksRenderer.cpp
+++ b/src/graphics/BlocksRenderer.cpp
@@ -189,6 +189,57 @@ void BlocksRenderer::blockXSprite(int x, int y, int z, const vec3& size, const U
 		vec3(-1.0f, 0, 1.0f), vec3(0, 1, 0), texface2, lights, do_tint(0.8f));
 }
 
+void BlocksRenderer::blockCubeShaded(const vec3& pos, const vec3& size, const UVRegion(&texfaces)[6], const Block* block, ubyte states) {
+	int rot = 0;
+	float x = pos.x;
+	float y = pos.y;
+	float z = pos.z;
+	{
+		vec4 lights[]{
+				pickSoftLight(x, y, z + 1, {1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(x + 1, y, z + 1, {1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(x + 1, y + 1, z + 1, {1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(x, y + 1, z + 1, {1, 0, 0}, {0, 1, 0}) };
+		face(vec3(x, y, z), size.x, size.y, vec3(1, 0, 0), vec3(0, 1, 0), texfaces[5], lights, do_tint(0.9f), rot == 1);
+	} {
+		vec4 lights[]{
+				pickSoftLight(pos.x, pos.y, pos.z - 1, {-1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(pos.x - 1, pos.y, pos.z - 1, {-1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(pos.x - 1, pos.y + 1, pos.z - 1, {-1, 0, 0}, {0, 1, 0}),
+				pickSoftLight(pos.x, pos.y + 1, pos.z - 1, {-1, 0, 0}, {0, 1, 0}) };
+		face(vec3(x + size.x, y, z - size.z), size.x, size.y, vec3(-1, 0, 0), vec3(0, 1, 0), texfaces[4], lights, do_tint(0.75f), rot == 1);
+	} {
+		vec4 lights[]{
+				pickSoftLight(x, pos.y + 1, pos.z + 1, {1, 0, 0}, {0, 0, 1}),
+				pickSoftLight(x + 1, pos.y + 1, pos.z + 1, {1, 0, 0}, {0, 0, 1}),
+				pickSoftLight(x + 1, pos.y + 1, pos.z, {1, 0, 0}, {0, 0, 1}),
+				pickSoftLight(x, pos.y + 1, pos.z, {1, 0, 0}, {0, 0, 1}) };
+
+		face(vec3(x, y + size.y, z), size.x, size.z, vec3(1, 0, 0), vec3(0, 0, -1), texfaces[3], lights, vec4(1.0f), rot == 1);
+	} {
+		vec4 lights[]{
+				pickSoftLight(pos.x, pos.y - 1, pos.z - 1, {1, 0, 0}, {0, 0, -1}),
+				pickSoftLight(pos.x + 1, y - 1, pos.z - 1, {1, 0, 0}, {0, 0,-1}),
+				pickSoftLight(pos.x + 1, y - 1, pos.z, {1, 0, 0}, {0, 0, -1}),
+				pickSoftLight(x, y - 1, z, {1, 0, 0}, {0, 0, -1}) };
+		face(vec3(x, y, z - size.z), size.x, size.z, vec3(1, 0, 0), vec3(0, 0, 1), texfaces[2], lights, do_tint(0.6f), rot == 1);
+	} {
+		vec4 lights[]{
+				pickSoftLight(x - 1, y, z - 1, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x - 1, y, z, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x - 1, y + 1, z, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x - 1, y + 1, z - 1, {0, 0, -1}, {0, 1, 0}) };
+		face(vec3(x, y, z - size.z), size.z, size.y, vec3(0, 0, 1), vec3(0, 1, 0), texfaces[0], lights, do_tint(0.7f), rot == 3);
+	} {
+		vec4 lights[]{
+				pickSoftLight(x + 1, y, z, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x + 1, y, z - 1, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x + 1, y + 1, z - 1, {0, 0, -1}, {0, 1, 0}),
+				pickSoftLight(x + 1, y + 1, z, {0, 0, -1}, {0, 1, 0}) };
+		face(vec3(x + size.x, y, z), size.z, size.y, vec3(0, 0, -1), vec3(0, 1, 0), texfaces[1], lights, do_tint(0.8f), rot == 3);
+	}
+}
+
 void BlocksRenderer::blockCubeShaded(int x, int y, int z, const vec3& size, const UVRegion(&texfaces_)[6], const Block* block, ubyte states) {
 	ubyte group = block->drawGroup;
 	UVRegion texfaces[6];
@@ -277,7 +328,7 @@ bool BlocksRenderer::isOpen(int x, int y, int z, ubyte group) const {
 	if (id == BLOCK_VOID)
 		return false;
 	const Block& block = *blockDefsCache[id];
-	if (block.drawGroup != group && block.lightPassing) {
+	if ((block.drawGroup != group && block.lightPassing) || !block.rt.solid) {
 		return true;
 	}
 	return !id;
@@ -315,6 +366,11 @@ vec4 BlocksRenderer::pickSoftLight(int x, int y, int z,
 		pickLight(x - right.x, y - right.y, z - right.z)) * 0.25f;
 }
 
+vec4 BlocksRenderer::pickSoftLight(float x, float y, float z, 
+								  const ivec3& right, const ivec3& up) const {
+	return pickSoftLight(int(round(x)), int(round(y)), int(round(z)), right, up);
+}
+
 void BlocksRenderer::render(const voxel* voxels, int atlas_size) {
 	int begin = chunk->bottom * (CHUNK_W * CHUNK_D);
 	int end = chunk->top * (CHUNK_W * CHUNK_D);
@@ -344,6 +400,14 @@ void BlocksRenderer::render(const voxel* voxels, int atlas_size) {
 				blockXSprite(x, y, z, vec3(1.0f), texfaces[FACE_MX], texfaces[FACE_MZ], 1.0f);
 				break;
 			}
+			case BlockModel::aabb: {
+				vec3 size = def.hitbox.size();
+				vec3 off = def.hitbox.min();
+				off.z *= -1.0f;
+				off.z = -1.0f-off.z + size.z;
+				blockCubeShaded(off+vec3(x,y,z), size, texfaces, &def, vox.states);
+				break;
+			}
 			default:
 				break;
 			}
diff --git a/src/graphics/BlocksRenderer.h b/src/graphics/BlocksRenderer.h
index f699301e..ba244137 100644
--- a/src/graphics/BlocksRenderer.h
+++ b/src/graphics/BlocksRenderer.h
@@ -63,6 +63,7 @@ class BlocksRenderer {
 	void cube(const glm::vec3& coord, const glm::vec3& size, const UVRegion(&faces)[6]);
 	void blockCube(int x, int y, int z, const glm::vec3& size, const UVRegion(&faces)[6], ubyte group);
 	void blockCubeShaded(int x, int y, int z, const glm::vec3& size, const UVRegion(&faces)[6], const Block* block, ubyte states);
+	void blockCubeShaded(const glm::vec3& pos, const glm::vec3& size, const UVRegion(&faces)[6], const Block* block, ubyte states);
 	void blockXSprite(int x, int y, int z, const glm::vec3& size, const UVRegion& face1, const UVRegion& face2, float spread);
 
 	bool isOpenForLight(int x, int y, int z) const;
@@ -70,6 +71,7 @@ class BlocksRenderer {
 
 	glm::vec4 pickLight(int x, int y, int z) const;
 	glm::vec4 pickSoftLight(int x, int y, int z, const glm::ivec3& right, const glm::ivec3& up) const;
+	glm::vec4 pickSoftLight(float x, float y, float z, const glm::ivec3& right, const glm::ivec3& up) const;
 	void render(const voxel* voxels, int atlas_size);
 public:
 	BlocksRenderer(size_t capacity, const Content* content, const ContentGfxCache* cache, const EngineSettings& settings);
diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index c13681f6..0abf7962 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -2,6 +2,8 @@
 #include "Texture.h"
 #include "Batch2D.h"
 
+using glm::vec4;
+
 Font::Font(std::vector<Texture*> pages, int lineHeight) : lineHeight_(lineHeight), pages(pages) {
 }
 
@@ -10,22 +12,6 @@ Font::~Font(){
 		delete texture;
 }
 
-// int Font::getGlyphWidth(char c) {
-// 	switch (c){
-// 		case 'l':
-// 		case 'i':
-// 		case 'j':
-// 		case '|':
-// 		case '.':
-// 		case ',':
-// 		case ':':
-// 		case ';': return 7;
-// 		case 't': return 8;
-// 		case ' ': return 7;
-// 	}
-// 	return 7;
-// }
-
 int Font::lineHeight() const {
 	return lineHeight_;
 }
diff --git a/src/graphics/Texture.cpp b/src/graphics/Texture.cpp
index 74ed76bd..0d5ae803 100644
--- a/src/graphics/Texture.cpp
+++ b/src/graphics/Texture.cpp
@@ -4,10 +4,12 @@
 
 #include "ImageData.h"
 
-Texture::Texture(unsigned int id, int width, int height) : id(id), width(width), height(height) {
+Texture::Texture(uint id, int width, int height) 
+	: id(id), width(width), height(height) {
 }
 
-Texture::Texture(unsigned char* data, int width, int height, uint format) : width(width), height(height) {
+Texture::Texture(ubyte* data, int width, int height, uint format) 
+	: width(width), height(height) {
 	glGenTextures(1, &id);
 	glBindTexture(GL_TEXTURE_2D, id);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -28,7 +30,7 @@ void Texture::bind(){
 	glBindTexture(GL_TEXTURE_2D, id);
 }
 
-void Texture::reload(unsigned char* data){
+void Texture::reload(ubyte* data){
 	glBindTexture(GL_TEXTURE_2D, id);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
 		GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid *) data);
@@ -36,6 +38,8 @@ void Texture::reload(unsigned char* data){
 }
 
 Texture* Texture::from(const ImageData* image) {
+	uint width = image->getWidth();
+	uint height = image->getHeight();
 	uint format;
 	const void* data = image->getData();
 	switch (image->getFormat())	{
@@ -44,5 +48,5 @@ Texture* Texture::from(const ImageData* image) {
 		default:
 			throw std::runtime_error("unsupported image data format");
 	}
-	return new Texture((unsigned char*)data, image->getWidth(), image->getHeight(), format);
+	return new Texture((ubyte*)data, width, height, format);
 }
\ No newline at end of file
diff --git a/src/graphics/Texture.h b/src/graphics/Texture.h
index a01e9124..4e85cb86 100644
--- a/src/graphics/Texture.h
+++ b/src/graphics/Texture.h
@@ -8,15 +8,15 @@ class ImageData;
 
 class Texture {
 public:
-	unsigned int id;
+	uint id;
 	int width;
 	int height;
-	Texture(unsigned int id, int width, int height);
-	Texture(unsigned char* data, int width, int height, uint format);
+	Texture(uint id, int width, int height);
+	Texture(ubyte* data, int width, int height, uint format);
 	~Texture();
 
 	void bind();
-	void reload(unsigned char* data);
+	void reload(ubyte* data);
 
 	static Texture* from(const ImageData* image);
 };
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index b85f4df3..cf7b466e 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -180,7 +180,7 @@ void PlayerController::updateControls(float delta){
 }
 
 void PlayerController::updateInteraction(){
-	const ContentIndices* contentIds = level->contentIds;
+	auto contentIds = level->content->indices;
 	Chunks* chunks = level->chunks;
 	Player* player = level->player;
 	Lighting* lighting = level->lighting;
diff --git a/src/voxels/Block.h b/src/voxels/Block.h
index 1b1b1e39..e77ddeef 100644
--- a/src/voxels/Block.h
+++ b/src/voxels/Block.h
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "../maths/aabb.h"
+#include "../typedefs.h"
 
 #define FACE_MX 0
 #define FACE_PX 1
@@ -15,13 +16,15 @@
 #define BLOCK_AABB_GRID 16
 
 enum class BlockModel {
-	none, block, xsprite
+	none, // invisible 
+	block, // default shape
+	xsprite, // X-shape (grass)
+	aabb // box shaped as block hitbox
 };
 
 class Block {
 public:
 	std::string const name;
-	unsigned int id;
 						               //  0 1   2 3   4 5
 	std::string textureFaces[6]; // -x,x, -y,y, -z,z
 	unsigned char emission[4];
@@ -36,6 +39,7 @@ public:
 	AABB hitbox;
 
 	struct {
+		blockid_t id;
 		bool solid = true;
 		bool emissive = false;
 		bool hitboxGrid[BLOCK_AABB_GRID][BLOCK_AABB_GRID][BLOCK_AABB_GRID];
diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp
index 8ba1b677..bcf61140 100644
--- a/src/voxels/WorldGenerator.cpp
+++ b/src/voxels/WorldGenerator.cpp
@@ -97,16 +97,16 @@ float calc_height(fnl_state *noise, int real_x, int real_z){
 }
 
 WorldGenerator::WorldGenerator(const Content* content)
-	           : idStone(content->require("base:stone")->id),
-			     idDirt(content->require("base:dirt")->id),
-				 idGrassBlock(content->require("base:grass_block")->id),
-				 idSand(content->require("base:sand")->id),
-				 idWater(content->require("base:water")->id),
-				 idWood(content->require("base:wood")->id),
-				 idLeaves(content->require("base:leaves")->id),
-				 idGrass(content->require("base:grass")->id),
-				 idFlower(content->require("base:flower")->id),
-				 idBedrock(content->require("base:bedrock")->id) {;
+	           : idStone(content->require("base:stone")->rt.id),
+			     idDirt(content->require("base:dirt")->rt.id),
+				 idGrassBlock(content->require("base:grass_block")->rt.id),
+				 idSand(content->require("base:sand")->rt.id),
+				 idWater(content->require("base:water")->rt.id),
+				 idWood(content->require("base:wood")->rt.id),
+				 idLeaves(content->require("base:leaves")->rt.id),
+				 idGrass(content->require("base:grass")->rt.id),
+				 idFlower(content->require("base:flower")->rt.id),
+				 idBedrock(content->require("base:bedrock")->rt.id) {;
 }
 
 int generate_tree(fnl_state *noise, 
diff --git a/src/world/Level.h b/src/world/Level.h
index 6ea9c71b..410a8ae2 100644
--- a/src/world/Level.h
+++ b/src/world/Level.h
@@ -17,10 +17,10 @@ class ChunksStorage;
 class PlayerController;
 
 class Level {
+	const ContentIndices* const contentIds;
 public:
 	World* world;
 	const Content* const content;
-	const ContentIndices* const contentIds;
 	Player* player;
 	Chunks* chunks;
 	ChunksStorage* chunksStorage;

From cee0214ac53c2bdeceea8106836bcef46028e6b4 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 30 Nov 2023 15:04:20 +0300
Subject: [PATCH 2/2] selection normal vector debug

---
 src/frontend/WorldRenderer.cpp | 5 +++++
 src/graphics/LineBatch.h       | 5 ++++-
 src/logic/PlayerController.cpp | 5 +++++
 src/logic/PlayerController.h   | 2 ++
 src/voxels/Chunks.cpp          | 1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/frontend/WorldRenderer.cpp b/src/frontend/WorldRenderer.cpp
index 18538123..2571d384 100644
--- a/src/frontend/WorldRenderer.cpp
+++ b/src/frontend/WorldRenderer.cpp
@@ -189,6 +189,8 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera){
 			Block* block = contentIds->getBlockDef(id);
 			assert(block != nullptr);
 			const vec3 pos = PlayerController::selectedBlockPosition;
+			const vec3 point = PlayerController::selectedPointPosition;
+			const vec3 norm = PlayerController::selectedBlockNormal;
 			const AABB& hitbox = block->hitbox;
 			const vec3 center = pos + hitbox.center();
 			const vec3 size = hitbox.size();
@@ -196,6 +198,8 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera){
 			linesShader->uniformMatrix("u_projview", camera->getProjView());
 			lineBatch->lineWidth(2.0f);
 			lineBatch->box(center, size + vec3(0.02), vec4(0.f, 0.f, 0.f, 0.5f));
+			if (level->player->debug)
+				lineBatch->line(point, point+norm*0.5f, vec4(1.0f, 0.0f, 1.0f, 1.0f));
 			lineBatch->render();
 		}
 		skybox->unbind();
@@ -206,6 +210,7 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera){
 		ctx.depthTest(true);
 
 		linesShader->use();
+
 		if (settings.debug.showChunkBorders){
 			linesShader->uniformMatrix("u_projview", camera->getProjView());
 			vec3 coord = level->player->camera->position;
diff --git a/src/graphics/LineBatch.h b/src/graphics/LineBatch.h
index bbecaa0b..fac9c877 100644
--- a/src/graphics/LineBatch.h
+++ b/src/graphics/LineBatch.h
@@ -15,13 +15,16 @@ public:
 	LineBatch(size_t capacity=4096);
 	~LineBatch();
 
+	inline void line(const glm::vec3 a, const glm::vec3 b, const glm::vec4 color) {
+		line(a.x, a.y, a.z, b.x, b.y, b.z, color.r, color.g, color.b, color.a); 
+	}
 	void line(float x1, float y1, float z1, float x2, float y2, float z2,
 			float r, float g, float b, float a);
 	void box(float x, float y, float z, float w, float h, float d,
 			float r, float g, float b, float a);
 
 	inline void box(glm::vec3 xyz, glm::vec3 whd, glm::vec4 rgba) {
-		return box(xyz.x, xyz.y, xyz.z, whd.x, whd.y, whd.z,
+		box(xyz.x, xyz.y, xyz.z, whd.x, whd.y, whd.z,
 				   rgba.r, rgba.g, rgba.b, rgba.a);
 	}
 
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index cf7b466e..ae2ecf1a 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -107,6 +107,8 @@ void CameraControl::update(PlayerInput& input, float delta) {
 }
 
 vec3 PlayerController::selectedBlockPosition;
+vec3 PlayerController::selectedPointPosition;
+vec3 PlayerController::selectedBlockNormal;
 int PlayerController::selectedBlockId = -1;
 
 PlayerController::PlayerController(Level* level, const EngineSettings& settings) 
@@ -179,6 +181,7 @@ void PlayerController::updateControls(float delta){
 	player->update(level, input, delta);
 }
 
+#include <iostream>
 void PlayerController::updateInteraction(){
 	auto contentIds = level->content->indices;
 	Chunks* chunks = level->chunks;
@@ -206,6 +209,8 @@ void PlayerController::updateInteraction(){
 		player->selectedVoxel = *vox;
 		selectedBlockId = vox->id;
 		selectedBlockPosition = iend;
+		selectedPointPosition = end;
+		selectedBlockNormal = norm;
 		int x = (int)iend.x;
 		int y = (int)iend.y;
 		int z = (int)iend.z;
diff --git a/src/logic/PlayerController.h b/src/logic/PlayerController.h
index 27435d72..e9e029fd 100644
--- a/src/logic/PlayerController.h
+++ b/src/logic/PlayerController.h
@@ -37,6 +37,8 @@ class PlayerController {
 	void updateInteraction();
 public:
 	static glm::vec3 selectedBlockPosition;
+	static glm::vec3 selectedBlockNormal;
+	static glm::vec3 selectedPointPosition;
 	static int selectedBlockId;
 
 	PlayerController(Level* level, const EngineSettings& settings);
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index d069b0a7..d7cb67d6 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -230,6 +230,7 @@ voxel* Chunks::rayCast(vec3 start,
 					end.y += dy / float(subs);
 					end.z += dz / float(subs);
 					if (box.inside(end)) {
+						end += iend;
 						norm.x = norm.y = norm.z = 0.0f;
 						if (steppedIndex == 0) norm.x = -stepx;
 						if (steppedIndex == 1) norm.y = -stepy;