Collapse the shared part of Mesh::draw and draw_instanced

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 746b07d8e1db7d6ac29f2cd9d75eeae0c60496f6..b5535039b44109a2f31ca8cd9c57105001966b64 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -29,7 +29,6 @@ void Mesh::init(ResourceManager *rm)
 {
        vbuf = 0;
        ibuf = 0;
-       vtx_setup = 0;
        disallow_rendering = false;
        winding = 0;
 
@@ -40,7 +39,6 @@ void Mesh::init(ResourceManager *rm)
 Mesh::~Mesh()
 {
        set_manager(0);
-       delete vtx_setup;
        delete vbuf;
        delete ibuf;
 }
@@ -53,6 +51,9 @@ void Mesh::clear()
 
 void Mesh::create_buffers()
 {
+       if(vbuf && ibuf)
+               return;
+
        if(!vbuf)
                vbuf = new Buffer(ARRAY_BUFFER);
        vertices.use_buffer(vbuf);
@@ -60,12 +61,8 @@ void Mesh::create_buffers()
        if(!ibuf)
                ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
 
-       if(ARB_vertex_array_object && !vtx_setup)
-       {
-               vtx_setup = new VertexSetup;
-               vtx_setup->set_vertex_array(vertices);
-               vtx_setup->set_index_buffer(*ibuf);
-       }
+       vtx_setup.set_vertex_array(vertices);
+       vtx_setup.set_index_buffer(*ibuf);
 }
 
 unsigned Mesh::get_n_vertices() const
@@ -117,42 +114,9 @@ void Mesh::set_winding(const WindingTest *w)
        winding = w;
 }
 
-void Mesh::draw() const
-{
-       const Mesh *cur = current();
-       if(cur && cur!=this)
-               throw invalid_operation("Mesh::draw");
-
-       if(manager)
-       {
-               manager->resource_used(*this);
-               if(disallow_rendering)
-                       return;
-       }
-
-       if(!current())
-               vertices.apply();
-       BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-       Bind bind_winding(winding);
-
-       for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               i->draw();
-}
-
 void Mesh::draw(Renderer &renderer) const
 {
-       if(manager)
-       {
-               manager->resource_used(*this);
-               if(disallow_rendering)
-                       return;
-       }
-
-       renderer.set_mesh(this);
-       renderer.set_winding_test(winding);
-
-       for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               renderer.draw(*i);
+       draw(renderer, 0, 0);
 }
 
 void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned count) const
@@ -160,6 +124,11 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
        if(vs.get_vertex_array()!=&vertices)
                throw invalid_argument("Mesh::draw_instanced");
 
+       draw(renderer, &vs, count);
+}
+
+void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
+{
        if(manager)
        {
                manager->resource_used(*this);
@@ -167,35 +136,21 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
                        return;
        }
 
-       renderer.set_vertex_setup(&vs);
+       renderer.set_vertex_setup(vs ? vs : &vtx_setup);
        renderer.set_winding_test(winding);
 
-       for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               renderer.draw_instanced(*i, count);
-}
-
-void Mesh::bind() const
-{
-       /* If VAOs are not supported, vtx_setup is zero and set_current won't get
-       called.  Thus unbind won't try to call a null function either. */
-       if(!vtx_setup)
+       if(!count)
        {
-               unbind();
-               vertices.apply();
+               for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+                       renderer.draw(*i);
        }
-       else if(set_current(this))
+       else
        {
-               vtx_setup->bind();
-               vertices.refresh();
+               for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+                       renderer.draw_instanced(*i, count);
        }
 }
 
-void Mesh::unbind()
-{
-       if(set_current(0))
-               VertexSetup::unbind();
-}
-
 Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 {
        return new AsyncLoader(*this, io);
@@ -240,9 +195,9 @@ void Mesh::Loader::vertices(const vector<VertexComponent> &c)
        for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
                fmt = (fmt, *i);
        obj.vertices.reset(fmt);
-       if(obj.vtx_setup)
+       if(obj.vbuf)
                // Set it again to force the vertex setup to update
-               obj.vtx_setup->set_vertex_array(obj.vertices);
+               obj.vtx_setup.set_vertex_array(obj.vertices);
        load_sub(obj.vertices);
 }