From 394387780fe99308c22f9cce66d73a3b74a0f1ae Mon Sep 17 00:00:00 2001 From: Pierre Surer Date: Fri, 11 Jun 2021 23:39:38 +0200 Subject: [PATCH] removed plateform generation --- OpenGL/OpenGL/src/Application.cpp | 2 +- OpenGL/OpenGL/src/terrain/Generator.cpp | 2 +- OpenGL/OpenGL/src/terrain/Generator.hpp | 2 +- OpenGL/OpenGL/src/terrain/Structure.cpp | 8 ++++---- OpenGL/OpenGL/src/terrain/Structure.hpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenGL/OpenGL/src/Application.cpp b/OpenGL/OpenGL/src/Application.cpp index 537d11d0..0fe64bd6 100644 --- a/OpenGL/OpenGL/src/Application.cpp +++ b/OpenGL/OpenGL/src/Application.cpp @@ -121,7 +121,7 @@ int main(int argc, char* argv[]) { text_posPlayer.setText(text.str()); text.str(""); // "clears" the string stream - text << "GameTime : " << std::fixed << std::setprecision(3) << t; + text << "Game Time : " << std::fixed << std::setprecision(3) << t; text_gameTime.setText(text.str()); } diff --git a/OpenGL/OpenGL/src/terrain/Generator.cpp b/OpenGL/OpenGL/src/terrain/Generator.cpp index c90614b5..21d362ba 100644 --- a/OpenGL/OpenGL/src/terrain/Generator.cpp +++ b/OpenGL/OpenGL/src/terrain/Generator.cpp @@ -113,7 +113,7 @@ std::vector Generator::generateStructures(ivec3 cpos, Chunk& c if (chunk[dpos]->type == BlockType::Snow && biome.type == BiomeType::TOUNDRA) { ivec3 pos = orig + dpos; float editPlateforme = valueNoise.sample1D(ivec2(pos.x, pos.z)) / (float)UINT32_MAX; - if (editPlateforme < 0.0001f) { + if (editPlateforme < 0.0000f) { auto editPlateformeSlice = defaultEditPlaterforme.spawn(chunk, dpos); slices.insert(slices.end(), editPlateformeSlice.begin(), editPlateformeSlice.end()); } diff --git a/OpenGL/OpenGL/src/terrain/Generator.hpp b/OpenGL/OpenGL/src/terrain/Generator.hpp index 1a650ade..b3dd9942 100644 --- a/OpenGL/OpenGL/src/terrain/Generator.hpp +++ b/OpenGL/OpenGL/src/terrain/Generator.hpp @@ -41,7 +41,7 @@ class Generator { Oak_Tree defaultOakTree; Birch_Tree defaultBirchTree; Cactus defaultCactus; - EditPlaterforme defaultEditPlaterforme; + EditPlateforme defaultEditPlaterforme; public: BiomeMap biomeSampler; }; diff --git a/OpenGL/OpenGL/src/terrain/Structure.cpp b/OpenGL/OpenGL/src/terrain/Structure.cpp index ec7711b2..b01f1237 100644 --- a/OpenGL/OpenGL/src/terrain/Structure.cpp +++ b/OpenGL/OpenGL/src/terrain/Structure.cpp @@ -168,7 +168,7 @@ std::vector Birch_Tree::spawn(Chunk& chunk, ivec3 pos) const } -EditPlaterforme::EditPlaterforme() +EditPlateforme::EditPlateforme() : store(std::make_shared(ivec3(33, 2, 33))) { ivec3 pos = ivec3(0,0,0); @@ -193,14 +193,14 @@ EditPlaterforme::EditPlaterforme() } -std::vector EditPlaterforme::spawn(Chunk& chunk, ivec3 pos) const { - std::vector slices; +std::vector EditPlateforme::spawn(Chunk& chunk, ivec3 pos) const { + std::vector slices; ivec3 origin(0, -1, 0); // the tree is generated centered on the trunk, one block above ivec3 start = pos - origin; auto genSlice = [&](ivec3 chunkOffset) { ivec3 sliceStart = start - chunk.size * chunkOffset; // position of the structure's min corner in this chunk space - slices.emplace_back(EditPlaterforme::Slice{ + slices.emplace_back(EditPlateforme::Slice{ store, chunk.chunkPos + chunkOffset, max(sliceStart, ivec3(0)) - sliceStart, diff --git a/OpenGL/OpenGL/src/terrain/Structure.hpp b/OpenGL/OpenGL/src/terrain/Structure.hpp index f33b663f..50e798d3 100644 --- a/OpenGL/OpenGL/src/terrain/Structure.hpp +++ b/OpenGL/OpenGL/src/terrain/Structure.hpp @@ -62,10 +62,10 @@ class Cactus : public Structure { std::shared_ptr store; }; -class EditPlaterforme : public Structure { +class EditPlateforme : public Structure { public: - EditPlaterforme(); + EditPlateforme(); slices_t spawn(Chunk& chunk, glm::ivec3 pos) const override; std::shared_ptr store; };