Refresh lighting and culling uniforms if the camera changes in pop_state

[libs/gl.git] / source / mesh.cpp

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 055345faed1f17586de0c9c93d204f4c7956e985..55d7fc0648df0920dfb93419344d6ee53fdd30a5 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,4 +1,5 @@
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include <msp/gl/extensions/nv_primitive_restart.h>
 #include "buffer.h"
@@ -29,8 +30,9 @@ void Mesh::init(ResourceManager *rm)
        vbuf = 0;
        ibuf = 0;
        vao_id = 0;
-       defer_buffers = true;
+       defer_buffers = ARB_vertex_buffer_object;
        dirty = true;
+       disallow_rendering = false;
        winding = 0;
 
        if(rm)
@@ -39,6 +41,7 @@ void Mesh::init(ResourceManager *rm)
 
 Mesh::~Mesh()
 {
+       set_manager(0);
        delete vbuf;
        delete ibuf;
        if(vao_id)
@@ -152,7 +155,7 @@ void Mesh::draw() const
 
        if(!current())
                vertices.apply();
-       Bind bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+       BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
        Bind bind_winding(winding);
 
        for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
@@ -169,7 +172,6 @@ void Mesh::draw(Renderer &renderer) const
        }
 
        renderer.set_mesh(this);
-       renderer.set_element_buffer(ibuf);
        renderer.set_winding_test(winding);
 
        for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
@@ -183,7 +185,7 @@ void Mesh::bind() const
        if(!vao_id)
        {
                unbind();
-               vertices.apply();
+               vertices.apply(false);
        }
        else if(set_current(this))
        {
@@ -200,7 +202,7 @@ void Mesh::unbind()
                glBindVertexArray(0);
 }
 
-Resource::AsyncLoader *Mesh::load(IO::Seekable &io)
+Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 {
        return new AsyncLoader(*this, io);
 }
@@ -283,6 +285,8 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 Mesh::AsyncLoader::~AsyncLoader()
 {
        mesh.disallow_rendering = false;
+       delete vertex_updater;
+       delete index_updater;
 }
 
 bool Mesh::AsyncLoader::needs_sync() const
@@ -315,7 +319,9 @@ bool Mesh::AsyncLoader::process()
        else if(phase==3)
        {
                delete vertex_updater;
+               vertex_updater = 0;
                delete index_updater;
+               index_updater = 0;
        }
 
        ++phase;