X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=8f7911219ec68afa3cb9048d35960bef3462437c;hb=76ca3c65dbb96461e42300016a85a4e158f5596b;hp=e901536535cd04716d973594200700cb8829807a;hpb=e65e7dabfc1d3b2c87345df75fc942fb1fe47581;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index e9015365..8f791121 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -79,33 +79,35 @@ void Mesh::add_batch(const Batch &b)
 {
 	create_buffers();
 
-	if(!batches.empty() && batches.back().can_append(b.get_type()))
+	if(batches.empty())
+	{
+		batches.push_back(b);
+		batches.back().use_buffer(ibuf);
+	}
+	else if(batches.back().can_append(b.get_type()))
 		batches.back().append(b);
 	else
 	{
 		bool reallocate = (batches.size()==batches.capacity());
-		if(reallocate && ibuf)
+		if(reallocate)
 		{
 			for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
 				(--i)->use_buffer(0);
 		}
 
-		Batch *prev = (batches.empty() ? 0 : &batches.back());
+		Batch *prev = &batches.back();
 		batches.push_back(b);
-		if(ibuf)
+		if(reallocate)
 		{
-			if(reallocate)
+			prev = 0;
+			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
 			{
-				prev = 0;
-				for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
-				{
-					i->use_buffer(ibuf, prev);
-					prev = &*i;
-				}
+				i->use_buffer(ibuf, prev);
+				prev = &*i;
 			}
-			else
-				batches.back().use_buffer(ibuf, prev);
 		}
+		else
+			batches.back().use_buffer(ibuf, prev);
 	}
 }
 
@@ -114,41 +116,9 @@ void Mesh::set_winding(const WindingTest *w)
 	winding = w;
 }
 
-void Mesh::draw() const
-{
-	const Mesh *cur = current();
-	if(cur && cur!=this)
-		throw invalid_operation("Mesh::draw");
-
-	if(manager)
-	{
-		manager->resource_used(*this);
-		if(disallow_rendering)
-			return;
-	}
-
-	BindRestore bind_vtxs(vtx_setup);
-	BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-	Bind bind_winding(winding);
-
-	for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		i->draw();
-}
-
 void Mesh::draw(Renderer &renderer) const
 {
-	if(manager)
-	{
-		manager->resource_used(*this);
-		if(disallow_rendering)
-			return;
-	}
-
-	renderer.set_mesh(this);
-	renderer.set_winding_test(winding);
-
-	for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		renderer.draw(*i);
+	draw(renderer, 0, 0);
 }
 
 void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned count) const
@@ -156,6 +126,11 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
 	if(vs.get_vertex_array()!=&vertices)
 		throw invalid_argument("Mesh::draw_instanced");
 
+	draw(renderer, &vs, count);
+}
+
+void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
+{
 	if(manager)
 	{
 		manager->resource_used(*this);
@@ -163,26 +138,19 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
 			return;
 	}
 
-	renderer.set_vertex_setup(&vs);
+	renderer.set_vertex_setup(vs ? vs : &vtx_setup);
 	renderer.set_winding_test(winding);
 
-	for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		renderer.draw_instanced(*i, count);
-}
-
-void Mesh::bind() const
-{
-	if(set_current(this))
+	if(!count)
 	{
-		vtx_setup.bind();
-		vertices.refresh();
+		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+			renderer.draw(*i);
+	}
+	else
+	{
+		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+			renderer.draw_instanced(*i, count);
 	}
-}
-
-void Mesh::unbind()
-{
-	if(set_current(0))
-		VertexSetup::unbind();
 }
 
 Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)