X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=33481a1cdfc8c613692f36de60e667e8413ed698;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=385b4697085f6215e075344ac9a980007212e193;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index 385b4697..33481a1c 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -7,7 +7,7 @@ Distributed under the LGPL
 
 #include "batch.h"
 #include "extension.h"
-#include "version_1_2.h"
+#include "vertexarray.h"
 
 using namespace std;
 
@@ -18,9 +18,7 @@ Batch::Batch(PrimitiveType t):
 	type(t),
 	min_index(0),
 	max_index(0)
-{
-	require_version(1, 2);
-}
+{ }
 
 Batch &Batch::append(uint i)
 {
@@ -45,19 +43,24 @@ void Batch::append(const vector<uint> &ind)
 
 void Batch::draw() const
 {
-	glDrawRangeElements(type, min_index, max_index, indices.size(), GL_UNSIGNED_INT, &indices[0]);
+	draw_range_elements(type, min_index, max_index, indices.size(), &indices[0]);
+}
+
+void Batch::draw_with_buffer(unsigned offset) const
+{
+	draw_range_elements(type, min_index, max_index, indices.size(), (unsigned *)0+offset);
 }
 
 
 Batch::Loader::Loader(Batch &b):
-	batch(b)
+	DataFile::ObjectLoader<Batch>(b)
 {
 	add("indices", &Loader::indices);
 }
 
 void Batch::Loader::indices(const vector<uint> &ind)
 {
-	batch.append(ind);
+	obj.append(ind);
 }
 
 } // namespace GL