X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=05be2c3745b8562b32f9c9b5a69e722fb4af5058;hb=25c81b4953dd38993250321b9407ce8b0139cbeb;hp=fec753d0d3938d157b93403cd47716539f30551c;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index fec753d0..05be2c37 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,11 +1,14 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "buffer.h"
+#include "extension.h"
 #include "mesh.h"
+#include "renderer.h"
 
 using namespace std;
 
@@ -13,42 +16,110 @@ namespace Msp {
 namespace GL {
 
 Mesh::Mesh():
-	vertices(NODATA)
+	vertices(VERTEX3),
+	ibuf(0),
+	defer_ibuf(true)
 { }
 
-Mesh::Mesh(VertexFormat f):
-	vertices(f)
+Mesh::Mesh(const VertexFormat &f):
+	vertices(f),
+	ibuf(0),
+	defer_ibuf(true)
 { }
 
-void Mesh::use_vertex_buffer(bool b)
+Mesh::~Mesh()
+{
+	delete ibuf;
+}
+
+void Mesh::clear()
+{
+	vertices.clear();
+	batches.clear();
+}
+
+void Mesh::use_buffers(bool b)
 {
 	if(b)
+	{
 		vertices.use_vertex_buffer();
+		if(!ibuf)
+			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+		defer_ibuf = false;
+	}
 	else
+	{
 		vertices.use_vertex_buffer(0);
+		delete ibuf;
+		ibuf = 0;
+		defer_ibuf = false;
+	}
 }
 
-void Mesh::add_batch(const Batch &b)
+unsigned Mesh::get_n_vertices() const
 {
-	batches.push_back(b);
+	return vertices.size();
 }
 
-void Mesh::clear()
+float *Mesh::modify_vertex(unsigned i)
 {
-	vertices.clear();
-	batches.clear();
+	return vertices.modify(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 || is_supported("GL_NV_primitive_restart")));
+	}
+
+	if(defer_ibuf)
+	{
+		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+		defer_ibuf = false;
+	}
+
+	if(can_append)
+		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);
+	}
 }
 
 void Mesh::draw() const
 {
 	vertices.apply();
+
+	if(ibuf)
+		ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+
 	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
 		i->draw();
+
+	if(ibuf)
+		Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+}
+
+void Mesh::draw(Renderer &renderer) const
+{
+	renderer.set_vertex_array(&vertices);
+	renderer.set_element_buffer(ibuf);
+
+	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+		renderer.draw(*i);
 }
 
 
 Mesh::Loader::Loader(Mesh &m):
-	mesh(m)
+	DataFile::ObjectLoader<Mesh>(m)
 {
 	add("vertices", &Loader::vertices);
 	add("batch",    &Loader::batch);
@@ -56,14 +127,15 @@ 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());
+	Batch btc(p);
+	load_sub(btc);
+	obj.add_batch(btc);
 }
 
 } // namespace GL