use symbolic names for block colors

[blank.git] / src / world / BlockType.hpp

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index f1b887d3eabc56e998fd64917c8a661df9df52b9..575087f3dfad0ab32c49d05eb84b5230a32e4940 100644 (file)
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -5,10 +5,10 @@
 #include "BlockGravity.hpp"
 #include "../graphics/BlockMesh.hpp"
 #include "../graphics/EntityMesh.hpp"
+#include "../graphics/glm.hpp"
 #include "../graphics/PrimitiveMesh.hpp"
 #include "../model/Shape.hpp"
 
-#include <glm/glm.hpp>
 #include <limits>
 #include <vector>
 
@@ -25,9 +25,9 @@ struct BlockType {
 
        const Shape *shape;
        std::vector<float> textures;
-       glm::tvec3<unsigned char> hsl_mod;
-       glm::tvec3<unsigned char> rgb_mod;
-       glm::tvec3<unsigned char> outline_color;
+       BlockMesh::ColorMod hsl_mod;
+       BlockMesh::ColorMod rgb_mod;
+       PrimitiveMesh::Color outline_color;
 
        /// gravity configuration or null if not emitting gravity
        std::unique_ptr<BlockGravity> gravity;