X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=572ac6195502afc97259a45857d94998c666fa4d;hb=d7e7f87d173156aa12694ce54d688c40a2eabe2e;hp=8d039977e0ff2532992adce536a9a73a20f2256f;hpb=cea3c333797cadd9629aefaa5b82243173a02d16;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 8d039977..572ac619 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "buffer.h"
 #include "mesh.h"
+#include "renderer.h"
 
 using namespace std;
 
@@ -13,47 +8,143 @@ namespace Msp {
 namespace GL {
 
 Mesh::Mesh():
-	vertices(NODATA)
+	vertices(VERTEX3),
+	ibuf(0),
+	defer_ibuf(true),
+	winding(0)
+{ }
+
+Mesh::Mesh(const VertexFormat &f):
+	vertices(f),
+	ibuf(0),
+	defer_ibuf(true),
+	winding(0)
+{ }
+
+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;
+	}
+}
+
+unsigned Mesh::get_n_vertices() const
 {
-	vertices.use_vertex_buffer();
+	return vertices.size();
 }
 
-Mesh::Mesh(VertexFormat f):
-	vertices(f)
+float *Mesh::modify_vertex(unsigned i)
 {
-	vertices.use_vertex_buffer();
+	return vertices.modify(i);
 }
 
 void Mesh::add_batch(const Batch &b)
 {
-	batches.push_back(b);
+	if(defer_ibuf)
+	{
+		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+		defer_ibuf = false;
+	}
+
+	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_buffer(ibuf, prev);
+	}
+}
+
+void Mesh::set_winding(const WindingTest *w)
+{
+	winding = w;
 }
 
 void Mesh::draw() const
 {
 	vertices.apply();
+
+	if(ibuf)
+		ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+	Bind bind_winding(winding);
+
 	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);
+	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);
 }
 
 
 Mesh::Loader::Loader(Mesh &m):
-	mesh(m)
+	DataFile::ObjectLoader<Mesh>(m)
 {
-	add("vertices", &Loader::vertices);
 	add("batch",    &Loader::batch);
+	add("vertices", &Loader::vertices);
+	add("winding",  &Loader::winding);
 }
 
-void Mesh::Loader::vertices(VertexFormat f)
+void Mesh::Loader::vertices(const vector<VertexComponent> &c)
 {
-	mesh.vertices.reset(f);
-	load_sub(mesh.vertices);
+	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);
 }
 
 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);
+}
+
+void Mesh::Loader::winding(FaceWinding w)
+{
+	if(w==CLOCKWISE)
+		obj.winding = &WindingTest::clockwise();
+	else if(w==COUNTERCLOCKWISE)
+		obj.winding = &WindingTest::counterclockwise();
 }
 
 } // namespace GL