try to cleanly destruct world

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

diff --git a/src/world/block.cpp b/src/world/block.cpp
index d2453cf534a705fe5435a030500ca3e3960f64db..d6e5507ddf5777f1b061dca6e256099d34397c68 100644 (file)
--- a/src/world/block.cpp
+++ b/src/world/block.cpp
@@ -2,8 +2,6 @@
 #include "BlockType.hpp"
 #include "BlockTypeRegistry.hpp"
 
-#include "../model/geometry.hpp"
-
 #include <ostream>
 #include <glm/gtx/euler_angles.hpp>
 #include <glm/gtx/transform.hpp>
@@ -11,9 +9,6 @@
 
 namespace blank {
 
-const NullShape BlockType::DEFAULT_SHAPE;
-
-
 std::ostream &operator <<(std::ostream &out, const Block &block) {
        return out << "Block(" << block.type << ", " << block.GetFace() << ", " << block.GetTurn() << ')';
 }
@@ -70,12 +65,14 @@ std::ostream &operator <<(std::ostream &out, const Block::Turn &turn) {
 
 
 BlockType::BlockType() noexcept
-: shape(&DEFAULT_SHAPE)
-, texture(0)
+: shape(nullptr)
+, textures()
 , hsl_mod(0.0f, 1.0f, 1.0f)
 , rgb_mod(1.0f, 1.0f, 1.0f)
 , outline_color(-1, -1, -1)
 , label("some block")
+, place_sound(-1)
+, remove_sound(-1)
 , id(0)
 , luminosity(0)
 , visible(true)
@@ -95,17 +92,16 @@ BlockType::BlockType() noexcept
 , min_richness(-1.0f)
 , mid_richness(0.0f)
 , max_richness(1.0f)
-, commonness(1.0f)
-, fill({ false, false, false, false, false, false }) {
+, commonness(1.0f) {
 
 }
 
 void BlockType::FillEntityMesh(
        EntityMesh::Buffer &buf,
-       const glm::mat4 &transform,
-       EntityMesh::Index idx_offset
+       const glm::mat4 &transform
 ) const noexcept {
-       shape->Vertices(buf, transform, texture, idx_offset);
+       if (!shape) return;
+       shape->Fill(buf, transform, textures);
        buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod);
        buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod);
 }
@@ -115,14 +111,16 @@ void BlockType::FillBlockMesh(
        const glm::mat4 &transform,
        BlockMesh::Index idx_offset
 ) const noexcept {
-       shape->Vertices(buf, transform, texture, idx_offset);
+       if (!shape) return;
+       shape->Fill(buf, transform, textures, idx_offset);
        buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod);
        buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod);
 }
 
-void BlockType::FillOutlineMesh(OutlineMesh::Buffer &buf) const noexcept {
+void BlockType::OutlinePrimitiveMesh(PrimitiveMesh::Buffer &buf) const noexcept {
+       if (!shape) return;
        shape->Outline(buf);
-       buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color);
+       buf.colors.insert(buf.colors.end(), shape->OutlineCount(), glm::vec4(outline_color, 1.0f));
 }