X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=508054a521346ac45e394848fb0c7ec11f0fe799;hb=43c6495ff3d14a85ee5de169a80fdacf13b7147e;hp=c5e73ebd2afd625cda3d1d4041e8b7bd03145ed5;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index c5e73ebd..508054a5 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,6 +1,6 @@
 #include "buffer.h"
-#include "extension.h"
 #include "mesh.h"
+#include "nv_primitive_restart.h"
 #include "renderer.h"
 
 using namespace std;
@@ -69,7 +69,7 @@ void Mesh::add_batch(const Batch &b)
 		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")));
+			(type!=TRIANGLE_FAN || NV_primitive_restart));
 	}
 
 	if(defer_ibuf)
@@ -85,7 +85,7 @@ void Mesh::add_batch(const Batch &b)
 		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 +130,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);
 }