X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.h;h=6fb013af68e8de626757392a2e4644d9c734d2d8;hb=344dd6a52b55d847f3346e94ec266a8864764b9d;hp=696891ba3047ce1a557c9f36ddeee64b82c17882;hpb=c48cb5362edb16c33ed5f6862a908bb9a754c85a;p=libs%2Fgl.git

diff --git a/source/batch.h b/source/batch.h
index 696891ba..6fb013af 100644
--- a/source/batch.h
+++ b/source/batch.h
@@ -1,15 +1,9 @@
-/* $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/objectloader.h>
+#include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 
@@ -26,7 +20,7 @@ the Batch.
 This is a pretty low-level class and mainly intended to be used by the Mesh
 class.
 */
-class Batch
+class Batch: public Bufferable
 {
 public:
 	class Loader: public DataFile::ObjectLoader<Batch>
@@ -39,16 +33,11 @@ public:
 
 private:
 	PrimitiveType prim_type;
-	DataType data_type;
-	std::vector<unsigned char> data;
+	DataType index_type;
+	std::vector<UInt8> 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;
 
@@ -57,33 +46,32 @@ public:
 	~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> &);
-	void append(const Batch &);
-	unsigned size() const { return data.size()/get_index_size(); }
-	unsigned get_index(unsigned) const;
-	void draw() const;
+	void set_index_type(DataType);
+	DataType get_index_type() const { return index_type; }
 
+	DEPRECATED void set_data_type(DataType t) { set_index_type(t); }
+	DEPRECATED DataType get_data_type() const { return index_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(); }
 
-	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;
+	unsigned get_index(unsigned) const;
 
-	void unlink_from_ibuf();
-	void update_ibuf_offsets();
+	void draw() const;
+	void draw_instanced(unsigned) const;
+private:
+	const void *setup_draw() const;
+	static void set_restart_index(unsigned);
 };
 
 } // namespace GL