Still dealing with a very strange issue (Mind fixing it, Kacperks?)

Base.cpp

@@ -1,4 +0,0 @@
-#include "MapBlock.h"
-#include "Base.h"
-
-

XtreemNodes.depend

@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1667141044 source:c:\development\xtreemminer\main.cpp
+1667158149 source:c:\development\xtreemminer\main.cpp
 	<stdlib.h>
 	<GL/glut.h>
 	"Utilities.h"
@@ -12,14 +12,15 @@
 	"FastNoiseLite.h"
 	<random>
 
-1667140765 c:\development\xtreemminer\include\noderenderer.h
+1667158420 c:\development\xtreemminer\include\noderenderer.h
 	"Base.h"
 	"MapBlock.h"
 	<GL/glut.h>
 
-1667141085 c:\development\xtreemminer\include\mapblock.h
+1667156676 c:\development\xtreemminer\include\mapblock.h
 	"Base.h"
 	<math.h>
+	<cstdio>
 
 1667069440 c:\development\xtreemminer\include\base.h
 
@@ -27,7 +28,7 @@
 	"MapBlock.h"
 	"Base.h"
 
-1667096344 c:\development\xtreemminer\include\texturehandler.h
+1667148859 c:\development\xtreemminer\include\texturehandler.h
 	"stb_image.h"
 	"Base.h"
 

include/MapBlock.h

@@ -2,6 +2,7 @@
 #define MAPBLOCK_H
 #include "Base.h"
 #include <math.h>
+#include <cstdio>
 
 
 
@@ -10,8 +11,7 @@
 class MapBlock
 {
     public:
-        int blockX;
+        int mapBlock[65536];
-        int blockZ;
 
         MapBlock()
         {
@@ -19,39 +19,16 @@ class MapBlock
 
         }
 
+        int getNodeAt(int x, int y, int z) // Deprecated; only used internally.
+        {
+            return x < 16 && z < 16 && x >= 0 && z >= 0 ? mapBlock[256 * y + z * 16 + x] : 0;
+        }
 
         void addNode(int id, int meta, int x, int y, int z)
         {
             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 +47,45 @@ 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)
+            //{
+            if(x < 0 || z < 0)
+            {
+                return 0;
+            }
+
+            Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
+            //printf("\n\nold x: %i, old z: %i", x, z);
+            //int localX = x - block.x * 16;
+            //int localZ = z - block.z * 16;
+            //printf("\nnew x: %i, new z: %i", x, z);
+            //return mapBlocks[block.x][block.z].mapBlock[256 * y + localZ * 16 + localX];
+            return mapBlocks[block.x][block.z].getNodeAt(x, y, z);
+        }
+
+        bool isAir(int x, int y, int z)
+        {
+           return getNodeAt(x, y, z) == 0;
+        }
+
+    private:
 
 };
 
+
+
 #endif

include/NodeRenderer.h

@@ -25,7 +25,7 @@ class NodeRenderer
 
             glBegin(GL_QUADS);
                 // Front
-                if(blockManager.mapBlocks[block.x][block.z].isAir(x - block.x * 16, y, z - block.z * 16 - 1))
+                if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y, z - block.z * 16 - 1) == 0)
                 {
                     glTexCoord2f(.0F, .0F);
                     glVertex3f(x + .0F, y + 1.0F, z + .0F);
@@ -33,66 +33,72 @@ 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.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y, z - block.z * 16 + 1) == 0)
                 {
+
                     glTexCoord2f(.0F, .0F);
                     glVertex3f(x + .0F, y + 1.0F, z + 1.0F);
 
                     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.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16 + 1, y, z - block.z * 16) == 0);
                 {
                     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.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16 - 1, y, z - block.z * 16) == 0);
                 {
                     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) == 0);
                 {
                     glTexCoord2f(.0F, .0F);
                     glVertex3f(x + 1.0F, y + .0F, z + .0F);
@@ -108,7 +114,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.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y + 1, z - block.z * 16) == 0);
                 {
                     glTexCoord2f(.0F, .0F);
                     glVertex3f(x + 1.0F, y + 1.0F, z + .0F);
@@ -121,7 +127,7 @@ class NodeRenderer
 
                     glTexCoord2f(.0F, 1.0F);
                     glVertex3f(x + 1.0F, y + 1.0F, z + 1.0F);
-                }
+                }*/
 
             glEnd();
             return 1;

include/TextureHandler.h

@@ -52,13 +52,13 @@ class TextureHandler
 
         void getTextureForNode(int x, int y, int z)
         {
-            Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, 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)
+            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);
             }

main.cpp

@@ -43,19 +43,19 @@ void display()
     glBegin(GL_QUADS);
 
 
-        for(int x = 0; x < 128; x++)
+        for(int x = 0; x < 16; x++)
         {
-            for(int z = 0; z < 128; z++)
+            for(int y = 0; y < 64; y++)
             {
-                for(int y = 0; y < 64; y++)
+                for(int z = 0; z < 16; z++)
                 {
-                    Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
+
 
                     // Math explanation for future reference:
                     // The if statement below checks if the node at the coordinate is greater than 0 (0 = air), the x and z coordinates
                     // need to be have block.[AXIS] * 16 subtracted from them so that the coordinates passed to the function are local
                     // block coordinates instead of global node coordinates (e.g. 1, and not 17)
-                    if(blockManager.mapBlocks[block.x][block.z].getNodeAt(x - block.x * 16, y, z - block.z * 16) > 0)
+                    if(blockManager.getNodeAt(x, y, z) > 0)
                     {
                         textureHandler.getTextureForNode(x, y, z);
                         renderer.renderNode(x, y, z);
@@ -83,7 +83,7 @@ void reshape(int width, int height)
     glMatrixMode(GL_PROJECTION);
 
     glLoadIdentity();
-    gluPerspective(20, width / (float) height, 5, 512.0F);
+    gluPerspective(30, width / (float) height, 5, 512.0F);
     glViewport(0, 0, width, height);
 
     glMatrixMode(GL_MODELVIEW);
@@ -172,21 +172,30 @@ int	main(int argc, char **argv)
     glutInitWindowSize(800, 600);
     glutCreateWindow("XtreemNodes Engine - By MCL Software and Cube Software");
 
-    glClearColor(.2, .7, .8 , 255);
+    glClearColor(.4, .7, .8 , 255);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_TEXTURE_2D);
-    /*glEnable(GL_CULL_FACE);
+    //glEnable(GL_CULL_FACE);
-    glCullFace(GL_FRONT);
+    //glCullFace(GL_FRONT);
-    glFrontFace(GL_CCW);*/
+    //glFrontFace(GL_CCW);
 
     // Load textures
     textureHandler.loadAllTextures();
 
 
-    FastNoiseLite fnl;
+    FastNoiseLite perlin, os, cellular;
-    fnl.SetSeed(1337);
+    int seed = 138;
-    fnl.SetNoiseType(FastNoiseLite::NoiseType_OpenSimplex2);
+    perlin.SetSeed(seed);
-    fnl.SetFrequency(.01F);
+    perlin.SetNoiseType(FastNoiseLite::NoiseType_Perlin);
+    perlin.SetFrequency(.01F);
+
+    os.SetSeed(seed);
+    os.SetNoiseType(FastNoiseLite::NoiseType_OpenSimplex2);
+    os.SetFrequency(.01F);
+
+    cellular.SetSeed(seed);
+    cellular.SetNoiseType(FastNoiseLite::NoiseType_Cellular);
+    cellular.SetFrequency(.1F);
 
     for(int bx = 0; bx < 16; bx++)
     {
@@ -196,7 +205,9 @@ int	main(int argc, char **argv)
             {
                 for(int z = 0; z < 16; z++)
                 {
-                    for(int y = 0; y < 48 * abs(fnl.GetNoise((float)x + (16 * bx), (float)z + (16 * bz))) + 2; y++)
+                    float cX = (float)x + (16 * bx);
+                    float cZ = (float)z + (16 * bz);
+                    for(int y = 0; y < 48 * abs(perlin.GetNoise(cX, cZ)) + (cellular.GetNoise(cX, cZ)) + 3; y++)
                     {
                         blockManager.mapBlocks[bx][bz].addNode(y > 30 ? 1 : 2, 0, x, y, z);
                     }
@@ -209,20 +220,20 @@ int	main(int argc, char **argv)
 
 
 /*
-    for(int x = 0; x < 32; x++)
+    for(int y = 0; y < 16; y++)
     {
-        for(int z = 0; z < 16; z++)
+        for(int x = 0; x < 16; x++)
         {
-            for(int y = 0; y < 16; y++)
+            for(int z = 0; z < 16; z++)
             {
                 Position2D block = BlockUtilities::getBlockFromNodeCoordinates(x, z);
-                printf("x - (blockX * 16): %i | X: %i, Y: %i, Z: %i, blockX: %i, blockZ: %i nodeAt: %i\n", x - (block.x * 16), x, y, z, block.x, block.z, blockManager.mapBlocks[block.x][block.z].getNodeAt(x - (block.x * 16), y, z));
+                printf("\n|x: %i |y: %i | z: %i | id: %i", x, y, z, blockManager.getNodeAt(x, y, z));
 
             }
         }
     }
-*/
 
+*/