Generalize VertexBuffer into Buffer with support for other types as well

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 7f50beb7b61bc055bb1e905529e6f91c9535c1fe..d43e0d0efdd421b43b209c0e8f4f280d2529c895 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "buffer.h"
 #include "mesh.h"
 
 using namespace std;
@@ -13,24 +14,41 @@ namespace Msp {
 namespace GL {
 
 Mesh::Mesh():
-       vertices(VERTEX3)
+       vertices(VERTEX3),
+       ibuf(0)
 { }
 
-Mesh::Mesh(VertexFormat f):
-       vertices(f)
+Mesh::Mesh(const VertexFormat &f):
+       vertices(f),
+       ibuf(0)
 { }
 
 void Mesh::use_vertex_buffer(bool b)
 {
        if(b)
+       {
                vertices.use_vertex_buffer();
+               if(!ibuf)
+                       ibuf=new Buffer(ELEMENT_ARRAY_BUFFER);
+               update_index_buffer();
+       }
        else
+       {
                vertices.use_vertex_buffer(0);
+               delete ibuf;
+               ibuf=0;
+       }
+}
+
+float *Mesh::get_vertex(unsigned i)
+{
+       return vertices[i];
 }
 
 void Mesh::add_batch(const Batch &b)
 {
        batches.push_back(b);
+       update_index_buffer();
 }
 
 void Mesh::clear()
@@ -42,8 +60,41 @@ void Mesh::clear()
 void Mesh::draw() const
 {
        vertices.apply();
+       if(ibuf)
+       {
+               ibuf->bind();
+               unsigned offset=0;
+               for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+               {
+                       i->draw_with_buffer(offset);
+                       offset+=i->size();
+               }
+               ibuf->unbind();
+       }
+       else
+       {
+               for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+                       i->draw();
+       }
+}
+
+void Mesh::update_index_buffer()
+{
+       if(!ibuf)
+               return;
+
+       unsigned total=0;
+       for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+               total+=i->size();
+
+       ibuf->data(total*sizeof(unsigned), 0);
+       unsigned offset=0;
        for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               i->draw();
+       {
+               ibuf->sub_data(offset*sizeof(unsigned), i->size()*sizeof(unsigned), &i->get_indices()[0]);
+               offset+=i->size();
+       }
+       ibuf->unbind();
 }