X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=572ac6195502afc97259a45857d94998c666fa4d;hb=27fe0982fc18d1f5f9efe942e18c42f508268f34;hp=c5e73ebd2afd625cda3d1d4041e8b7bd03145ed5;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index c5e73ebd..572ac619 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,5 +1,4 @@
 #include "buffer.h"
-#include "extension.h"
 #include "mesh.h"
 #include "renderer.h"
 
@@ -63,29 +62,20 @@ float *Mesh::modify_vertex(unsigned i)
 
 void Mesh::add_batch(const Batch &b)
 {
-	bool can_append = false;
-	if(!batches.empty())
-	{
-		PrimitiveType type = b.get_type();
-		can_append = (type==batches.back().get_type() &&
-			type!=LINE_STRIP && type!=LINE_LOOP && type!=POLYGON &&
-			(type!=TRIANGLE_FAN || is_supported("GL_NV_primitive_restart")));
-	}
-
 	if(defer_ibuf)
 	{
 		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
 		defer_ibuf = false;
 	}
 
-	if(can_append)
+	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_index_buffer(ibuf, prev);
+			batches.back().use_buffer(ibuf, prev);
 	}
 }
 
@@ -130,9 +120,15 @@ Mesh::Loader::Loader(Mesh &m):
 	add("winding",  &Loader::winding);
 }
 
-void Mesh::Loader::vertices(VertexFormat f)
+void Mesh::Loader::vertices(const vector<VertexComponent> &c)
 {
-	obj.vertices.reset(f);
+	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);
 }