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

diff --git a/source/batch.h b/source/batch.h
index 6950af89..10c61a28 100644
--- a/source/batch.h
+++ b/source/batch.h
@@ -1,49 +1,72 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_BATCH_H_
 #define MSP_GL_BATCH_H_
 
 #include <vector>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "bufferable.h"
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 
 namespace Msp {
 namespace GL {
 
-class Batch
+class Buffer;
+
+/**
+Stores primitive type and element indices for a single GL draw call.  Data
+type for indices is automatically chosen to accommodate the largest index in
+the Batch.
+
+This is a pretty low-level class and mainly intended to be used by the Mesh
+class.
+*/
+class Batch: public Bufferable
 {
 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;
+	PrimitiveType prim_type;
+	DataType data_type;
+	std::vector<unsigned char> data;
+	unsigned min_index;
+	unsigned max_index;
+	bool restart;
+
+	static unsigned restart_index;
 
 public:
 	Batch(PrimitiveType t);
-	Batch &append(uint);
-	void append(const std::vector<uint> &);
-	PrimitiveType get_type() const { return type; }
-	unsigned size() const { return indices.size(); }
-	const std::vector<uint> &get_indices() const { return indices; }
+	~Batch();
+
+	PrimitiveType get_type() const { return prim_type; }
+	void set_data_type(DataType);
+	DataType get_data_type() const { return data_type; }
+
+	Batch &append(unsigned);
+	Batch &append(const std::vector<unsigned> &);
+	bool can_append(PrimitiveType);
+	Batch &append(const Batch &);
+private:
+	void append_index(unsigned);
+	virtual unsigned get_data_size() const { return data.size(); }
+	virtual const void *get_data_pointer() const { return &data[0]; }
+	virtual unsigned get_alignment() const { return get_index_size(); }
+	unsigned get_index_size() const;
+public:
+	unsigned size() const { return data.size()/get_index_size(); }
+
+	unsigned get_index(unsigned) const;
+
 	void draw() const;
-	void draw_with_buffer(unsigned) const;
+private:
+	static void set_restart_index(unsigned);
 };
 
 } // namespace GL