X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=c55c674721df0b21943e293c7125107762ab7c21;hb=dcd54cacda98c2c0f7cf0c7a9131fb858d8ee10a;hp=f1b887d3eabc56e998fd64917c8a661df9df52b9;hpb=efc3c1ba52cbe0fc9a4010c37c2d7c7020a0b481;p=blank.git diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp index f1b887d..c55c674 100644 --- 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 #include #include @@ -25,9 +25,9 @@ struct BlockType { const Shape *shape; std::vector textures; - glm::tvec3 hsl_mod; - glm::tvec3 rgb_mod; - glm::tvec3 outline_color; + TVEC3 hsl_mod; + TVEC3 rgb_mod; + TVEC3 outline_color; /// gravity configuration or null if not emitting gravity std::unique_ptr gravity;