X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=6eb027a58f233173dc1026de7da64e4931ad7f59;hb=1e93bfb5089737f6b6d8fdd2f17260944fca44b2;hp=cc305cd56a4b293f8aa1df121e797033f6e261b0;hpb=3b2fe22c33074664b0c4f24be374e4e6c1c0ed2f;p=blank.git diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp index cc305cd..6eb027a 100644 --- a/src/world/chunk.cpp +++ b/src/world/chunk.cpp @@ -19,6 +19,9 @@ #include #include +#include +#include + namespace blank { @@ -29,6 +32,7 @@ constexpr int Chunk::size; Chunk::Chunk(const BlockTypeRegistry &types) noexcept : types(&types) , neighbor{0} +, gravity() , blocks{} , light{0} , generated(false) @@ -42,6 +46,7 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept Chunk::Chunk(Chunk &&other) noexcept : types(other.types) +, gravity(std::move(other.gravity)) , generated(other.generated) , lighted(other.lighted) , position(other.position) @@ -57,6 +62,7 @@ Chunk::Chunk(Chunk &&other) noexcept Chunk &Chunk::operator =(Chunk &&other) noexcept { types = other.types; std::copy(other.neighbor, other.neighbor + sizeof(neighbor), neighbor); + gravity = std::move(other.gravity); std::copy(other.blocks, other.blocks + sizeof(blocks), blocks); std::copy(other.light, other.light + sizeof(light), light); generated = other.generated; @@ -84,6 +90,9 @@ struct SetNode { const BlockType &GetType() const noexcept { return chunk->Type(Chunk::ToIndex(pos)); } + int EmitLevel() const noexcept { return GetType().luminosity; } + bool EmitsLight() const noexcept { return EmitLevel() > 0; } + bool HasNext(Block::Face face) noexcept { const BlockType &type = GetType(); if (type.block_light && !type.luminosity) return false; @@ -146,9 +155,13 @@ void work_dark() noexcept { for (int face = 0; face < Block::FACE_COUNT; ++face) { if (node.HasNext(Block::Face(face))) { UnsetNode other = node.GetNext(Block::Face(face)); - // TODO: if there a light source here with the same level this will err if (other.Get() != 0 && other.Get() < node.level) { - other.Set(0); + if (other.EmitsLight()) { + other.Set(other.EmitLevel()); + light_queue.emplace(other); + } else { + other.Set(0); + } dark_queue.emplace(other); } else { light_queue.emplace(other); @@ -167,6 +180,12 @@ void Chunk::SetBlock(int index, const Block &block) noexcept { blocks[index] = block; Invalidate(); + if (old_type.gravity && !new_type.gravity) { + gravity.erase(index); + } else if (new_type.gravity && !old_type.gravity) { + gravity.insert(index); + } + if (!lighted || &old_type == &new_type) return; if (new_type.luminosity > old_type.luminosity) { @@ -226,6 +245,15 @@ void Chunk::ScanLights() { lighted = true; } +void Chunk::ScanActive() { + gravity.clear(); + for (int index = 0; index < size; ++index) { + if (Type(index).gravity) { + gravity.insert(gravity.end(), index); + } + } +} + void Chunk::SetNeighbor(Block::Face face, Chunk &other) noexcept { neighbor[face] = &other; other.neighbor[Block::Opposite(face)] = this; @@ -342,6 +370,20 @@ float Chunk::GetVertexLight(const RoughLocation::Fine &pos, const BlockMesh::Pos } +glm::vec3 Chunk::GravityAt(const ExactLocation &coords) const noexcept { + glm::vec3 grav(0.0f); + for (int index : gravity) { + RoughLocation::Fine block_pos(ToPos(index)); + ExactLocation block_coords(position, ToCoords(block_pos)); + // trust that block type hasn't changed + grav += Type(index).gravity->GetGravity( + coords.Difference(block_coords).Absolute(), + ToTransform(block_pos, index)); + } + return grav; +} + + bool Chunk::IsSurface(const RoughLocation::Fine &pos) const noexcept { const Block &block = BlockAt(pos); if (!Type(block).visible) { @@ -359,7 +401,7 @@ bool Chunk::IsSurface(const RoughLocation::Fine &pos) const noexcept { bool Chunk::Intersection( const Ray &ray, - const glm::mat4 &M, + const ExactLocation::Coarse &reference, WorldCollision &coll ) noexcept { int idx = 0; @@ -375,7 +417,7 @@ bool Chunk::Intersection( } float cur_dist; glm::vec3 cur_norm; - if (type.shape->Intersects(ray, M * ToTransform(RoughLocation::Fine(x, y, z), idx), cur_dist, cur_norm)) { + if (type.shape->Intersects(ray, ToTransform(reference, RoughLocation::Fine(x, y, z), idx), cur_dist, cur_norm)) { if (cur_dist < coll.depth) { coll.block = idx; coll.depth = cur_dist; @@ -453,7 +495,7 @@ bool Chunk::Intersection( const glm::vec3 entity_coords(Mentity[3] - Mchunk[3]); const float ec_radius = entity.Radius() + Radius(); - if (distance_squared(entity_coords, Center()) > ec_radius * ec_radius) { + if (distance2(entity_coords, Center()) > ec_radius * ec_radius) { return false; } @@ -560,6 +602,10 @@ glm::mat4 Chunk::ToTransform(const RoughLocation::Fine &pos, int idx) const noex return glm::translate(ToCoords(pos)) * BlockAt(idx).Transform(); } +glm::mat4 Chunk::ToTransform(const ExactLocation::Coarse &ref, const RoughLocation::Fine &pos, int idx) const noexcept { + return glm::translate(ExactLocation::Fine((position - ref) * ExactLocation::Extent()) + ToCoords(pos)) * BlockAt(idx).Transform(); +} + BlockLookup::BlockLookup(Chunk *c, const RoughLocation::Fine &p) noexcept : chunk(c), pos(p) { @@ -766,18 +812,36 @@ void ChunkRenderer::Render(Viewport &viewport) { chunk_prog.SetTexture(block_tex); chunk_prog.SetFogDensity(fog_density); + Frustum frustum(transpose(chunk_prog.GetVP())); + AABB box; + + //std::cout << "V = " << chunk_prog.View() << std::endl; + //std::cout << "P = " << chunk_prog.Projection() << std::endl; + //std::cout << "VP = " << chunk_prog.GetVP() << std::endl; + //std::cout << "frustum = " << frustum << std::endl; + for (int i = 0; i < index.TotalChunks(); ++i) { if (!index[i]) continue; - glm::mat4 m(index[i]->Transform(index.Base())); - glm::mat4 mvp(chunk_prog.GetVP() * m); - if (!CullTest(Chunk::Bounds(), mvp)) { + box.min = (index[i]->Position() - index.Base()) * ExactLocation::Extent(); + box.max = box.min + ExactLocation::FExtent(); + + if (!CullTest(box, frustum)) { + + //glm::mat4 m(index[i]->Transform(index.Base())); + //if (CullTest(Chunk::Bounds(), chunk_prog.GetVP() * m)) { + // std::cout << "M = " << m << std::endl; + // std::cout << "box = " << box.min << ", " << box.max << std::endl; + // std::cout << "should've been culled" << std::endl; + //} + if (index[i]->ShouldUpdateMesh()) { index[i]->Update(models[i]); } - chunk_prog.SetM(m); + chunk_prog.SetM(index[i]->Transform(index.Base())); models[i].Draw(); } } + //std::cout << std::endl; } @@ -1031,7 +1095,7 @@ ChunkIndex *ChunkStore::ClosestIndex(const ExactLocation::Coarse &pos) { return closest_index; } -Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) { +Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) noexcept { for (ChunkIndex &index : indices) { Chunk *chunk = index.Get(pos); if (chunk) { @@ -1041,6 +1105,16 @@ Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) { return nullptr; } +const Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) const noexcept { + for (const ChunkIndex &index : indices) { + const Chunk *chunk = index.Get(pos); + if (chunk) { + return chunk; + } + } + return nullptr; +} + Chunk *ChunkStore::Allocate(const ExactLocation::Coarse &pos) { Chunk *chunk = Get(pos); if (chunk) {