glm backwards compatibility

[blank.git] / src / model / Part.hpp

diff --git a/src/model/Part.hpp b/src/model/Part.hpp
index 3a17f2046137b39da28699d66452932978843471..6499bb7478ed30ec34cd5077e702e34dbfbea85c 100644 (file)
--- a/src/model/Part.hpp
+++ b/src/model/Part.hpp
@@ -1,18 +1,19 @@
 #ifndef BLAMK_MODEL_PART_HPP_
 #define BLAMK_MODEL_PART_HPP_
 
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/glm.hpp"
+
 #include <cstdint>
 #include <list>
 #include <memory>
 #include <vector>
-#include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
 
 namespace blank {
 
 class DirectionalLighting;
-class EntityMesh;
 class Instance;
 class Model;
 class ResourceIndex;
@@ -56,8 +57,8 @@ private:
        std::vector<float> tex_map;
        mutable std::unique_ptr<EntityMesh> mesh;
        State initial;
-       glm::tvec3<unsigned char> hsl_mod;
-       glm::tvec3<unsigned char> rgb_mod;
+       EntityMesh::ColorMod hsl_mod;
+       EntityMesh::ColorMod rgb_mod;
        std::uint16_t id;
 
 };