From 4efefa976adca32dd696507272f2d7de44f0e619 Mon Sep 17 00:00:00 2001
From: Kacper Kostka <kacperks@cubesoftware.xyz>
Date: Sat, 25 Feb 2023 16:04:37 -0500
Subject: [PATCH] General fixes

---
 XtreemNodes.depend        |  22 ++++++------
 XtreemNodes.layout        |  44 +++++++++++------------
 XtreemNodesWindows.depend |  71 ++++++++++++++++++++++++++++++++++++++
 XtreemNodesWindows.layout |  30 ++++++++++++++++
 data/img/apple.png        | Bin 231 -> 0 bytes
 data/img/grass.png        | Bin 423 -> 778 bytes
 data/img/maple.png        | Bin 991 -> 0 bytes
 include/TextureHandler.h  |   7 ++--
 8 files changed, 138 insertions(+), 36 deletions(-)
 create mode 100644 XtreemNodesWindows.depend
 create mode 100644 XtreemNodesWindows.layout
 delete mode 100644 data/img/apple.png
 delete mode 100644 data/img/maple.png

diff --git a/XtreemNodes.depend b/XtreemNodes.depend
index 26a9616..81c77e5 100644
--- a/XtreemNodes.depend
+++ b/XtreemNodes.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1667337375 source:c:\development\xtreemminer\main.cpp
+1672107417 source:c:\development\xtreemminer\main.cpp
 	<stdlib.h>
 	<GL/glut.h>
 	"Utilities.h"
@@ -13,27 +13,27 @@
 	<random>
 	<SFML/Window.hpp>
 
-1667164197 c:\development\xtreemminer\include\noderenderer.h
+1672201712 c:\development\xtreemminer\include\noderenderer.h
 	"Base.h"
 	"MapBlock.h"
 	<GL/glut.h>
 
-1667167677 c:\development\xtreemminer\include\mapblock.h
+1667164077 c:\development\xtreemminer\include\mapblock.h
 	"Base.h"
 	<math.h>
 	<cstdio>
 
-1667069440 c:\development\xtreemminer\include\base.h
+1667065840 c:\development\xtreemminer\include\base.h
 
 1666531672 source:c:\development\xtreemminer\base.cpp
 	"MapBlock.h"
 	"Base.h"
 
-1667148859 c:\development\xtreemminer\include\texturehandler.h
+1672341127 c:\development\xtreemminer\include\texturehandler.h
 	"stb_image.h"
 	"Base.h"
 
-1666448933 c:\development\xtreemminer\include\stb_image.h
+1666445333 c:\development\xtreemminer\include\stb_image.h
 	"stb_image.h"
 	<stdio.h>
 	<stdlib.h>
@@ -50,12 +50,12 @@
 	<intrin.h>
 	<arm_neon.h>
 
-1667069440 c:\development\xtreemminer\include\utilities.h
+1667065840 c:\development\xtreemminer\include\utilities.h
 
-1667079584 c:\development\xtreemminer\include\fastnoiselite.h
+1667075984 c:\development\xtreemminer\include\fastnoiselite.h
 	<cmath>
 
-1667167831 source:c:\development\xtreemminer\mapblock.cpp
+1667350805 source:c:\development\xtreemminer\mapblock.cpp
 	"MapBlock.h"
 
 1667294728 source:/home/kacperks/projects/XtreemNodes/MapBlock.cpp
@@ -113,10 +113,10 @@
 1667294728 /home/kacperks/projects/XtreemNodes/include/FastNoiseLite.h
 	<cmath>
 
-1667351497 source:c:\development\xtreemminer\gui.cpp
+1667347897 source:c:\development\xtreemminer\gui.cpp
 	"GUI.h"
 
-1667336637 c:\development\xtreemminer\include\gui.h
+1667333037 c:\development\xtreemminer\include\gui.h
 	"Base.h"
 	<SFML/Main.hpp>
 	<SFML/Graphics.hpp>
diff --git a/XtreemNodes.layout b/XtreemNodes.layout
index 862f813..2364094 100644
--- a/XtreemNodes.layout
+++ b/XtreemNodes.layout
@@ -2,9 +2,9 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="include\Logger.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="include\FastNoiseLite.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="97" topLine="0" />
+			<Cursor1 position="100664" topLine="2262" />
 		</Cursor>
 	</File>
 	<File name="include\Base.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -12,44 +12,44 @@
 			<Cursor1 position="28" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="include\NodeRenderer.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2409" topLine="75" />
-		</Cursor>
-	</File>
-	<File name="MapBlock.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1001" topLine="34" />
-		</Cursor>
-	</File>
-	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2573" topLine="100" />
-		</Cursor>
-	</File>
 	<File name="include\MapBlock.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="438" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="include\stb_image.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="include\stb_image.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="8925" topLine="160" />
 		</Cursor>
 	</File>
-	<File name="include\Nodes.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="MapBlock.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1001" topLine="30" />
+		</Cursor>
+	</File>
+	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2573" topLine="88" />
+		</Cursor>
+	</File>
+	<File name="include\Nodes.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="264" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="include\FastNoiseLite.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="include\Logger.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="100664" topLine="2262" />
+			<Cursor1 position="97" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="include\TextureHandler.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2192" topLine="17" />
+			<Cursor1 position="0" topLine="16" />
+		</Cursor>
+	</File>
+	<File name="include\NodeRenderer.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2409" topLine="75" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/XtreemNodesWindows.depend b/XtreemNodesWindows.depend
new file mode 100644
index 0000000..09f58a1
--- /dev/null
+++ b/XtreemNodesWindows.depend
@@ -0,0 +1,71 @@
+# depslib dependency file v1.0
+1667347897 source:c:\development\xtreemminer\gui.cpp
+	"GUI.h"
+
+1667333037 c:\development\xtreemminer\include\gui.h
+	"Base.h"
+	<SFML/Main.hpp>
+	<SFML/Graphics.hpp>
+
+1667065840 c:\development\xtreemminer\include\base.h
+
+1672106999 source:c:\development\xtreemminer\main.cpp
+	<stdlib.h>
+	<GL/glut.h>
+	"Utilities.h"
+	"MapBlock.h"
+	"Base.h"
+	"NodeRenderer.h"
+	"TextureHandler.h"
+	"LevelGenerator.h"
+	<math.h>
+	<cstdio>
+	<random>
+	<SFML/Window.hpp>
+
+1667065840 c:\development\xtreemminer\include\utilities.h
+
+1667164077 c:\development\xtreemminer\include\mapblock.h
+	"Base.h"
+	<math.h>
+	<cstdio>
+
+1667160597 c:\development\xtreemminer\include\noderenderer.h
+	"Base.h"
+	"MapBlock.h"
+	<GL/glut.h>
+
+1672105046 c:\development\xtreemminer\include\texturehandler.h
+	"stb_image.h"
+	"Base.h"
+
+1666445333 c:\development\xtreemminer\include\stb_image.h
+	"stb_image.h"
+	<stdio.h>
+	<stdlib.h>
+	<stdarg.h>
+	<stddef.h>
+	<stdlib.h>
+	<string.h>
+	<limits.h>
+	<math.h>
+	<stdio.h>
+	<assert.h>
+	<stdint.h>
+	<emmintrin.h>
+	<intrin.h>
+	<arm_neon.h>
+
+1667350805 source:c:\development\xtreemminer\mapblock.cpp
+	"MapBlock.h"
+
+1672106616 source:c:\development\xtreemminer\levelgenerator.cpp
+	"LevelGenerator.h"
+
+1672106654 c:\development\xtreemminer\include\levelgenerator.h
+	"FastNoiseLite.h"
+	"MapBlock.h"
+
+1667075984 c:\development\xtreemminer\include\fastnoiselite.h
+	<cmath>
+
diff --git a/XtreemNodesWindows.layout b/XtreemNodesWindows.layout
new file mode 100644
index 0000000..9a0d84b
--- /dev/null
+++ b/XtreemNodesWindows.layout
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="main.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3631" topLine="60" />
+		</Cursor>
+	</File>
+	<File name="MapBlock.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="LevelGenerator.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1029" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="include\MapBlock.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="include\LevelGenerator.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="97" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>
diff --git a/data/img/apple.png b/data/img/apple.png
deleted file mode 100644
index 750557e631a3a21d7ad06ce765edc26bfcdef3c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|U9L6yOu$YHc9v
zWUibRpqCqNQk7&stHR4_){}Q2rAglIE({&4vK~NAnWu|m2*-8RGmd<R6?j|%uP<TO
zXtQP6bbOhegUY7kJO3woUAcStdd7j3oA=g<ZrEG9+lj@8ecQ$ZnF+g-7^W$5OLyE!
z&9!+`vb>UwskHdqW;=tl*U~G@^Omtp>?yQ!=*_4XnB}sdXpc&E`&9ewQ%fzp-|f62
YKRsVW-*aNQE6@cDp00i_>zopr00wzc3jhEB

diff --git a/data/img/grass.png b/data/img/grass.png
index 84f83a24297ceadb19206ed540fd8c941baff849..ce4c33fe1d3f8896ca0f6150d4e1720e72cca3b2 100644
GIT binary patch
delta 765
zcmV<Z0s{S~1BwQa8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Ri0vQzmD8C#7jsO4xib+I4R5;5u
zliPCRL=c9*IY={-Y}vu&umsrJg4%mtf@k2_cr>bDiz;A4;(x@JBaNid9QH!li@xpt
z4_}Mle*ZPs2SexsuJ_nYNmwFbjsWOF;m3s(GrCY9Auf>=68rlta_T(-$<yB*Qc6<H
z<d|viYMMg@66(Fhwk6sqNKmzwqAJKfA=^Vm_t2ALrrH@&NZ7VyeqDI^)M1)pRg<7J
z3IHL&Zc1X#$bZQNa?Bh)>^Ocp(Htte&ja)8g02+Z=YjskA+;m{)s;aTMVKS~(IKT0
z2ql;<p541GOYdpEvE-a-t}3Jw9NzDUOJwY3+{*-6FkU9M*9}sY5`e;LQc84B12H7p
z+XjH|f4U|6#MsSLJ44Qy;dx|x-QZn7&ci}`SL4S8rGF*W-cneNJ5K=o``05OX0Cp0
znJ%6b651#Vs|h}^8Uy^eFm^K}Sf+s88r*q88$}8U5~xz5twxoSmwztkQlqs|JpFOz
z@L|u?%^+d!Jzp0KA=Y3YdWPo_vnk0jBZR=#8l7{dxvuCR9cEL~A01&{K}ky{=XLDn
zjRQdGRey=C46;8ul$LC6YKGHDd)x5yFF&yVuEn$^DP{_*@h(7mQwQ{qj^XUk+uH^u
z1jj#5Yn{F4IiHCkVVVLdC8|&?^GJKML6wr|6Tt^mQ6m=@m|URRTXuIF#<%o`=Mg0Y
z-g)|?BZb6p8i_uwmbPXE>1+SZRRzH2+nO*(>UO<F6bidF?C-Y-Dba;uIF01AhP%6O
zkY-cjhh_b;keGXqu^J%+v-32Eiq}VnZOb*2kdSI6@$%r1-9wL5f~lL)Zx_%14-~Z~
v%#o${m~Da5lJ37ADJ5Z!y!&`Vm;zq_mqKZ*WA;1J00000NkvXXu0mjfAEaPI

delta 381
zcmV-@0fPRD2B!m%8Gi!+001a04^sdD00DDSM?wIu&K&6g003!FOjJcke>q8lI!c2(
zONBd4hdoS)JWYu`PKrKHj6P3|KTwT7P>w)RkU&zAK~s`KRFgwgl|xpSMOT?cSeiyy
zoJLxnNL!#tT%k!`p-Ek&N?)c-U#Cl7s7zt0O=7K0W35kTu?tgZvQ%!gSnI-RKaoHl
zf947v01YSR8=({c006{EL_t&-(+$oEf`c#!06<!`MspD$5M!#l{r@A|7t8=(4NVX^
z`i#My;O|GNbPX}#T(Lnz=zQvYGPkUzP?Ao!&%rO%j*}fQrrI=FJSnB_3=~<MyzSFg
zi`fd`6;%$hR7c+V9U)&!Wa*K(6Y5rgXXil@IP#4TpL_$7RM)4Q1DS}9KbUlE_UX7;
z;qcQy+O(jGmL9sY>yQfSq_4IohfI`yv93ha`S$!Od_iA_?2Y9vGA4EiekbGgz;>vg
b^Z)(@wwV$W5r>vk00000NkvXXu0mjf3vHsc

diff --git a/data/img/maple.png b/data/img/maple.png
deleted file mode 100644
index f6c6f9dae81d88685f1c47a9f6077eb965430943..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 991
zcmWlXTWs4@9EW{5p^a}z(KMxr?aYoZ$x_F$<JiYeg0zw}2~D%K>)3|0sg%+UHdaKt
z!q|lgDlXC<#-&<;jcGhgNKEBn0wEy=Xpf)*g9)k91Y#;MAs%=@LIP2aC7<8<&iDHt
z={)$AUbo3oNeaU-w%w{vpgkV0eiCKYi0wifK0nbM##Yz(yBJ1X?R6#_xdfI^;6n*A
zI~d6i;`u>f3=##DNqi`Yk}#4WpTY}CU?#~Tk||)M2qQ%rDPSTW9{UQZh=~l37txUi
z1)ePMz~l*&zsEw72Sq+&2*3)VuON^%PnLMxMl%9g6!4-zm_no|kd}a30%3&!Y=N-R
zqyS8jG(}Jp2?tdo?x0pAZ4ob{Rs;_6BI$_0N~14gr$H%AI%&c~RmlD2G=OPfOA&V)
zuq4Wn2wUoRBv6tl7o|)(66HyxBLiEeU}&Oc86}cYPsTiSMUJ{MaAX8@Sw<4LaukM1
zxiaI+z(Z9AdD@jZCqsEM1JQMvg=juQL78zgw3ngEO23z3VaOcJFfhZqO4QHLu0oYn
z;3|x#P+pj<r*KeVpu)Opw5%fFT$OTF+E>^>p*@xIRN7TJs75`Ng(@<L85lC>tBkL*
zuEqu`<7!-hq((uFff@qN4<Qz4w2vx{2{hK%;z7u<ipEwn4(hC@$E#>e=X@Py+}F84
zX9Jys*;rMN1zEO|<$~-$H5(6dT#$>`a%^?`Ky7=xnjh%Gt(}^7VAPx*8+xQ`%<L>2
z+NnR<GiS$(2PdpUyX?m%OONk%4nJ5vvd4X5uXl7GoO{SWIep)2Pu>6eeEp4u#`3X|
z^G~-{o@u{%{DHTg9ew*m=fcUci>JDmp6fN2R?6W|JU!a1V=qU97CJ<qZ0(!JF#6tb
z;Wuxe{ujx<h4xsZ@0Tb&pxVDDHs_GK+OF@IOnle)hCO;?8}s7BKW-kFyLKzLvUF>I
zd-&S^nc16;B>nk!^HTiCsqxh8$gxV~lN)P)^zQt8UYq)D$NDn<()W0G<j#eUw{&j*
zu;uI3+SJ9)iR;T}-aDsMKKgXS@;;xrJAQfd1%Z^8PQUx*nbJ>fE4e<M`*y3bXCt+H
zJ-x7T_^azn|Iv+Kjl$yP?)!fFuiE%K`tbT*UOawK{NhS$@k9Qzb1nCu*p<b#)~o6V
QXVJT{cB5Ng9iDpre=(fc!2kdN

diff --git a/include/TextureHandler.h b/include/TextureHandler.h
index 5fd4572..eeae9ab 100644
--- a/include/TextureHandler.h
+++ b/include/TextureHandler.h
@@ -4,8 +4,8 @@
 #include "Base.h"
 
 
-//#ifndef TEXTURE_HANDLER
-//#define TEXTURE_HANDLER
+#ifndef TEXTURE_HANDLER
+#define TEXTURE_HANDLER
 class TextureHandler
 {
     private:
@@ -39,6 +39,7 @@ class TextureHandler
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 16, 16, 0, GL_RGB, GL_UNSIGNED_BYTE, imageData);
 
+
             imageData1 = loadTexture("data/img/oak.png");
             glGenTextures(1, &textures1);
             glBindTexture(GL_TEXTURE_2D, textures1);
@@ -67,4 +68,4 @@ class TextureHandler
         }
 };
 
-//#endif
+#endif