explicit reference for world coordinates

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

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 1e372e753d8c82257fb7bcd34fe6295c11e70e78..7ac9e18a6287e80ef989657f57b10d71c35b9ce3 100644 (file)
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -1,5 +1,6 @@
 #include "World.hpp"
 
+#include "EntityCollision.hpp"
 #include "WorldCollision.hpp"
 #include "../app/Assets.hpp"
 #include "../app/TextureIndex.hpp"
@@ -57,47 +58,68 @@ std::vector<Candidate> candidates;
 bool World::Intersection(
        const Ray &ray,
        const glm::mat4 &M,
-       Chunk *&chunk,
-       int &blkid,
-       float &dist,
-       glm::vec3 &normal
+       const Chunk::Pos &reference,
+       WorldCollision &coll
 ) {
        candidates.clear();
 
        for (Chunk &cur_chunk : chunks.Loaded()) {
                float cur_dist;
-               if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player->ChunkCoords()), cur_dist)) {
+               if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(reference), cur_dist)) {
                        candidates.push_back({ &cur_chunk, cur_dist });
                }
        }
 
        if (candidates.empty()) return false;
 
-       chunk = nullptr;
-       dist = std::numeric_limits<float>::infinity();
-       blkid = -1;
+       coll.chunk = nullptr;
+       coll.block = -1;
+       coll.depth = std::numeric_limits<float>::infinity();
 
        for (Candidate &cand : candidates) {
-               if (cand.dist > dist) continue;
-               int cur_blkid;
+               if (cand.dist > coll.depth) continue;
+               WorldCollision cur_coll;
+               if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(reference), cur_coll)) {
+                       if (cur_coll.depth < coll.depth) {
+                               coll = cur_coll;
+                       }
+               }
+       }
+
+       return coll.chunk;
+}
+
+bool World::Intersection(
+       const Ray &ray,
+       const glm::mat4 &M,
+       const Entity &reference,
+       EntityCollision &coll
+) {
+       coll.entity = nullptr;
+       coll.depth = std::numeric_limits<float>::infinity();
+       for (Entity &cur_entity : entities) {
+               if (&cur_entity == &reference) {
+                       continue;
+               }
                float cur_dist;
                glm::vec3 cur_normal;
-               if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(player->ChunkCoords()), cur_blkid, cur_dist, cur_normal)) {
-                       if (cur_dist < dist) {
-                               chunk = cand.chunk;
-                               blkid = cur_blkid;
-                               dist = cur_dist;
-                               normal = cur_normal;
+               if (blank::Intersection(ray, cur_entity.Bounds(), M * cur_entity.Transform(reference.ChunkCoords()), &cur_dist, &cur_normal)) {
+                       // TODO: fine grained check goes here? maybe?
+                       if (cur_dist < coll.depth) {
+                               coll.entity = &cur_entity;
+                               coll.depth = cur_dist;
+                               coll.normal = cur_normal;
                        }
                }
        }
 
-       return chunk;
+       return coll.entity;
 }
 
 bool World::Intersection(const Entity &e, std::vector<WorldCollision> &col) {
        AABB box = e.Bounds();
-       glm::mat4 M = e.Transform(player->ChunkCoords());
+       Chunk::Pos reference = e.ChunkCoords();
+       glm::mat4 M = e.Transform(reference);
        bool any = false;
        for (Chunk &cur_chunk : chunks.Loaded()) {
                if (manhattan_radius(cur_chunk.Position() - e.ChunkCoords()) > 1) {
@@ -105,7 +127,7 @@ bool World::Intersection(const Entity &e, std::vector<WorldCollision> &col) {
                        // since there's no entity which can extent over 16 blocks, they can be skipped
                        continue;
                }
-               if (cur_chunk.Intersection(box, M, cur_chunk.Transform(player->ChunkCoords()), col)) {
+               if (cur_chunk.Intersection(box, M, cur_chunk.Transform(reference), col)) {
                        any = true;
                }
        }
@@ -117,11 +139,6 @@ Chunk &World::PlayerChunk() {
        return chunks.ForceLoad(player->ChunkCoords());
 }
 
-Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) {
-       const Chunk::Pos tgt_pos = to.Position() + dir;
-       return chunks.ForceLoad(tgt_pos);
-}
-
 
 namespace {