X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2FPart.hpp;h=6499bb7478ed30ec34cd5077e702e34dbfbea85c;hb=dcd54cacda98c2c0f7cf0c7a9131fb858d8ee10a;hp=8c1db600244e4d4db37685c5abd3f0b1819c59e5;hpb=b9a63fedbc65e8659c43f7fa381017c0c70a48da;p=blank.git diff --git a/src/model/Part.hpp b/src/model/Part.hpp index 8c1db60..6499bb7 100644 --- a/src/model/Part.hpp +++ b/src/model/Part.hpp @@ -1,20 +1,19 @@ #ifndef BLAMK_MODEL_PART_HPP_ #define BLAMK_MODEL_PART_HPP_ -#include "geometry.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; @@ -58,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; };