feat: vertex array class

engine/include/engine/opengl/buffers.h

@@ -35,6 +35,7 @@ namespace OpenGL {
         BufferUsage m_usage;
     };
 
+    // TODO: Implement custom fields structuring via ordered_map?
     class ENGINE_API UniformBuffer : public Buffer {
     public:
         UniformBuffer(size_t size, unsigned int index);
@@ -71,6 +72,16 @@ namespace OpenGL {
         inline void StartConfigure() const { Bind(); }
         inline void EndConfigure() const { Unbind(); }
     };
+
+    class ENGINE_API VertexArray {
+    public:
+        VertexArray();
+
+        void Bind();
+        void Unbind();
+    private:
+        unsigned int m_id;
+    };
 } // namespace OpenGL
 
 } // namespace Core

engine/include/engine/renderer/mesh.h

@@ -6,18 +6,17 @@
 #include <GL/glew.h>
 
 #include "engine/renderer/basics.h"
+#include "engine/opengl/buffers.h"
 
 namespace Core {
 
-class Mesh {
+class Mesh : public OpenGL::VertexArray {
 public: // TODO: abstract away
-    unsigned int m_vao, m_vbo, m_ebo;
+    unsigned int m_vbo, m_ebo;
     std::vector<Vertex> m_vertexBuffer;
     std::vector<unsigned int> m_indexBuffer;
-public: // TODO: abstract away
+public:
-    void Bind() const { glBindVertexArray(m_vao); }
+    void Upload();
-    void Unbind() { glBindVertexArray(0); }
-    void Upload() const;
 public:
     std::string materialName;
 public:

engine/src/opengl/buffers.cpp

@@ -1,3 +1,4 @@
+#include <cassert>
 #include "engine/opengl/buffers.h"
 
 namespace Core {
@@ -73,6 +74,22 @@ namespace OpenGL {
     InstanceBuffer::InstanceBuffer(BufferUsage usage)
         : ArrayBuffer(usage) {}
 
+    VertexArray::VertexArray() : m_id(0) {
+        glGenVertexArrays(1, &m_id);
+    }
+
+    void VertexArray::Bind() {
+        assert(m_id != 0 && "Vertex Array wasn't initialized.");
+
+        glBindVertexArray(m_id);
+    }
+
+    void VertexArray::Unbind() {
+        assert(m_id != 0 && "Vertex Array wasn't initialized.");
+
+        glBindVertexArray(0);
+    }
+
 } // namespace OpenGL
 
 } // namespace Core

engine/src/renderer/mesh.cpp

@@ -5,15 +5,15 @@
 namespace Core {
 
 Mesh::Mesh() {
-    m_vao = 0;
+    // m_vao = 0;
     m_vbo = 0;
     m_ebo = 0;
     
-    glGenVertexArrays(1, &m_vao);
+    // glGenVertexArrays(1, &m_vao);
     glGenBuffers(1, &m_vbo);
     glGenBuffers(1, &m_ebo);
 
-    glBindVertexArray(m_vao);
+    Bind();
 
     // VBO (vertex buffer)
     glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
@@ -34,11 +34,11 @@ Mesh::Mesh() {
     glEnableVertexAttribArray(2);
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glBindVertexArray(0);
+    Unbind();
 }
 
-void Mesh::Upload() const {
+void Mesh::Upload() {
-    glBindVertexArray(m_vao);
+    Bind();
 
     glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
     glBufferData(GL_ARRAY_BUFFER, m_vertexBuffer.size() * sizeof(Vertex), m_vertexBuffer.data(), GL_DYNAMIC_DRAW);
@@ -47,7 +47,7 @@ void Mesh::Upload() const {
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ebo);
     glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_indexBuffer.size() * sizeof(unsigned int), m_indexBuffer.data(), GL_DYNAMIC_DRAW);
 
-    glBindVertexArray(0);
+    Unbind();
 }
 
 void Mesh::Render(unsigned int count)

sandbox/src/main.cpp

@@ -63,7 +63,7 @@ public:
         assert(batchEntt.HasComponent<batch>() && "batch doesn't have any batch component!");
         assert(batchEntt.HasComponent<mesh>() && "batch doesn't have any mesh component!");
         // Generate 1000 random cubes
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100; ++i) {
             auto cubeEntity = scene->CreateEntity();
 
             float x = static_cast<float>(rand()) / RAND_MAX * 200.f - 100.f; // range [-100, 100]