X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2FPart.hpp;h=6499bb7478ed30ec34cd5077e702e34dbfbea85c;hb=bef504fb3ed7cf0a830cbe7fb74bddc682c03d19;hp=97743469a85aba210d12d9048a650e2ed6d39f86;hpb=4fbf5a3c1b0e530706023f5fc4be2f68d30ea645;p=blank.git diff --git a/src/model/Part.hpp b/src/model/Part.hpp index 9774346..6499bb7 100644 --- 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 #include #include #include -#include #include namespace blank { class DirectionalLighting; -class EntityMesh; class Instance; class Model; class ResourceIndex; @@ -56,8 +57,8 @@ private: std::vector tex_map; mutable std::unique_ptr mesh; State initial; - glm::vec3 hsl_mod; - glm::vec3 rgb_mod; + EntityMesh::ColorMod hsl_mod; + EntityMesh::ColorMod rgb_mod; std::uint16_t id; };