X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.h;h=2b907d4846bc0032e51f1160678b48d779a6350f;hb=020811d96d5c823686e5c2b0a392b95d1a321f05;hp=6950af894898b93bc576df783a7c9cb857635ac4;hpb=c6c4fc39952e372eba1f44f2bc504428140f3d0e;p=libs%2Fgl.git

diff --git a/source/batch.h b/source/batch.h
index 6950af89..2b907d48 100644
--- a/source/batch.h
+++ b/source/batch.h
@@ -9,9 +9,8 @@ Distributed under the LGPL
 #define MSP_GL_BATCH_H_
 
 #include <vector>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "primitivetype.h"
-#include "types.h"
 
 namespace Msp {
 namespace GL {
@@ -19,29 +18,28 @@ namespace GL {
 class Batch
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Batch>
 	{
 	public:
 		Loader(Batch &);
 	private:
-		Batch &batch;
-
-		void indices(const std::vector<uint> &);
+		void indices(const std::vector<unsigned> &);
 	};
 
 private:
 	PrimitiveType type;
-	std::vector<uint> indices;
-	uint min_index;
-	uint max_index;
+	std::vector<unsigned> indices;
+	unsigned min_index;
+	unsigned max_index;
 
 public:
 	Batch(PrimitiveType t);
-	Batch &append(uint);
-	void append(const std::vector<uint> &);
+
+	Batch &append(unsigned);
+	void append(const std::vector<unsigned> &);
 	PrimitiveType get_type() const { return type; }
 	unsigned size() const { return indices.size(); }
-	const std::vector<uint> &get_indices() const { return indices; }
+	const std::vector<unsigned> &get_indices() const { return indices; }
 	void draw() const;
 	void draw_with_buffer(unsigned) const;
 };