EmaMaker
/
voxel-engine
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clear mesh data after sending to gpu

vertex-deduplication
EmaMaker 2023-02-11 22:25:40 +01:00
parent 3c54de5f21
commit 2e0ed7b057
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/chunkmesh.hpp
View File

@ -31,7 +31,7 @@ private:
std::vector<GLuint> indices; std::vector<GLuint> indices;
GLuint VAO, VBO, EBO, colorBuffer, vIndex{0}; GLuint VAO{0}, VBO{0}, EBO{0}, colorBuffer{0}, vIndex{0};
Shader *theShader{nullptr}; Shader *theShader{nullptr};
}; };

20
src/chunkmesh.cpp
View File

@ -10,6 +10,11 @@
ChunkMesh::~ChunkMesh() ChunkMesh::~ChunkMesh()
{ {
if(this->VAO) glDeleteVertexArrays(1, &(this->VAO));
if(this->EBO) glDeleteBuffers(1, &(this->EBO));
if(this->VBO) glDeleteBuffers(1, &(this->VBO));
if(this->colorBuffer) glDeleteBuffers(1, &(this->colorBuffer));
delete this->chunk; delete this->chunk;
delete (this->theShader); delete (this->theShader);
} }
@ -202,7 +207,7 @@ void ChunkMesh::mesh()
if (blocks) if (blocks)
delete blocks; delete blocks;
if (vertices.size() > 0) if (vIndex > 0)
{ {
// bind the Vertex Array Object first, then bind and set vertex buffer(s), and then configure vertex attributes(s). // bind the Vertex Array Object first, then bind and set vertex buffer(s), and then configure vertex attributes(s).
@ -223,15 +228,24 @@ void ChunkMesh::mesh()
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)0); glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)0);
// glDisableVertexAttribArray(0);
// glDisableVertexAttribArray(1);
glBindVertexArray(0); glBindVertexArray(0);
vIndex = (GLuint)(indices.size());
vertices.clear();
indices.clear();
colors.clear();
} }
} }
void ChunkMesh::draw() void ChunkMesh::draw()
{ {
// glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); // wireframe mode // glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); // wireframe mode
if (vertices.size() > 0) if (vIndex > 0)
{ {
theShader->use(); theShader->use();
theShader->setMat4("model", this->model); theShader->setMat4("model", this->model);
@ -239,7 +253,7 @@ void ChunkMesh::draw()
theShader->setMat4("projection", theCamera.getProjection()); theShader->setMat4("projection", theCamera.getProjection());
glBindVertexArray(VAO); glBindVertexArray(VAO);
glDrawElements(GL_TRIANGLES, static_cast<GLuint>(indices.size()), GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, vIndex , GL_UNSIGNED_INT, 0);
glBindVertexArray(0); glBindVertexArray(0);
} }
} }