MIGDYN/XtreemNodes
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Simplified the code for checking nodes and added simple shading

Browse Source
This commit is contained in:
Functioning Member of Society
2022-10-30 12:56:14 -04:00
parent 1d1aad04cf
commit 4c76fd1144
5 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/MapBlock.h
View File

@@ -10,8 +10,7 @@
class MapBlock
{
public:
int blockX;
int blockZ;
int mapBlock[65536];
MapBlock()
{
@@ -25,33 +24,6 @@ class MapBlock
mapBlock[256 * y + z * 16 + x] = id;
}
bool isAir(int x, int y, int z)
{
return getNodeAt(x, y, z) == 0;
}
int getNodeAt(int x, int y, int z)
{
return x < 16 && z < 16 && x >= 0 && z >= 0 ? mapBlock[256 * y + z * 16 + x] : 1;
}
protected:
private:
int mapBlock[65536];
};
class BlockManager
{
public:
MapBlock mapBlocks[16][16]; // 8 x 8 blocks
BlockManager()
{
}
private:
};
@@ -70,10 +42,42 @@ class BlockUtilities
pos2d.z = floor(z / 16);
return pos2d;
}
};
class BlockManager
{
public:
MapBlock mapBlocks[16][16]; // 16 x 16 blocks
BlockManager()
{
}
int getNodeAt(int x, int y, int z)
{
//if(x < 16 && x >= 0 && z < 16 && z >= 0)
//{
Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
return mapBlocks[block.x][block.z].mapBlock[256 * y + z * 16 + x];
// else
// {
//return mapBlocks[BlockUtilities::getBlockFromNodeCoordinates(x, z).x][BlockUtilities::getBlockFromNodeCoordinates(x, z).z];
//return 0;
//}
}
bool isAir(int x, int y, int z)
{
return getNodeAt(x, y, z) == 0;
}
private:
};
#endif

27
include/NodeRenderer.h
View File

@@ -19,13 +19,13 @@ class NodeRenderer
int renderNode(int x, int y, int z)
{
Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z); // The block the node at (x, y, z) is in
//Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z); // The block the node at (x, y, z) is in
glColor3f(1.0F, 1.0F, 1.0F);
glBegin(GL_QUADS);
// Front
if(blockManager.mapBlocks[block.x][block.z].isAir(x - block.x * 16, y, z - block.z * 16 - 1))
if(blockManager.getNodeAt(x, y, z - 1))
{
glTexCoord2f(.0F, .0F);
glVertex3f(x + .0F, y + 1.0F, z + .0F);
@@ -33,18 +33,19 @@ class NodeRenderer
glTexCoord2f(1.0F, .0F);
glVertex3f(x + 1.0F, y + 1.0F, z + .0F);
glColor3f(.6F, .6F, .6F); // Bottom vertices
glTexCoord2f(1.0F, 1.0F);
glVertex3f(x + 1.0F, y + .0F, z + .0F);
//glColor3f(.0F, .0F, .8F);
glTexCoord2f(.0F, 1.0F);
glVertex3f(x + .0F, y + .0F, z + .0F);
glColor3f(1.0F, 1.0F, 1.0F);
}
glColor3f(1.0F, 1.0F, 1.0F);
// Back
if(blockManager.mapBlocks[block.x][block.z].isAir(x - block.x * 16, y, z - block.z * 16 + 1))
if(blockManager.getNodeAt(x, y, z + 1))
{
glTexCoord2f(.0F, .0F);
glVertex3f(x + .0F, y + 1.0F, z + 1.0F);
@@ -52,47 +53,55 @@ class NodeRenderer
glTexCoord2f(1.0F, .0F);
glVertex3f(x + 1.0F, y + 1.0F, z + 1.0F);
glColor3f(.6F, .6F, .6F);
glTexCoord2f(1.0F, 1.0F);
glVertex3f(x + 1.0F, y + .0F, z + 1.0F);
glTexCoord2f(.0F, 1.0F);
glVertex3f(x + .0F, y + .0F, z + 1.0F);
glColor3f(1.0F, 1.0F, 1.0F);
}
// Right
if(blockManager.mapBlocks[block.x][block.z].isAir(x - block.x * 16 + 1, y, z - block.z * 16))
if(blockManager.getNodeAt(x + 1, y, z));
{
glTexCoord2f(1.0F, .0F);
glVertex3f(x + 1.0F, y + 1.0F, z + .0F);
glColor3f(.6F, .6F, .6F);
glTexCoord2f(1.0F, 1.0F);
glVertex3f(x + 1.0F, y + .0F, z + .0F);
glTexCoord2f(.0F, 1.0F);
glVertex3f(x + 1.0F, y + .0F, z + 1.0F);
glColor3f(1.0F, 1.0F, 1.0F);
glTexCoord2f(.0F, .0F);
glVertex3f(x + 1.0F, y + 1.0F, z + 1.0F);
}
// Left
if(blockManager.mapBlocks[block.x][block.z].isAir(x - block.x * 16 - 1, y, z - block.z * 16))
if(blockManager.getNodeAt(x - 1, y, z));
{
glTexCoord2f(1.0F, .0F);
glVertex3f(x + .0F, y + 1.0F, z + .0F);
glColor3f(.6F, .6F, .6F);
glTexCoord2f(1.0F, 1.0F);
glVertex3f(x + .0F, y + .0F, z + .0F);
glTexCoord2f(.0F, 1.0F);
glVertex3f(x + .0F, y + .0F, z + 1.0F);
glColor3f(1.0F, 1.0F, 1.0F);
glTexCoord2f(.0F, .0F);
glVertex3f(x + .0F, y + 1.0F, z + 1.0F);
}
// Bottom
if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y - 1, z - block.z * 16) == 0)
if(blockManager.getNodeAt(x, y - 1, z));
{
glTexCoord2f(.0F, .0F);
glVertex3f(x + 1.0F, y + .0F, z + .0F);
@@ -108,7 +117,7 @@ class NodeRenderer
}
// Top
if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y + 1, z - block.z * 16) == 0)
if(blockManager.getNodeAt(x, y + 1, z));
{
glTexCoord2f(.0F, .0F);
glVertex3f(x + 1.0F, y + 1.0F, z + .0F);

6
include/TextureHandler.h
View File

@@ -52,13 +52,13 @@ class TextureHandler
void getTextureForNode(int x, int y, int z)
{
Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y, z - block.z * 16) == 1)
//Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
if(blockManager.getNodeAt(x, y, z) == 1)
{
glBindTexture(GL_TEXTURE_2D, textures);
}
else if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y, z - block.z * 16) == 2)
else if(blockManager.getNodeAt(x, y, z) == 2)
{
glBindTexture(GL_TEXTURE_2D, textures1);
}