X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.cpp;h=756c66fdff87718ff724ee0263006eac7b4b9f4a;hb=e52e3c500b679ab7bae9cfdda3fb0d630a2584ad;hp=c24450cdb154e93d460cb4405146f8d3d8d08096;hpb=5700ea3c08ea5e4a5c743f0413b65dc8eebfd220;p=blank.git diff --git a/src/world.cpp b/src/world.cpp index c24450c..756c66f 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -6,233 +6,125 @@ namespace blank { -const BlockType BlockType::DEFAULT; - -void BlockType::FillVBO( - const glm::vec3 &pos, - std::vector &vertices, - std::vector &colors, - std::vector &normals -) const { - vertices.emplace_back(pos.x , pos.y , pos.z + 1); // front - vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1); - vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x , pos.y , pos.z ); // back - vertices.emplace_back(pos.x , pos.y + 1, pos.z ); - vertices.emplace_back(pos.x + 1, pos.y , pos.z ); - vertices.emplace_back(pos.x + 1, pos.y , pos.z ); - vertices.emplace_back(pos.x , pos.y + 1, pos.z ); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z ); - vertices.emplace_back(pos.x , pos.y + 1, pos.z ); // top - vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z ); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z ); - vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x , pos.y , pos.z ); // bottom - vertices.emplace_back(pos.x + 1, pos.y , pos.z ); - vertices.emplace_back(pos.x , pos.y , pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y , pos.z ); - vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1); - vertices.emplace_back(pos.x , pos.y , pos.z + 1); - vertices.emplace_back(pos.x , pos.y , pos.z ); // left - vertices.emplace_back(pos.x , pos.y , pos.z + 1); - vertices.emplace_back(pos.x , pos.y + 1, pos.z ); - vertices.emplace_back(pos.x , pos.y + 1, pos.z ); - vertices.emplace_back(pos.x , pos.y , pos.z + 1); - vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y , pos.z ); // right - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z ); - vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z ); - vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1); - - colors.insert(colors.end(), 6 * 6, color); - - normals.insert(normals.end(), 6, glm::vec3( 0.0f, 0.0f, 1.0f)); // front - normals.insert(normals.end(), 6, glm::vec3( 0.0f, 0.0f, -1.0f)); // back - normals.insert(normals.end(), 6, glm::vec3( 0.0f, 1.0f, 0.0f)); // top - normals.insert(normals.end(), 6, glm::vec3( 0.0f, -1.0f, 0.0f)); // bottom - normals.insert(normals.end(), 6, glm::vec3(-1.0f, 0.0f, 0.0f)); // left - normals.insert(normals.end(), 6, glm::vec3( 1.0f, 0.0f, 0.0f)); // right -} - - -BlockTypeRegistry::BlockTypeRegistry() { - Add(BlockType::DEFAULT); -} - -int BlockTypeRegistry::Add(const BlockType &t) { - int id = types.size(); - types.push_back(t); - types.back().id = id; - return id; -} - - -Chunk::Chunk() -: blocks(Size()) -, model() -, transform(1.0f) -, dirty(false) { - -} - -Chunk::Chunk(Chunk &&other) -: blocks(std::move(other.blocks)) -, model(std::move(other.model)) -, transform(other.transform) -, dirty(other.dirty) { - -} - -Chunk &Chunk::operator =(Chunk &&other) { - blocks = std::move(other.blocks); - model = std::move(other.model); - transform = other.transform; - dirty = other.dirty; - return *this; -} - - -void Chunk::Draw() { - if (dirty) { - Update(); +World::World(const Config &config) +: blockType() +, 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 }}) +, generate(config.gen) +, chunks(config.load, blockType, generate) +, player() +, entities() +, light_direction(config.light_direction) +, fog_density(config.fog_density) { + BlockType::Faces block_fill = { true, true, true, true, true, true }; + BlockType::Faces slab_fill = { false, true, false, false, false, false }; + BlockType::Faces stair_fill = { false, true, false, false, false, true }; + + { // white block + BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape); + type.block_light = true; + type.fill = block_fill; + blockType.Add(type); } - model.Draw(); -} - - -bool Chunk::Intersection( - const Ray &ray, - const glm::mat4 &M, - int *blkid, - float *dist, - glm::vec3 *normal) const { - { // rough check - const AABB bb{{0, 0, 0}, {Width(), Height(), Depth()}}; - if (!blank::Intersection(ray, bb, M)) { - return false; - } + { // white slab + BlockType type(true, { 1.0f, 1.0f, 1.0f }, &slabShape); + type.block_light = true; + type.fill = slab_fill; + blockType.Add(type); } - - if (!blkid && !dist && !normal) { - return true; + { // white stair + BlockType type(true, { 1.0f, 1.0f, 1.0f }, &stairShape); + type.block_light = true; + type.fill = stair_fill; + blockType.Add(type); } - // TODO: should be possible to heavily optimize this - int id = 0; - int closest_id = -1; - float closest_dist = std::numeric_limits::infinity(); - glm::vec3 closest_normal(0, 1, 0); - for (int z = 0; z < Depth(); ++z) { - for (int y = 0; y < Height(); ++y) { - for (int x = 0; x < Width(); ++x, ++id) { - if (!blocks[id].type->visible) { - continue; - } - const AABB bb{{x, y, z}, {x+1, y+1, z+1}}; - float cur_dist; - glm::vec3 cur_norm; - if (blank::Intersection(ray, bb, M, &cur_dist, &cur_norm)) { - if (cur_dist < closest_dist) { - closest_id = id; - closest_dist = cur_dist; - closest_normal = cur_norm; - } - } - } - } + { // red block + BlockType type(true, { 1.0f, 0.0f, 0.0f }, &blockShape); + type.block_light = true; + type.fill = block_fill; + blockType.Add(type); } - - if (closest_id < 0) { - return false; + { // red slab + BlockType type(true, { 1.0f, 0.0f, 0.0f }, &slabShape); + type.block_light = true; + type.fill = slab_fill; + blockType.Add(type); + } + { // red stair + BlockType type(true, { 1.0f, 0.0f, 0.0f }, &stairShape); + type.block_light = true; + type.fill = stair_fill; + blockType.Add(type); } - if (blkid) { - *blkid = closest_id; + { // green block + BlockType type(true, { 0.0f, 1.0f, 0.0f }, &blockShape); + type.block_light = true; + type.fill = block_fill; + blockType.Add(type); } - if (dist) { - *dist = closest_dist; + { // green slab + BlockType type(true, { 0.0f, 1.0f, 0.0f }, &slabShape); + type.block_light = true; + type.fill = slab_fill; + blockType.Add(type); } - if (normal) { - *normal = closest_normal; + { // green stair + BlockType type(true, { 0.0f, 1.0f, 0.0f }, &stairShape); + type.block_light = true; + type.fill = stair_fill; + blockType.Add(type); } - return true; -} - -void Chunk::Position(const glm::vec3 &pos) { - position = pos; - transform = glm::translate(pos * Extent()); -} + { // blue block + BlockType type(true, { 0.0f, 0.0f, 1.0f }, &blockShape); + type.block_light = true; + type.fill = block_fill; + blockType.Add(type); + } + { // blue slab + BlockType type(true, { 0.0f, 0.0f, 1.0f }, &slabShape); + type.block_light = true; + type.fill = slab_fill; + blockType.Add(type); + } + { // blue stair + BlockType type(true, { 0.0f, 0.0f, 1.0f }, &stairShape); + type.block_light = true; + type.fill = stair_fill; + blockType.Add(type); + } -int Chunk::VertexCount() const { - // TODO: query blocks as soon as type shapes are implemented - return Size() * 6 * 6; -} + { // glowing yellow block + BlockType type(true, { 1.0f, 1.0f, 0.0f }, &blockShape); + type.luminosity = 10; + type.block_light = true; + type.fill = block_fill; + blockType.Add(type); + } -void Chunk::Update() { - model.Clear(); - model.Reserve(VertexCount()); + generate.Space(0); + generate.Light(13); + generate.Solids({ 1, 4, 7, 10 }); - for (int i = 0; i < Size(); ++i) { - if (blocks[i].type->visible) { - blocks[i].type->FillModel(ToCoords(i), model); - } - } + player = &AddEntity(); + player->Position(config.spawn); - model.Invalidate(); - dirty = false; + chunks.GenerateSurrounding(player->ChunkCoords()); } -World::World() -: blockType() -, chunks() { - blockType.Add(BlockType(true, glm::vec3(1, 1, 1))); - blockType.Add(BlockType(true, glm::vec3(1, 0, 0))); - blockType.Add(BlockType(true, glm::vec3(0, 1, 0))); - blockType.Add(BlockType(true, glm::vec3(0, 0, 1))); -} +namespace { +struct Candidate { + Chunk *chunk; + float dist; +}; -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)); - } - } - } -} +std::vector candidates; -Chunk &World::Generate(const glm::vec3 &pos) { - chunks.emplace_back(); - Chunk &chunk = chunks.back(); - chunk.Position(pos); - 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[2]); - 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[3]); - 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[3]); - chunk.BlockAt(glm::vec3(1, 1, 0)) = Block(blockType[1]); - 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]); - chunk.Invalidate(); - return chunk; } bool World::Intersection( @@ -242,18 +134,30 @@ bool World::Intersection( int *blkid, float *dist, glm::vec3 *normal) { + candidates.clear(); + + for (Chunk &cur_chunk : chunks.Loaded()) { + float cur_dist; + if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player->ChunkCoords()), cur_dist)) { + candidates.push_back({ &cur_chunk, cur_dist }); + } + } + + if (candidates.empty()) return false; + Chunk *closest_chunk = nullptr; - int closest_blkid = -1; float closest_dist = std::numeric_limits::infinity(); + int closest_blkid = -1; glm::vec3 closest_normal; - for (Chunk &cur_chunk : chunks) { + for (Candidate &cand : candidates) { + if (cand.dist > closest_dist) continue; int cur_blkid; float cur_dist; glm::vec3 cur_normal; - if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(), &cur_blkid, &cur_dist, &cur_normal)) { + if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(player->ChunkCoords()), cur_blkid, cur_dist, cur_normal)) { if (cur_dist < closest_dist) { - closest_chunk = &cur_chunk; + closest_chunk = cand.chunk; closest_blkid = cur_blkid; closest_dist = cur_dist; closest_normal = cur_normal; @@ -277,14 +181,45 @@ 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) { - if (chunk.Position() == tgt_pos) { - return chunk; +Chunk &World::PlayerChunk() { + return chunks.ForceLoad(player->ChunkCoords()); +} + +Chunk &World::Next(const Chunk &to, const glm::tvec3 &dir) { + const Chunk::Pos tgt_pos = to.Position() + dir; + return chunks.ForceLoad(tgt_pos); +} + + +void World::Update(int dt) { + for (Entity &entity : entities) { + entity.Update(dt); + } + chunks.Rebase(player->ChunkCoords()); + chunks.Update(); +} + + +void World::Render(DirectionalLighting &program) { + program.SetLightDirection(light_direction); + program.SetFogDensity(fog_density); + program.SetView(glm::inverse(player->Transform(player->ChunkCoords()))); + + for (Chunk &chunk : chunks.Loaded()) { + glm::mat4 m(chunk.Transform(player->ChunkCoords())); + program.SetM(m); + glm::mat4 mvp(program.GetVP() * m); + if (!CullTest(Chunk::Bounds(), mvp)) { + chunk.Draw(); + } + } + + for (Entity &entity : entities) { + if (entity.HasShape()) { + program.SetM(entity.Transform(player->ChunkCoords())); + entity.Draw(); } } - return Generate(tgt_pos); } }