textures

[blank.git] / src / world / Chunk.hpp

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 02f146e12de2870793bf35f0a3275d8480b07e90..f4f0bf006300d0c68b40e88b6aed65210ce29e96 100644 (file)
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -20,7 +20,7 @@ class WorldCollision;
 class Chunk {
 
 public:
-       using Pos = glm::tvec3<int>;
+       using Pos = glm::ivec3;
 
 public:
        explicit Chunk(const BlockTypeRegistry &) noexcept;
@@ -73,6 +73,10 @@ public:
        }
        glm::mat4 ToTransform(const Pos &pos, int idx) const noexcept;
 
+       Block::Pos ToSceneCoords(const Pos &base, const Block::Pos &pos) const noexcept {
+               return Block::Pos((position - base) * Extent()) + pos;
+       }
+
        static bool IsBorder(const Pos &pos) noexcept {
                return
                        pos.x == 0 ||
@@ -102,7 +106,6 @@ public:
        const Chunk &GetNeighbor(Block::Face f) const noexcept { return *neighbor[f]; }
        void ClearNeighbors() noexcept;
        void Unlink() noexcept;
-       void Relink() noexcept;
 
        // check which faces of a block at given index are obstructed (and therefore invisible)
        Block::FaceSet Obstructed(const Pos &) const noexcept;
@@ -128,7 +131,7 @@ public:
        int GetLight(const Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
        int GetLight(const Block::Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
 
-       float GetVertexLight(const Pos &, const BlockModel::Position &, const Model::Normal &) const noexcept;
+       float GetVertexLight(const Pos &, const BlockModel::Position &, const EntityModel::Normal &) const noexcept;
 
        bool Intersection(
                const Ray &ray,