use collision structures for ray tests

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

diff --git a/src/world/block.cpp b/src/world/block.cpp
index e06f3e0bc63d84c29b86b7defcce8d0f3a34af27..54ceba081b035036164e6537919c8feca29e085e 100644 (file)
--- a/src/world/block.cpp
+++ b/src/world/block.cpp
@@ -14,10 +14,6 @@ namespace blank {
 const NullShape BlockType::DEFAULT_SHAPE;
 
 
-bool operator ==(const Block &a, const Block &b) {
-       return a.type == b.type && a.orient == b.orient;
-}
-
 std::ostream &operator <<(std::ostream &out, const Block &block) {
        return out << "Block(" << block.type << ", " << block.GetFace() << ", " << block.GetTurn() << ')';
 }
@@ -75,6 +71,7 @@ std::ostream &operator <<(std::ostream &out, const Block::Turn &turn) {
 
 BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s) noexcept
 : shape(s)
+, texture(0)
 , color(col)
 , outline_color(-1, -1, -1)
 , label("some block")
@@ -93,7 +90,7 @@ void BlockType::FillEntityModel(
        const glm::mat4 &transform,
        EntityModel::Index idx_offset
 ) const noexcept {
-       shape->Vertices(buf.vertices, buf.normals, buf.indices, transform, idx_offset);
+       shape->Vertices(buf, transform, texture, idx_offset);
        buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
 }
 
@@ -102,7 +99,7 @@ void BlockType::FillBlockModel(
        const glm::mat4 &transform,
        BlockModel::Index idx_offset
 ) const noexcept {
-       shape->Vertices(buf.vertices, buf.indices, transform, idx_offset);
+       shape->Vertices(buf, transform, texture, idx_offset);
        buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
 }
 
@@ -111,7 +108,7 @@ void BlockType::FillOutlineModel(
        const glm::vec3 &pos_offset,
        OutlineModel::Index idx_offset
 ) const noexcept {
-       shape->Outline(buf.vertices, buf.indices, pos_offset, idx_offset);
+       shape->Outline(buf, pos_offset, idx_offset);
        buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color);
 }