Refactor mesh handling to use templated vertex structures for improved type safety and flexibility

2025-04-13 17:14:28 +03:00
parent bba647db5c
commit 1ffbeb8148
28 changed files with 591 additions and 521 deletions
@@ -1,93 +1,8 @@
-#include "Mesh.hpp"
-#include <assert.h>
-#include <GL/glew.h>
+//
+// Created by RED on 24.03.2025.
+//

-int Mesh::meshesCount = 0;
-int Mesh::drawCalls = 0;
+#include "graphics/core/Mesh.hpp"

-inline size_t calc_vertex_size(const VertexAttribute* attrs) {
-    size_t vertexSize = 0;
-    for (int i = 0; attrs[i].size; i++) {
-        vertexSize += attrs[i].size;
-    }
-    assert(vertexSize != 0);
-    return vertexSize;
-}
-
-Mesh::Mesh(const MeshData& data)
- : Mesh(data.vertices.data(), 
-        data.vertices.size() / calc_vertex_size(data.attrs.data()),
-        data.indices.data(),
-        data.indices.size(),
-        data.attrs.data()) {}
-
-Mesh::Mesh(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices, const VertexAttribute* attrs) : 
-    ibo(0),
-    vertices(0),
-    indices(0)
-{
-    meshesCount++;
-    vertexSize = 0;
-    for (int i = 0; attrs[i].size; i++) {
-        vertexSize += attrs[i].size;
-    }
-
-    glGenVertexArrays(1, &vao);
-    glGenBuffers(1, &vbo);
-
-    reload(vertexBuffer, vertices, indexBuffer, indices);
-
-    // attributes
-    int offset = 0;
-    for (int i = 0; attrs[i].size; i++) {
-        int size = attrs[i].size;
-        glVertexAttribPointer(i, size, GL_FLOAT, GL_FALSE, vertexSize * sizeof(float), (GLvoid*)(offset * sizeof(float)));
-        glEnableVertexAttribArray(i);
-        offset += size;
-    }
-
-    glBindVertexArray(0);
-}
-
-Mesh::~Mesh(){
-    meshesCount--;
-    glDeleteVertexArrays(1, &vao);
-    glDeleteBuffers(1, &vbo);
-    if (ibo != 0) glDeleteBuffers(1, &ibo);
-}
-
-void Mesh::reload(const float* vertexBuffer, size_t vertices, const int* indexBuffer, size_t indices){
-    glBindVertexArray(vao);
-    glBindBuffer(GL_ARRAY_BUFFER, vbo);
-    if (vertexBuffer != nullptr && vertices != 0) {
-        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, vertexBuffer, GL_STREAM_DRAW);
-    } else {
-        glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STREAM_DRAW);
-    }
-    if (indexBuffer != nullptr && indices != 0) {
-        if (ibo == 0) glGenBuffers(1, &ibo);
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
-        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int) * indices, indexBuffer, GL_STATIC_DRAW);
-    }
-    else if (ibo != 0) {
-        glDeleteBuffers(1, &ibo);
-    }
-    this->vertices = vertices;
-    this->indices = indices;
-}
-
-void Mesh::draw(unsigned int primitive) const {
-    drawCalls++;
-    glBindVertexArray(vao);
-    if (ibo != 0) {
-        glDrawElements(primitive, indices, GL_UNSIGNED_INT, 0);
-    }
-    else {
-        glDrawArrays(primitive, 0, vertices);
-    }
-    glBindVertexArray(0);
-}
-
-void Mesh::draw() const {
-    draw(GL_TRIANGLES);
-}
+ int MeshStats::meshesCount = 0;
+ int MeshStats::drawCalls = 0;