diff --git a/data/game-models b/data/game-models index b7a3369..40364e6 160000 --- a/data/game-models +++ b/data/game-models @@ -1 +1 @@ -Subproject commit b7a336975402dde6692fcc9d8c986136d1c724f6 +Subproject commit 40364e65f0acfcd74effad083c94a179f765678a diff --git a/src/MarchingCubeChunkRenderer.cpp b/src/MarchingCubeChunkRenderer.cpp index 27c94e1..82716f5 100644 --- a/src/MarchingCubeChunkRenderer.cpp +++ b/src/MarchingCubeChunkRenderer.cpp @@ -15,7 +15,7 @@ void MarchingCubeChunkRenderer::draw(ShaderLoader &shader) { for (int x = ti.xRange[0]; x < ti.xRange[1]; x++) { for (int y = ti.yRange[0]; y < ti.yRange[1]; y++) { for (int z = ti.zRange[0]; z < ti.zRange[1]; z++) { - if (chunk->getNoise(x, y, z) > 0) { + if (chunk->getNoise(x, y, z) > 0.5) { models.at(0)->setPosition(glm::vec3(x, y, z)); models.at(0)->draw(shader); } diff --git a/src/Terrain.cpp b/src/Terrain.cpp index 161a082..a0795df 100644 --- a/src/Terrain.cpp +++ b/src/Terrain.cpp @@ -15,8 +15,8 @@ Terrain::Terrain() : renderer(nullptr) { chunks.push_back(Chunk(fnGenerator, ti)); // Create chunks renderer. - models = {new Model( - ROOT_DIR "data/models/wooden_boxbarrel/wooden_box_and_barrel.obj")}; + models = {new Model(ROOT_DIR "data/game-models/12/MetalFloor.obj")}; + models.at(0)->resize(glm::vec3(0.1f, 0.1f, 0.1f)); renderer = new MarchingCubeChunkRenderer(this->chunks, models); }