X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=371b38b4894a96935cbd2c75326e790e38e45ce6;hp=ea14d590b3012815526247555a4d4a2c74d473d1;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=d40673bd28c4b4524d3642b949d9d109dc6f9f24

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index ea14d590..371b38b4 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -31,7 +31,7 @@ void Mesh::init(ResourceManager *rm)
 	ibuf = 0;
 	dirty = 0;
 	disallow_rendering = false;
-	winding = 0;
+	face_winding = NON_MANIFOLD;
 
 	if(rm)
 		set_manager(rm);
@@ -68,7 +68,7 @@ void Mesh::check_buffers(unsigned mask)
 		if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()<req_size))
 		{
 			delete vbuf;
-			vbuf = new Buffer(ARRAY_BUFFER);
+			vbuf = new Buffer;
 			vertices.use_buffer(vbuf);
 			vtx_setup.set_vertex_array(vertices);
 			dirty |= VERTEX_BUFFER;
@@ -86,10 +86,9 @@ void Mesh::check_buffers(unsigned mask)
 		if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()<req_size))
 		{
 			delete ibuf;
-			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+			ibuf = new Buffer;
 			if(!batches.empty())
 				batches.front().change_buffer(ibuf);
-			vtx_setup.set_index_buffer(*ibuf);
 			dirty |= INDEX_BUFFER;
 
 #ifdef DEBUG
@@ -97,6 +96,9 @@ void Mesh::check_buffers(unsigned mask)
 				vbuf->set_debug_name(debug_name+" [IBO]");
 #endif
 		}
+
+		if(!batches.empty())
+			vtx_setup.set_index_buffer(*ibuf, batches.front().get_index_type());
 	}
 }
 
@@ -105,7 +107,7 @@ unsigned Mesh::get_n_vertices() const
 	return vertices.size();
 }
 
-float *Mesh::modify_vertex(unsigned i)
+char *Mesh::modify_vertex(unsigned i)
 {
 	if(vertices.get_format().empty())
 		throw invalid_operation("Mesh::modify_vertex");
@@ -127,7 +129,7 @@ void Mesh::add_batch(const Batch &b)
 		bool reallocate = (batches.size()==batches.capacity());
 		if(reallocate)
 		{
-			for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
+			for(auto i=batches.end(); i!=batches.begin(); )
 				(--i)->use_buffer(0);
 		}
 
@@ -136,22 +138,35 @@ void Mesh::add_batch(const Batch &b)
 		if(reallocate)
 		{
 			prev = 0;
-			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
+			for(Batch &a: batches)
 			{
-				i->use_buffer(ibuf, prev);
-				prev = &*i;
+				a.use_buffer(ibuf, prev);
+				prev = &a;
 			}
 		}
 		else
 			batches.back().use_buffer(ibuf, prev);
 	}
 
+	DataType existing_type = batches.front().get_index_type();
+	DataType added_type = batches.back().get_index_type();
+	if(existing_type!=added_type)
+	{
+		if(get_type_size(existing_type)>get_type_size(added_type))
+			batches.back().set_index_type(existing_type);
+		else
+		{
+			for(Batch &a: batches)
+				a.set_index_type(added_type);
+		}
+	}
+
 	check_buffers(INDEX_BUFFER);
 }
 
-void Mesh::set_winding(const WindingTest *w)
+void Mesh::set_winding(FaceWinding w)
 {
-	winding = w;
+	face_winding = w;
 }
 
 void Mesh::draw(Renderer &renderer) const
@@ -183,17 +198,17 @@ void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
 		resize_buffers();
 
 	renderer.set_vertex_setup(vs ? vs : &vtx_setup);
-	renderer.set_winding_test(winding);
+	renderer.set_front_face(face_winding);
 
 	if(!count)
 	{
-		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-			renderer.draw(*i);
+		for(const Batch &b: batches)
+			renderer.draw(b);
 	}
 	else
 	{
-		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-			renderer.draw_instanced(*i, count);
+		for(const Batch &b: batches)
+			renderer.draw_instanced(b, count);
 	}
 }
 
@@ -211,9 +226,9 @@ Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 	return new AsyncLoader(*this, io);
 }
 
-UInt64 Mesh::get_data_size() const
+uint64_t Mesh::get_data_size() const
 {
-	UInt64 size = 0;
+	uint64_t size = 0;
 	if(vbuf)
 		size += vbuf->get_size();
 	if(ibuf)
@@ -256,17 +271,17 @@ Mesh::Loader::Loader(Mesh &m, bool g):
 	add("storage",  &Loader::storage);
 	add("vertices", &Loader::vertices);
 	add("vertices", &Loader::vertices_with_format);
-	add("winding",  &Loader::winding);
+	add("winding",  &Mesh::face_winding);
 }
 
-void Mesh::Loader::storage(const vector<VertexAttribute> &a)
+void Mesh::Loader::storage(const vector<VertexAttribute> &attrs)
 {
-	if(a.empty())
+	if(attrs.empty())
 		throw invalid_argument("No vertex attributes");
 
 	VertexFormat fmt;
-	for(vector<VertexAttribute>::const_iterator i=a.begin(); i!=a.end(); ++i)
-		fmt = (fmt, *i);
+	for(VertexAttribute a: attrs)
+		fmt = (fmt, a);
 	obj.storage(fmt);
 }
 
@@ -290,14 +305,6 @@ void Mesh::Loader::batch(PrimitiveType p)
 	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();
-}
-
 
 Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 	mesh(m),