X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=b50169c53ee72ac033e5c1eac09b1eabd551a9cd;hb=0d580658b896dfec07466c31ae4847455724ee95;hp=0cae9c00389767c013880e559f3a37bf1126c7c8;hpb=75ebb9101c7aec9c16ef418b822c39e81889f66f;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index 0cae9c0..b50169c 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -2,12 +2,13 @@
 #define BLANK_WORLD_BLOCKTYPE_HPP_
 
 #include "Block.hpp"
-#include "../model/BlockModel.hpp"
-#include "../model/EntityModel.hpp"
-#include "../model/OutlineModel.hpp"
-#include "../model/shapes.hpp"
+#include "../graphics/BlockMesh.hpp"
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/PrimitiveMesh.hpp"
+#include "../model/Shape.hpp"
 
 #include <glm/glm.hpp>
+#include <vector>
 
 
 namespace blank {
@@ -17,13 +18,17 @@ namespace blank {
 struct BlockType {
 
 	const Shape *shape;
-	float texture;
-	glm::vec3 color;
+	std::vector<float> textures;
+	glm::vec3 hsl_mod;
+	glm::vec3 rgb_mod;
 	glm::vec3 outline_color;
 
 	/// a string to display to the user
 	std::string label;
 
+	int place_sound;
+	int remove_sound;
+
 	Block::Type id;
 
 	/// light level that blocks of this type emit
@@ -59,42 +64,22 @@ struct BlockType {
 	/// commonness factor, random chance is multiplied by this
 	float commonness;
 
-	struct Faces {
-		bool face[Block::FACE_COUNT];
-		Faces &operator =(const Faces &other) noexcept {
-			for (int i = 0; i < Block::FACE_COUNT; ++i) {
-				face[i] = other.face[i];
-			}
-			return *this;
-		}
-		bool operator [](Block::Face f) const noexcept {
-			return face[f];
-		}
-	} fill;
-
-	explicit BlockType(
-		bool v = false,
-		const glm::vec3 &color = { 1, 1, 1 },
-		const Shape *shape = &DEFAULT_SHAPE
-	) noexcept;
-
-	static const NullShape DEFAULT_SHAPE;
+	BlockType() noexcept;
 
 	bool FaceFilled(const Block &block, Block::Face face) const noexcept {
-		return fill[block.OrientedFace(face)];
+		return shape && shape->FaceFilled(block.OrientedFace(face));
 	}
 
-	void FillEntityModel(
-		EntityModel::Buffer &m,
-		const glm::mat4 &transform = glm::mat4(1.0f),
-		EntityModel::Index idx_offset = 0
+	void FillEntityMesh(
+		EntityMesh::Buffer &m,
+		const glm::mat4 &transform = glm::mat4(1.0f)
 	) const noexcept;
-	void FillBlockModel(
-		BlockModel::Buffer &m,
+	void FillBlockMesh(
+		BlockMesh::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
-		BlockModel::Index idx_offset = 0
+		BlockMesh::Index idx_offset = 0
 	) const noexcept;
-	void FillOutlineModel(OutlineModel::Buffer &m) const noexcept;
+	void OutlinePrimitiveMesh(PrimitiveMesh::Buffer &) const noexcept;
 
 };