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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index e9015365..b5535039 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -114,41 +114,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 +124,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 +136,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 *)