From 0525ada84cc1e6dbd8fb21a754746453385abab9 Mon Sep 17 00:00:00 2001 From: Hopson97 Date: Wed, 13 Sep 2017 12:42:04 +0100 Subject: [PATCH] merge --- Res/Textures/DefaultPack.png | Bin 10062 -> 9780 bytes Shaders/SkyboxFragment.glsl | 6 +++--- Source/World/Chunk/ChunkMeshBuilder.cpp | 6 +++--- Source/World/Chunk/ChunkMeshBuilder.h | 1 + config.txt | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Res/Textures/DefaultPack.png b/Res/Textures/DefaultPack.png index e65318c98fb1cdd1d5f21375f710c13e1e6cac5f..af1a2776771d8bad7f9c1edb5dd8cb99911d9796 100644 GIT binary patch literal 9780 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 + 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