X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=3ca170a200ba65367ff604bfbada3645456714b1;hb=2ad195d00eea2c4d48f3f1a3ccc60a8176e7da20;hp=b50169c53ee72ac033e5c1eac09b1eabd551a9cd;hpb=75172fd735e34082c34b47ae7c194445b53038d9;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index b50169c..3ca170a 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -2,6 +2,7 @@
 #define BLANK_WORLD_BLOCKTYPE_HPP_
 
 #include "Block.hpp"
+#include "BlockGravity.hpp"
 #include "../graphics/BlockMesh.hpp"
 #include "../graphics/EntityMesh.hpp"
 #include "../graphics/PrimitiveMesh.hpp"
@@ -13,16 +14,26 @@
 
 namespace blank {
 
+class ResourceIndex;
+class ShapeRegistry;
+class TokenStreamReader;
+
 /// single 1x1x1 cube
 /// attributes of a type of block
 struct BlockType {
 
 	const Shape *shape;
 	std::vector<float> textures;
-	glm::vec3 hsl_mod;
-	glm::vec3 rgb_mod;
-	glm::vec3 outline_color;
+	glm::tvec3<unsigned char> hsl_mod;
+	glm::tvec3<unsigned char> rgb_mod;
+	glm::tvec3<unsigned char> 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;
 
@@ -66,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));
 	}