Style update: add spaces around assignment operators

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 4e671e037e6352e3617c1c474b7e8ecb02eac454..d421769abc257a775d53a4b0c73909cd92c36abb 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,21 +14,92 @@ namespace Msp {
 namespace GL {
 
 Mesh::Mesh():
-       vertices(NODATA)
+       vertices(VERTEX3),
+       ibuf(0)
+{ }
+
+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)
 {
-       vertices.use_vertex_buffer();
+       return vertices[i];
+}
+
+void Mesh::add_batch(const Batch &b)
+{
+       batches.push_back(b);
+       update_index_buffer();
+}
+
+void Mesh::clear()
+{
+       vertices.clear();
+       batches.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();
 }
 
 
 Mesh::Loader::Loader(Mesh &m):
-       mesh(m)
+       DataFile::ObjectLoader<Mesh>(m)
 {
        add("vertices", &Loader::vertices);
        add("batch",    &Loader::batch);
@@ -35,14 +107,14 @@ Mesh::Loader::Loader(Mesh &m):
 
 void Mesh::Loader::vertices(VertexFormat f)
 {
-       mesh.vertices.reset(f);
-       load_sub(mesh.vertices);
+       obj.vertices.reset(f);
+       load_sub(obj.vertices);
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
 {
-       mesh.batches.push_back(Batch(p));
-       load_sub(mesh.batches.back());
+       obj.batches.push_back(Batch(p));
+       load_sub(obj.batches.back());
 }
 
 } // namespace GL