Remove vertex array tracking from Renderer

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 9757df5cc9e20f364ff96880f115b1707a1f8f5e..07eaa68962a8952da9c4fa3f3e482a85c55d90dc 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,6 +1,5 @@
 #include "buffer.h"
 #include "mesh.h"
-#include "nv_primitive_restart.h"
 #include "renderer.h"
 
 using namespace std;
@@ -10,20 +9,23 @@ namespace GL {
 
 Mesh::Mesh():
        vertices(VERTEX3),
+       vbuf(0),
        ibuf(0),
-       defer_ibuf(true),
+       defer_buffers(true),
        winding(0)
 { }
 
 Mesh::Mesh(const VertexFormat &f):
        vertices(f),
+       vbuf(0),
        ibuf(0),
-       defer_ibuf(true),
+       defer_buffers(true),
        winding(0)
 { }
 
 Mesh::~Mesh()
 {
+       delete vbuf;
        delete ibuf;
 }
 
@@ -35,22 +37,31 @@ void Mesh::clear()
 
 void Mesh::use_buffers(bool b)
 {
+       defer_buffers = false;
        if(b)
-       {
-               vertices.use_vertex_buffer();
-               if(!ibuf)
-                       ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-               defer_ibuf = false;
-       }
+               create_buffers();
        else
        {
                vertices.use_vertex_buffer(0);
+               delete vbuf;
+               vbuf = 0;
                delete ibuf;
                ibuf = 0;
-               defer_ibuf = false;
        }
 }
 
+void Mesh::create_buffers()
+{
+       defer_buffers = false;
+
+       if(!vbuf)
+               vbuf = new Buffer(ARRAY_BUFFER);
+       vertices.use_vertex_buffer(vbuf);
+
+       if(!ibuf)
+               ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+}
+
 unsigned Mesh::get_n_vertices() const
 {
        return vertices.size();
@@ -63,29 +74,17 @@ float *Mesh::modify_vertex(unsigned i)
 
 void Mesh::add_batch(const Batch &b)
 {
-       bool can_append = false;
-       if(!batches.empty())
-       {
-               PrimitiveType type = b.get_type();
-               can_append = (type==batches.back().get_type() &&
-                       type!=LINE_STRIP && type!=LINE_LOOP && type!=POLYGON &&
-                       (type!=TRIANGLE_FAN || NV_primitive_restart));
-       }
-
-       if(defer_ibuf)
-       {
-               ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-               defer_ibuf = false;
-       }
+       if(defer_buffers)
+               create_buffers();
 
-       if(can_append)
+       if(!batches.empty() && batches.back().can_append(b.get_type()))
                batches.back().append(b);
        else
        {
                Batch *prev = (batches.empty() ? 0 : &batches.back());
                batches.push_back(b);
                if(ibuf)
-                       batches.back().use_index_buffer(ibuf, prev);
+                       batches.back().use_buffer(ibuf, prev);
        }
 }
 
@@ -111,7 +110,7 @@ void Mesh::draw() const
 
 void Mesh::draw(Renderer &renderer) const
 {
-       renderer.set_vertex_array(&vertices);
+       vertices.apply();
        renderer.set_element_buffer(ibuf);
        renderer.set_winding_test(winding);
 
@@ -130,9 +129,15 @@ Mesh::Loader::Loader(Mesh &m):
        add("winding",  &Loader::winding);
 }
 
-void Mesh::Loader::vertices(VertexFormat f)
+void Mesh::Loader::vertices(const vector<VertexComponent> &c)
 {
-       obj.vertices.reset(f);
+       if(c.empty())
+               throw invalid_argument("No vertex components");
+
+       VertexFormat fmt;
+       for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
+               fmt = (fmt, *i);
+       obj.vertices.reset(fmt);
        load_sub(obj.vertices);
 }