Don't bother with clearing winding test

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 572ac6195502afc97259a45857d94998c666fa4d..f8a7bcb215d8c5fd0bce934d23ddd16b7e8ea48d 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -9,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;
 }
 
@@ -34,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();
@@ -62,11 +74,8 @@ float *Mesh::modify_vertex(unsigned i)
 
 void Mesh::add_batch(const Batch &b)
 {
-       if(defer_ibuf)
-       {
-               ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-               defer_ibuf = false;
-       }
+       if(defer_buffers)
+               create_buffers();
 
        if(!batches.empty() && batches.back().can_append(b.get_type()))
                batches.back().append(b);
@@ -101,14 +110,12 @@ 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);
 
        for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
                renderer.draw(*i);
-
-       renderer.set_winding_test(0);
 }