X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.cpp;h=cca483d3c3ffaa8ce1f46fa3b67f02a837bb464d;hb=bea14b67ae4e5705965f3cc6422410a25f38ef9e;hp=aea6ec2ec8724b0de2dd5b56d8f58453c7769709;hpb=5588a6a9b1e2fb6fee8f1166f855ef497e551a09;p=blank.git diff --git a/src/world.cpp b/src/world.cpp index aea6ec2..cca483d 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -104,7 +104,8 @@ bool Chunk::Intersection( } float cur_dist; glm::vec3 cur_norm; - if (blocks[id].type->shape->Intersects(ray, glm::translate(M, glm::vec3(x, y, z)), cur_dist, cur_norm)) { + glm::vec3 pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f); + if (blocks[id].type->shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) { if (cur_dist < closest_dist) { closest_id = id; closest_dist = cur_dist; @@ -160,10 +161,13 @@ void Chunk::Update() { World::World() : blockType() -, blockShape({{ 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }}) -, stairShape({{ 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }}, { 0.5f, 0.5f }) -, slabShape({{ 0.0f, 0.0f, 0.0f }, { 1.0f, 0.5f, 1.0f }}) -, chunks() { +, blockShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}) +, stairShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f }) +, slabShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}) +, blockNoise(0) +, colorNoise(1) +, loaded() +, to_generate() { blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &blockShape }); // white block blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &stairShape }); // white stair blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &slabShape }); // white slab @@ -176,48 +180,62 @@ World::World() blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &blockShape }); // blue block blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &stairShape }); // blue stair blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &slabShape }); // blue slab + + player.Position({ 4.0f, 4.0f, 4.0f }); } -void World::Generate() { - for (int z = -1; z < 2; ++z) { - for (int y = -1; y < 2; ++y) { - for (int x = -1; x < 2; ++x) { - Generate(glm::vec3(x, y, z)); +namespace { + +bool ChunkLess(const Chunk &a, const Chunk &b) { + return dot(a.Position(), a.Position()) < dot(b.Position(), b.Position()); +} + +} + +void World::Generate(const glm::tvec3 &from, const glm::tvec3 &to) { + for (int z = from.z; z < to.z; ++z) { + for (int y = from.y; y < to.y; ++y) { + for (int x = from.x; x < to.x; ++x) { + glm::vec3 pos{float(x), float(y), float(z)}; + if (x == 0 && y == 0 && z == 0) { + loaded.emplace_back(); + loaded.back().Position(pos); + Generate(loaded.back()); + } else { + to_generate.emplace_back(); + to_generate.back().Position(pos); + } } } } + to_generate.sort(ChunkLess); } -Chunk &World::Generate(const glm::vec3 &pos) { - chunks.emplace_back(); - Chunk &chunk = chunks.back(); - chunk.Position(pos); - for (size_t i = 1; i < blockType.Size(); ++i) { - chunk.BlockAt(i) = Block(blockType[i]); - chunk.BlockAt(i + 257) = Block(blockType[i]); - chunk.BlockAt(i + 514) = Block(blockType[i]); - } - if (false) { - chunk.BlockAt(glm::vec3(0, 0, 0)) = Block(blockType[4]); - chunk.BlockAt(glm::vec3(0, 0, 1)) = Block(blockType[1]); - chunk.BlockAt(glm::vec3(1, 0, 0)) = Block(blockType[5]); - chunk.BlockAt(glm::vec3(1, 0, 1)) = Block(blockType[3]); - chunk.BlockAt(glm::vec3(2, 0, 0)) = Block(blockType[4]); - chunk.BlockAt(glm::vec3(2, 0, 1)) = Block(blockType[1]); - chunk.BlockAt(glm::vec3(3, 0, 0)) = Block(blockType[2]); - chunk.BlockAt(glm::vec3(3, 0, 1)) = Block(blockType[5]); - chunk.BlockAt(glm::vec3(2, 0, 2)) = Block(blockType[4]); - chunk.BlockAt(glm::vec3(2, 0, 3)) = Block(blockType[1]); - chunk.BlockAt(glm::vec3(3, 0, 2)) = Block(blockType[2]); - chunk.BlockAt(glm::vec3(3, 0, 3)) = Block(blockType[5]); - chunk.BlockAt(glm::vec3(1, 1, 0)) = Block(blockType[5]); - chunk.BlockAt(glm::vec3(1, 1, 1)) = Block(blockType[4]); - chunk.BlockAt(glm::vec3(2, 1, 1)) = Block(blockType[3]); - chunk.BlockAt(glm::vec3(2, 2, 1)) = Block(blockType[2]); +void World::Generate(Chunk &chunk) { + glm::vec3 pos(chunk.Position()); + if (pos.x == 0 && pos.y == 0 && pos.z == 0) { + for (size_t i = 1; i < blockType.Size(); ++i) { + chunk.BlockAt(i) = Block(blockType[i]); + chunk.BlockAt(i + 257) = Block(blockType[i]); + chunk.BlockAt(i + 514) = Block(blockType[i]); + } + } else { + for (int z = 0; z < Chunk::Depth(); ++z) { + for (int y = 0; y < Chunk::Height(); ++y) { + for (int x = 0; x < Chunk::Width(); ++x) { + glm::vec3 block_pos{float(x), float(y), float(z)}; + glm::vec3 gen_pos = (pos * Chunk::Extent() + block_pos) / 64.0f; + float val = blockNoise(gen_pos); + if (val > 0.8f) { + int col_val = int((colorNoise(gen_pos) + 1.0f) * 2.0f) % 4; + chunk.BlockAt(block_pos) = Block(blockType[col_val * 3 + 1]); + } + } + } + } } chunk.Invalidate(); - return chunk; } bool World::Intersection( @@ -232,7 +250,7 @@ bool World::Intersection( float closest_dist = std::numeric_limits::infinity(); glm::vec3 closest_normal; - for (Chunk &cur_chunk : chunks) { + for (Chunk &cur_chunk : loaded) { int cur_blkid; float cur_dist; glm::vec3 cur_normal; @@ -264,12 +282,42 @@ bool World::Intersection( Chunk &World::Next(const Chunk &to, const glm::vec3 &dir) { const glm::vec3 tgt_pos = to.Position() + dir; - for (Chunk &chunk : chunks) { + for (Chunk &chunk : LoadedChunks()) { if (chunk.Position() == tgt_pos) { return chunk; } } - return Generate(tgt_pos); + for (Chunk &chunk : to_generate) { + if (chunk.Position() == tgt_pos) { + Generate(chunk); + return chunk; + } + } + loaded.emplace_back(); + loaded.back().Position(tgt_pos); + Generate(loaded.back()); + return loaded.back(); +} + + +void World::Update(int dt) { + player.Update(dt); + + if (!to_generate.empty()) { + Generate(to_generate.front()); + loaded.splice(loaded.end(), to_generate, to_generate.begin()); + } +} + + +void World::Render(DirectionalLighting &program) { + program.SetLightDirection({ -1.0f, -3.0f, -2.0f }); + program.SetView(glm::inverse(player.Transform())); + + for (Chunk &chunk : LoadedChunks()) { + program.SetM(chunk.Transform()); + chunk.Draw(); + } } }