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 "Utilities.h" @@ -13,27 +13,27 @@ -1667164197 c:\development\xtreemminer\include\noderenderer.h +1672201712 c:\development\xtreemminer\include\noderenderer.h "Base.h" "MapBlock.h" -1667167677 c:\development\xtreemminer\include\mapblock.h +1667164077 c:\development\xtreemminer\include\mapblock.h "Base.h" -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" @@ -50,12 +50,12 @@ -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 -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 -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" diff --git a/XtreemNodes.layout b/XtreemNodes.layout index 862f813..2364094 100644 --- a/XtreemNodes.layout +++ b/XtreemNodes.layout @@ -2,9 +2,9 @@ - + - + @@ -12,44 +12,44 @@ - - - - - - - - - - - - - - - - + - + + + + + + + + + + + - + - + - + + + + + + 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" + + + +1667065840 c:\development\xtreemminer\include\base.h + +1672106999 source:c:\development\xtreemminer\main.cpp + + + "Utilities.h" + "MapBlock.h" + "Base.h" + "NodeRenderer.h" + "TextureHandler.h" + "LevelGenerator.h" + + + + + +1667065840 c:\development\xtreemminer\include\utilities.h + +1667164077 c:\development\xtreemminer\include\mapblock.h + "Base.h" + + + +1667160597 c:\development\xtreemminer\include\noderenderer.h + "Base.h" + "MapBlock.h" + + +1672105046 c:\development\xtreemminer\include\texturehandler.h + "stb_image.h" + "Base.h" + +1666445333 c:\development\xtreemminer\include\stb_image.h + "stb_image.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 + + diff --git a/XtreemNodesWindows.layout b/XtreemNodesWindows.layout new file mode 100644 index 0000000..9a0d84b --- /dev/null +++ b/XtreemNodesWindows.layout @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/img/apple.png b/data/img/apple.png deleted file mode 100644 index 750557e..0000000 Binary files a/data/img/apple.png and /dev/null differ diff --git a/data/img/grass.png b/data/img/grass.png index 84f83a2..ce4c33f 100644 Binary files a/data/img/grass.png and b/data/img/grass.png differ diff --git a/data/img/maple.png b/data/img/maple.png deleted file mode 100644 index f6c6f9d..0000000 Binary files a/data/img/maple.png and /dev/null differ 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