Compare commits
No commits in common. "c3fa504c29bccb9904d251e5c2fb7a0f8eb0877c" and "dcac2713f6b72f4d2252632a179b30a33fd827a8" have entirely different histories.
c3fa504c29
...
dcac2713f6
@ -1,9 +1,5 @@
|
||||
# depslib dependency file v1.0
|
||||
<<<<<<< HEAD
|
||||
1672107417 source:c:\development\xtreemminer\main.cpp
|
||||
=======
|
||||
1672097148 source:c:\development\xtreemminer\main.cpp
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
<stdlib.h>
|
||||
<GL/glut.h>
|
||||
"Utilities.h"
|
||||
@ -16,11 +12,7 @@
|
||||
<random>
|
||||
<SFML/Window.hpp>
|
||||
|
||||
<<<<<<< HEAD
|
||||
1672201712 c:\development\xtreemminer\include\noderenderer.h
|
||||
=======
|
||||
1667160597 c:\development\xtreemminer\include\noderenderer.h
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
"Base.h"
|
||||
"MapBlock.h"
|
||||
<GL/glut.h>
|
||||
@ -36,11 +28,7 @@
|
||||
"MapBlock.h"
|
||||
"Base.h"
|
||||
|
||||
<<<<<<< HEAD
|
||||
1672341127 c:\development\xtreemminer\include\texturehandler.h
|
||||
=======
|
||||
1672105046 c:\development\xtreemminer\include\texturehandler.h
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
"stb_image.h"
|
||||
"Base.h"
|
||||
|
||||
@ -63,7 +51,7 @@
|
||||
|
||||
1667065840 c:\development\xtreemminer\include\utilities.h
|
||||
|
||||
1667075984 c:\development\xtreemminer\include\fastnoiselite.h
|
||||
1667079584 c:\development\xtreemminer\include\fastnoiselite.h
|
||||
<cmath>
|
||||
|
||||
1667350805 source:c:\development\xtreemminer\mapblock.cpp
|
||||
|
||||
@ -2,15 +2,9 @@
|
||||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<<<<<<< HEAD
|
||||
<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="100664" topLine="2262" />
|
||||
=======
|
||||
<File name="include\NodeRenderer.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2409" topLine="24" />
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="MapBlock.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
@ -18,38 +12,11 @@
|
||||
<Cursor1 position="29" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<<<<<<< HEAD
|
||||
<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="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="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">
|
||||
=======
|
||||
<File name="include\Nodes.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
<Cursor>
|
||||
<Cursor1 position="264" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<<<<<<< HEAD
|
||||
<File name="include\Logger.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
=======
|
||||
<File name="include\LevelGenerator.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="174" topLine="0" />
|
||||
@ -71,9 +38,8 @@
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="include\FastNoiseLite.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
|
||||
<Cursor>
|
||||
<Cursor1 position="97" topLine="0" />
|
||||
<Cursor1 position="100664" topLine="2262" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="include\Base.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
@ -103,12 +69,7 @@
|
||||
</File>
|
||||
<File name="include\TextureHandler.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<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" />
|
||||
<Cursor1 position="2192" topLine="17" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
# 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>
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
<?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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 778 B |
@ -4,8 +4,8 @@
|
||||
#include "Base.h"
|
||||
|
||||
|
||||
#ifndef TEXTURE_HANDLER
|
||||
#define TEXTURE_HANDLER
|
||||
//#ifndef TEXTURE_HANDLER
|
||||
//#define TEXTURE_HANDLER
|
||||
class TextureHandler
|
||||
{
|
||||
private:
|
||||
@ -39,7 +39,6 @@ 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);
|
||||
@ -68,4 +67,4 @@ class TextureHandler
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user