diff --git a/Res/Textures/DefaultPack.png b/Res/Textures/DefaultPack.png index e65318c9..af1a2776 100644 Binary files a/Res/Textures/DefaultPack.png and b/Res/Textures/DefaultPack.png differ diff --git a/Shaders/SkyboxFragment.glsl b/Shaders/SkyboxFragment.glsl index 06e60381..d27d8593 100644 --- a/Shaders/SkyboxFragment.glsl +++ b/Shaders/SkyboxFragment.glsl @@ -19,9 +19,9 @@ vec3 gamma(vec3 value, float param) void main() { - color = texture(texSampler, passTextureCoord); - color = vec4(brightnessContrast(color.xyz, 1.15f, 1.1f), color.w); - color = vec4(gamma(color.xyz, 3.3f),color.w); + color = texture(texSampler, passTextureCoord); + //color = vec4(brightnessContrast(color.xyz, 1.15f, 1.1f), color.w); + //color = vec4(gamma(color.xyz, 3.3f),color.w); outColour = color; if (outColour.a == 0) discard; diff --git a/Source/World/Chunk/ChunkMeshBuilder.cpp b/Source/World/Chunk/ChunkMeshBuilder.cpp index cbc03db1..a57dd186 100644 --- a/Source/World/Chunk/ChunkMeshBuilder.cpp +++ b/Source/World/Chunk/ChunkMeshBuilder.cpp @@ -112,7 +112,7 @@ int faces; void ChunkMeshBuilder::buildMesh() { AdjacentBlockPositions directions; - const ChunkBlock* blockPointer = m_pChunk->begin(); + m_pBlockPtr = m_pChunk->begin(); faces = 0; for (int8_t y = 0; y < CHUNK_SIZE; ++y) { @@ -125,8 +125,8 @@ void ChunkMeshBuilder::buildMesh() for (int8_t z = 0; z < CHUNK_SIZE; ++z) for (int8_t x = 0; x < CHUNK_SIZE; ++x) { - ChunkBlock block = *blockPointer; - blockPointer++; + ChunkBlock block = *m_pBlockPtr; + m_pBlockPtr++; sf::Vector3i position(x, y, z); setActiveMesh(block); diff --git a/Source/World/Chunk/ChunkMeshBuilder.h b/Source/World/Chunk/ChunkMeshBuilder.h index bf6042f9..052742a8 100644 --- a/Source/World/Chunk/ChunkMeshBuilder.h +++ b/Source/World/Chunk/ChunkMeshBuilder.h @@ -38,6 +38,7 @@ class ChunkMeshBuilder bool shouldMakeLayer(int y); + const ChunkBlock* m_pBlockPtr = nullptr; ChunkSection* m_pChunk = nullptr; ChunkMeshCollection* m_pMeshes = nullptr; ChunkMesh* m_pActiveMesh = nullptr; diff --git a/config.txt b/config.txt index 1f8cb7a8..312033a6 100644 --- a/config.txt +++ b/config.txt @@ -1,4 +1,4 @@ -renderdistance 8 +renderdistance 16 fullscreen 1 windowsize 1280 720 fov 100