X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=ef328d4d926feb353cf76df65810274c99939a73;hb=b94a7dc7daad9ae9be90a39d723e332dae375325;hp=1ea34a1f897558e28e5020dc4545eb19513b55a5;hpb=ba55bf4293f3abc742eef710545a4b207ba2c820;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index 1ea34a1..ef328d4 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -2,9 +2,10 @@
 #define BLANK_WORLD_BLOCKTYPE_HPP_
 
 #include "Block.hpp"
+#include "BlockGravity.hpp"
 #include "../graphics/BlockMesh.hpp"
 #include "../graphics/EntityMesh.hpp"
-#include "../graphics/OutlineMesh.hpp"
+#include "../graphics/PrimitiveMesh.hpp"
 #include "../model/Shape.hpp"
 
 #include <glm/glm.hpp>
@@ -13,6 +14,10 @@
 
 namespace blank {
 
+class ResourceIndex;
+class ShapeRegistry;
+class TokenStreamReader;
+
 /// single 1x1x1 cube
 /// attributes of a type of block
 struct BlockType {
@@ -23,9 +28,18 @@ struct BlockType {
 	glm::vec3 rgb_mod;
 	glm::vec3 outline_color;
 
+	/// gravity configuration or null if not emitting gravity
+	std::unique_ptr<BlockGravity> gravity;
+
+	/// a string identifying in contexts where numbers just won't do
+	/// must be unique within any given set
+	std::string name;
 	/// 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
@@ -63,6 +77,16 @@ struct BlockType {
 
 	BlockType() noexcept;
 
+	/// clone values of given type
+	/// this copies everything except for ID, name, label, and gravity
+	void Copy(const BlockType &) noexcept;
+
+	void Read(
+		TokenStreamReader &in,
+		ResourceIndex &snd_index,
+		ResourceIndex &tex_index,
+		const ShapeRegistry &shapes);
+
 	bool FaceFilled(const Block &block, Block::Face face) const noexcept {
 		return shape && shape->FaceFilled(block.OrientedFace(face));
 	}
@@ -76,7 +100,7 @@ struct BlockType {
 		const glm::mat4 &transform = glm::mat4(1.0f),
 		BlockMesh::Index idx_offset = 0
 	) const noexcept;
-	void FillOutlineMesh(OutlineMesh::Buffer &m) const noexcept;
+	void OutlinePrimitiveMesh(PrimitiveMesh::Buffer &) const noexcept;
 
 };