Multithreading

[dragonblocks3d.git] / src / dragonblocks / mesh.cpp

diff --git a/src/dragonblocks/mesh.cpp b/src/dragonblocks/mesh.cpp
index a37ac3a4d6827d7e4d0dfa1649c036e92f90811f..f934e8e58f005d5e78f8a66a1a8ba46fd67d9dc8 100644 (file)
--- a/src/dragonblocks/mesh.cpp
+++ b/src/dragonblocks/mesh.cpp
@@ -1,3 +1,6 @@
+#include <stdexcept>
+#include <cstdlib>
+#include <cstring>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/constants.hpp>
 #include "gldebug.hpp"
@@ -9,12 +12,12 @@ using namespace std;
 using namespace glm;
 using namespace dragonblocks;
 
-double Mesh::Effect::grow_time = 0.5;  // s
-double Mesh::Effect::flyin_time = 0.5; // s
+double Mesh::Effect::grow_time = 0.25; // s
+double Mesh::Effect::flyin_time = 0.4; // s
 double Mesh::Effect::flyin_offset = 20;        // m
 double Mesh::Effect::rotate_speed = 1; // turns/s
 
-mat4 Mesh::Effect::getModelMatrix(double dtime, vec3 pos, vec3 size, vec3 rotation_axis, float rotation_angle, void *extra_data)
+mat4 Mesh::Effect::getModelMatrix(double dtime, vec3 pos, vec3 size, vec3 rotation_axis, float rotation_angle)
 {
        mat4 trans = mat4(1.0);
 
@@ -54,10 +57,8 @@ mat4 Mesh::Effect::getModelMatrix(double dtime, vec3 pos, vec3 size, vec3 rotati
        return trans;
 }
 
-Mesh::Effect::Effect(Mesh::Effect::Type t, void (*callback)(void *))
+Mesh::Effect::Effect(Mesh::Effect::Type t, void (*o)(void *), void *e) : type(t), on_finish(o), extra_data(e)
 {
-       type = t;
-       on_finish = callback;
        switch(type) {
                case Mesh::Effect::Type::FLYIN:
                expires = true;
@@ -74,32 +75,28 @@ Mesh::Effect::Effect(Mesh::Effect::Type t, void (*callback)(void *))
        }
 }
 
-void Mesh::configureVertexObjects(const GLvoid *vertices, GLsizeiptr vertices_size)
+void Mesh::vertexConfig(const GLvoid *v, GLsizei s)
 {
-       glGenVertexArrays(1, &VAO); CHECKERR
-       glGenBuffers(1, &VBO); CHECKERR
-       
-       glBindVertexArray(VAO); CHECKERR
-       glBindBuffer(GL_ARRAY_BUFFER, VBO); CHECKERR
-       
-       glBufferData(GL_ARRAY_BUFFER, vertices_size, vertices, GL_STATIC_DRAW); CHECKERR
-       
-       GLsizei stride = 5 * sizeof(GLfloat); CHECKERR
-       
-       glVertexAttribPointer(0, 3, GL_FLOAT, false, stride, (GLvoid *)(0 * sizeof(GLfloat))); CHECKERR
-       glEnableVertexAttribArray(0); CHECKERR
-       glVertexAttribPointer(1, 2, GL_FLOAT, false, stride, (GLvoid *)(3 * sizeof(GLfloat))); CHECKERR
-       glEnableVertexAttribArray(1); CHECKERR
-       
-       glBindBuffer(GL_ARRAY_BUFFER, 0); CHECKERR
-       glBindVertexArray(0); CHECKERR
+       if (vertices_changed || configured)
+               throw runtime_error("Attempt to configure Mesh that is already configured");
+       vertices = malloc(s);
+       memcpy(vertices, v, s);
+       vertices_size = s;
+       vertices_changed = true;
 }
 
 void Mesh::render(double dtime, ShaderProgram *shader_program)
 {
+       if (vertices_changed) {
+               runVertexConfig();
+       }
+               
+       if (! configured)
+               return;
+
        shader_program->use(); CHECKERR
        
-       mat4 model_matrix = effect.getModelMatrix(dtime, pos, size, rotation_axis, rotation_angle, extra_data); CHECKERR
+       mat4 model_matrix = effect.getModelMatrix(dtime, pos, size, rotation_axis, rotation_angle); CHECKERR
        
        shader_program->set("model", model_matrix); CHECKERR
        
@@ -112,6 +109,29 @@ void Mesh::render(double dtime, ShaderProgram *shader_program)
        glBindTexture(GL_TEXTURE_2D, 0); CHECKERR
 }
 
+void Mesh::reset()
+{
+       removeFromScene();
+       pos = vec3(0.0);
+       size = vec3(1.0);
+       rotation_axis = vec3(0.0, 1.0, 0.0);
+       vertices_per_texture = 0;
+       textures = {};
+       rotation_angle = 0;
+       if (VAO) {
+               glDeleteVertexArrays(1, &VAO); CHECKERR
+       }
+       if (VBO) {
+               glDeleteBuffers(1, &VAO); CHECKERR
+       }
+       vertices_changed = false;
+       if (vertices) {
+               free(vertices);
+       }
+       vertices = NULL;
+       configured = false;
+}
+
 void Mesh::addToScene()
 {
        scene->add(this);
@@ -122,6 +142,36 @@ void Mesh::removeFromScene()
        scene->remove(this);
 }
 
-Mesh::Mesh(Scene *s): pos(0.0), size(1.0), rotation_axis(0.0, 1.0, 0.0), scene(s)
+Mesh::Mesh(Scene *s): scene(s)
 {
+       reset();
+}
+
+void Mesh::runVertexConfig()
+{              
+       if (! vertices || vertices_size == 0)
+               throw runtime_error("Invalid Mesh configuration");
+       
+       glGenVertexArrays(1, &VAO); CHECKERR
+       glGenBuffers(1, &VBO); CHECKERR
+       
+       glBindVertexArray(VAO); CHECKERR
+       glBindBuffer(GL_ARRAY_BUFFER, VBO); CHECKERR
+               
+       glBufferData(GL_ARRAY_BUFFER, vertices_size, vertices, GL_STATIC_DRAW); CHECKERR
+       
+       GLsizei stride = 5 * sizeof(GLfloat); CHECKERR
+       
+       glVertexAttribPointer(0, 3, GL_FLOAT, false, stride, (GLvoid *)(0 * sizeof(GLfloat))); CHECKERR
+       glEnableVertexAttribArray(0); CHECKERR
+       glVertexAttribPointer(1, 2, GL_FLOAT, false, stride, (GLvoid *)(3 * sizeof(GLfloat))); CHECKERR
+       glEnableVertexAttribArray(1); CHECKERR
+       
+       glBindBuffer(GL_ARRAY_BUFFER, 0); CHECKERR
+       glBindVertexArray(0); CHECKERR
+       
+       free(vertices);
+       vertices = NULL;
+       vertices_changed = false;
+       configured = true;
 }