X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.h;h=696891ba3047ce1a557c9f36ddeee64b82c17882;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=2b907d4846bc0032e51f1160678b48d779a6350f;hpb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;p=libs%2Fgl.git

diff --git a/source/batch.h b/source/batch.h
index 2b907d48..696891ba 100644
--- a/source/batch.h
+++ b/source/batch.h
@@ -10,11 +10,22 @@ Distributed under the LGPL
 
 #include <vector>
 #include <msp/datafile/objectloader.h>
+#include "datatype.h"
 #include "primitivetype.h"
 
 namespace Msp {
 namespace GL {
 
+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:
@@ -27,21 +38,52 @@ public:
 	};
 
 private:
-	PrimitiveType type;
-	std::vector<unsigned> indices;
+	PrimitiveType prim_type;
+	DataType data_type;
+	std::vector<unsigned char> data;
 	unsigned min_index;
 	unsigned max_index;
+	bool restart;
+	Buffer *ibuf;
+	unsigned ibuf_offset;
+	Batch *next_in_ibuf;
+	Batch *prev_in_ibuf;
+	mutable bool dirty;
+
+	static unsigned restart_index;
 
 public:
 	Batch(PrimitiveType t);
+	~Batch();
 
+	PrimitiveType get_type() const { return prim_type; }
+	void set_data_type(DataType);
+	DataType get_data_type() const { return data_type; }
+	void use_index_buffer(Buffer *, Batch * = 0);
 	Batch &append(unsigned);
 	void append(const std::vector<unsigned> &);
-	PrimitiveType get_type() const { return type; }
-	unsigned size() const { return indices.size(); }
-	const std::vector<unsigned> &get_indices() const { return indices; }
+	void append(const Batch &);
+	unsigned size() const { return data.size()/get_index_size(); }
+	unsigned get_index(unsigned) const;
 	void draw() const;
-	void draw_with_buffer(unsigned) const;
+
+private:
+	unsigned get_index_size() const;
+
+	template<typename T>
+	void append_index(T);
+
+	template<typename T, typename U>
+	void expand_data();
+
+	template<typename T, typename U>
+	void shrink_data();
+
+	template<typename T, typename U>
+	U convert(T) const;
+
+	void unlink_from_ibuf();
+	void update_ibuf_offsets();
 };
 
 } // namespace GL