allow hsl color shifts for blocks and entities

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

diff --git a/src/model/BlockModel.hpp b/src/model/BlockModel.hpp
index 2ffd816f913831f3fd46acdc86346e7b8ec811fe..0c1543b81a606fa4c1d3fcdaac2ac0c9637e7b18 100644 (file)
--- a/src/model/BlockModel.hpp
+++ b/src/model/BlockModel.hpp
@@ -15,20 +15,21 @@ class BlockModel {
 public:
        using Position = glm::vec3;
        using TexCoord = glm::vec3;
-       using Color = glm::vec3;
+       using ColorMod = glm::vec3;
        using Light = float;
        using Index = unsigned int;
 
        using Positions = std::vector<Position>;
        using TexCoords = std::vector<TexCoord>;
-       using Colors = std::vector<Color>;
+       using ColorMods = std::vector<ColorMod>;
        using Lights = std::vector<Light>;
        using Indices = std::vector<Index>;
 
        enum Attribute {
                ATTRIB_VERTEX,
                ATTRIB_TEXCOORD,
-               ATTRIB_COLOR,
+               ATTRIB_HSL,
+               ATTRIB_RGB,
                ATTRIB_LIGHT,
                ATTRIB_INDEX,
                ATTRIB_COUNT,
@@ -38,14 +39,16 @@ public:
 
                Positions vertices;
                TexCoords tex_coords;
-               Colors colors;
+               ColorMods hsl_mods;
+               ColorMods rgb_mods;
                Lights lights;
                Indices indices;
 
                void Clear() noexcept {
                        vertices.clear();
                        tex_coords.clear();
-                       colors.clear();
+                       hsl_mods.clear();
+                       rgb_mods.clear();
                        lights.clear();
                        indices.clear();
                }
@@ -53,7 +56,8 @@ public:
                void Reserve(size_t p, size_t i) {
                        vertices.reserve(p);
                        tex_coords.reserve(p);
-                       colors.reserve(p);
+                       hsl_mods.reserve(p);
+                       rgb_mods.reserve(p);
                        lights.reserve(p);
                        indices.reserve(i);
                }