devirtualize shape and outline calls

[blank.git] / src / model.hpp

diff --git a/src/model.hpp b/src/model.hpp
index 02ab3f274bd5b096205f9c1d4a153bff004e7c4a..62f467c4f787a6de9547f450af12197dd3e955f6 100644 (file)
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -11,27 +11,103 @@ namespace blank {
 class Model {
 
 public:
+       using Position = glm::vec3;
+       using Color = glm::vec3;
+       using Normal = glm::vec3;
+       using Index = unsigned int;
+
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Normals = std::vector<Normal>;
+       using Indices = std::vector<Index>;
+
+public:
+       Positions vertices;
+       Colors colors;
+       Normals normals;
+       Indices indices;
+
+public:
+       Model();
+       ~Model();
+
+       Model(const Model &) = delete;
+       Model &operator =(const Model &) = delete;
+
+       Model(Model &&);
+       Model &operator =(Model &&);
+
+       void Invalidate() { dirty = true; }
+
+       void Clear();
+       void Reserve(int vtx_count, int idx_count);
+
+       void CheckUpdate();
+       void Draw();
+
+private:
+       void Update();
+
+private:
        enum Attribute {
                ATTRIB_VERTEX,
                ATTRIB_COLOR,
                ATTRIB_NORMAL,
+               ATTRIB_INDEX,
                ATTRIB_COUNT,
        };
 
+       GLuint va;
+       GLuint handle[ATTRIB_COUNT];
+       bool dirty;
+
+};
+
+
+class OutlineModel {
+
 public:
-       explicit Model(
-               std::vector<glm::vec3> &&vertices,
-               std::vector<glm::vec3> &&colors,
-               std::vector<glm::vec3> &&normals);
-       ~Model();
+       using Position = glm::vec3;
+       using Color = glm::vec3;
+       using Index = unsigned short;
+
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Indices = std::vector<Index>;
+
+public:
+       Positions vertices;
+       Colors colors;
+       Indices indices;
+
+public:
+       OutlineModel();
+       ~OutlineModel();
+
+       OutlineModel(const OutlineModel &) = delete;
+       OutlineModel &operator =(const OutlineModel &) = delete;
+
+       void Invalidate() { dirty = true; }
+
+       void Clear();
+       void Reserve(int vtx_count, int idx_count);
 
        void Draw();
 
 private:
-       std::vector<glm::vec3> vertices;
-       std::vector<glm::vec3> colors;
-       std::vector<glm::vec3> normals;
+       void Update();
+
+private:
+       enum Attribute {
+               ATTRIB_VERTEX,
+               ATTRIB_COLOR,
+               ATTRIB_INDEX,
+               ATTRIB_COUNT,
+       };
+
+       GLuint va;
        GLuint handle[ATTRIB_COUNT];
+       bool dirty;
 
 };