]> git.localhorst.tv Git - blank.git/blobdiff - src/world/BlockType.hpp
save a little bandwidth
[blank.git] / src / world / BlockType.hpp
index 8837ca9fd4bd8e1567accde47c5a429c6681cbde..3ca170a200ba65367ff604bfbada3645456714b1 100644 (file)
@@ -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"
@@ -23,10 +24,16 @@ 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;
 
@@ -70,6 +77,10 @@ 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,