"streamlined" model/VAO handling

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

diff --git a/src/model/BlockModel.hpp b/src/model/BlockModel.hpp
index d1a37c90f727cc29ac05a6de56bd815ea6781e28..0d93758ce766ead4201be2e9b1f83c514c3d1763 100644 (file)
--- a/src/model/BlockModel.hpp
+++ b/src/model/BlockModel.hpp
@@ -1,6 +1,8 @@
 #ifndef BLANK_MODEL_BLOCKMODEL_HPP_
 #define BLANK_MODEL_BLOCKMODEL_HPP_
 
+#include "../graphics/VertexArray.hpp"
+
 #include <vector>
 #include <GL/glew.h>
 #include <glm/glm.hpp>
@@ -21,7 +23,14 @@ public:
        using Lights = std::vector<Light>;
        using Indices = std::vector<Index>;
 
-public:
+       enum Attribute {
+               ATTRIB_VERTEX,
+               ATTRIB_COLOR,
+               ATTRIB_LIGHT,
+               ATTRIB_INDEX,
+               ATTRIB_COUNT,
+       };
+
        struct Buffer {
 
                Positions vertices;
@@ -45,32 +54,15 @@ public:
 
        };
 
-public:
-       BlockModel() noexcept;
-       ~BlockModel() noexcept;
-
-       BlockModel(const BlockModel &) = delete;
-       BlockModel &operator =(const BlockModel &) = delete;
-
-       BlockModel(BlockModel &&) noexcept;
-       BlockModel &operator =(BlockModel &&) noexcept;
+       using VAO = VertexArray<ATTRIB_COUNT>;
 
+public:
        void Update(const Buffer &) noexcept;
 
        void Draw() const noexcept;
 
 private:
-       enum Attribute {
-               ATTRIB_VERTEX,
-               ATTRIB_COLOR,
-               ATTRIB_LIGHT,
-               ATTRIB_INDEX,
-               ATTRIB_COUNT,
-       };
-
-       GLuint va;
-       GLuint handle[ATTRIB_COUNT];
-       size_t count;
+       VAO vao;
 
 };