per block type "gravity"

[blank.git] / src / world / chunk.cpp

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index fb4375599226226d3e80ddcf670935a77d78e3d7..e93966e959ce13d4678dfaa3f5870ffcade50e17 100644 (file)
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -29,6 +29,7 @@ constexpr int Chunk::size;
 Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 : types(&types)
 , neighbor{0}
+, gravity()
 , blocks{}
 , light{0}
 , generated(false)
@@ -42,6 +43,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 +59,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;
@@ -174,6 +177,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) {
@@ -233,6 +242,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;
@@ -349,6 +367,20 @@ float Chunk::GetVertexLight(const RoughLocation::Fine &pos, const BlockMesh::Pos
 }
 
 
+glm::vec3 Chunk::GravityAt(const ExactLocation &coords) const noexcept {
+       glm::vec3 grav;
+       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) {
@@ -460,7 +492,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;
        }
 
@@ -779,6 +811,7 @@ void ChunkRenderer::Render(Viewport &viewport) {
 
        for (int i = 0; i < index.TotalChunks(); ++i) {
                if (!index[i]) continue;
+               // TODO: optimize chunk culling, shoudn't be that hard
                glm::mat4 m(index[i]->Transform(index.Base()));
                glm::mat4 mvp(chunk_prog.GetVP() * m);
                if (!CullTest(Chunk::Bounds(), mvp)) {