X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=dba8a9915489aede7906f8a684b9d59e288428b5;hp=c6543f01cee322bbaa465ea492b2cd15e800bb66;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=22f0f95981f17524587f5f2c5e3e91005240ddb7

diff --git a/source/mesh.cpp b/source/mesh.cpp
index c6543f01..dba8a991 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -29,6 +29,7 @@ void Mesh::init(ResourceManager *rm)
 {
 	vbuf = 0;
 	ibuf = 0;
+	dirty = 0;
 	disallow_rendering = false;
 	winding = 0;
 
@@ -39,6 +40,7 @@ void Mesh::init(ResourceManager *rm)
 Mesh::~Mesh()
 {
 	set_manager(0);
+	batches.clear();
 	delete vbuf;
 	delete ibuf;
 }
@@ -49,20 +51,34 @@ void Mesh::clear()
 	batches.clear();
 }
 
-void Mesh::create_buffers()
+void Mesh::check_buffers(unsigned mask)
 {
-	if(vbuf && ibuf)
-		return;
-
-	if(!vbuf)
-		vbuf = new Buffer(ARRAY_BUFFER);
-	vertices.use_buffer(vbuf);
-
-	if(!ibuf)
-		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+	if(mask&VERTEX_BUFFER)
+	{
+		unsigned req_size = vertices.get_required_buffer_size();
+		if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()<req_size))
+		{
+			delete vbuf;
+			vbuf = new Buffer(ARRAY_BUFFER);
+			vertices.use_buffer(vbuf);
+			vtx_setup.set_vertex_array(vertices);
+			dirty |= VERTEX_BUFFER;
+		}
+	}
 
-	vtx_setup.set_vertex_array(vertices);
-	vtx_setup.set_index_buffer(*ibuf);
+	if(mask&INDEX_BUFFER)
+	{
+		unsigned req_size = (batches.empty() ? 0 : batches.front().get_required_buffer_size());
+		if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()<req_size))
+		{
+			delete ibuf;
+			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+			if(!batches.empty())
+				batches.front().change_buffer(ibuf);
+			vtx_setup.set_index_buffer(*ibuf);
+			dirty |= INDEX_BUFFER;
+		}
+	}
 }
 
 unsigned Mesh::get_n_vertices() const
@@ -77,36 +93,39 @@ float *Mesh::modify_vertex(unsigned i)
 
 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);
+		if(ibuf)
+			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);
 	}
+
+	check_buffers(INDEX_BUFFER);
 }
 
 void Mesh::set_winding(const WindingTest *w)
@@ -116,18 +135,7 @@ void Mesh::set_winding(const WindingTest *w)
 
 void Mesh::draw(Renderer &renderer) const
 {
-	if(manager)
-	{
-		manager->resource_used(*this);
-		if(disallow_rendering)
-			return;
-	}
-
-	renderer.set_vertex_setup(&vtx_setup);
-	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
@@ -135,6 +143,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);
@@ -142,11 +155,31 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
 			return;
 	}
 
-	renderer.set_vertex_setup(&vs);
+	if(dirty)
+		resize_buffers();
+
+	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);
+	if(!count)
+	{
+		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::resize_buffers() const
+{
+	if(dirty&VERTEX_BUFFER)
+		vbuf->storage(vertices.get_required_buffer_size());
+	if(dirty&INDEX_BUFFER)
+		ibuf->storage(batches.front().get_required_buffer_size());
+	dirty = 0;
 }
 
 Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
@@ -176,8 +209,9 @@ void Mesh::unload()
 }
 
 
-Mesh::Loader::Loader(Mesh &m):
-	DataFile::ObjectLoader<Mesh>(m)
+Mesh::Loader::Loader(Mesh &m, bool g):
+	DataFile::ObjectLoader<Mesh>(m),
+	allow_gl_calls(g)
 {
 	add("batch",    &Loader::batch);
 	add("vertices", &Loader::vertices);
@@ -193,10 +227,12 @@ void Mesh::Loader::vertices(const vector<VertexComponent> &c)
 	for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
 		fmt = (fmt, *i);
 	obj.vertices.reset(fmt);
-	if(obj.vbuf)
-		// Set it again to force the vertex setup to update
-		obj.vtx_setup.set_vertex_array(obj.vertices);
 	load_sub(obj.vertices);
+	if(allow_gl_calls)
+	{
+		obj.check_buffers(VERTEX_BUFFER);
+		obj.vtx_setup.refresh();
+	}
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
@@ -223,7 +259,7 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 	phase(0)
 {
 	mesh.disallow_rendering = true;
-	mesh.create_buffers();
+	mesh.check_buffers(VERTEX_BUFFER|INDEX_BUFFER);
 }
 
 Mesh::AsyncLoader::~AsyncLoader()
@@ -244,11 +280,13 @@ bool Mesh::AsyncLoader::process()
 	{
 		// TODO use correct filename
 		DataFile::Parser parser(io, "async");
-		Loader loader(mesh);
+		Loader loader(mesh, false);
 		loader.load(parser);
 	}
 	else if(phase==1)
 	{
+		mesh.resize_buffers();
+		mesh.vtx_setup.refresh();
 		vertex_updater = mesh.vertices.refresh_async();
 		if(!mesh.batches.empty())
 			index_updater = mesh.batches.front().refresh_async();