X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.h;h=d42a8629d1a47df3be7ba8a5ea0eeefa68fad52b;hb=61c8b6e824977ce025c979005b141ff4bb02b0e9;hp=0ce4ecf14e41f9214023f0c631081edf230e13e5;hpb=98cc25ffe956bc162c053c96df659ba40dfe2d6e;p=libs%2Fgl.git

diff --git a/source/batch.h b/source/batch.h
index 0ce4ecf1..d42a8629 100644
--- a/source/batch.h
+++ b/source/batch.h
@@ -34,7 +34,7 @@ public:
 private:
 	PrimitiveType prim_type;
 	DataType data_type;
-	std::vector<unsigned char> data;
+	std::vector<UInt8> data;
 	unsigned min_index;
 	unsigned max_index;
 	bool restart;
@@ -50,13 +50,14 @@ public:
 	DataType get_data_type() const { return data_type; }
 
 	Batch &append(unsigned);
-	void append(const std::vector<unsigned> &);
+	Batch &append(const std::vector<unsigned> &);
 	bool can_append(PrimitiveType);
-	void append(const Batch &);
+	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(); }
@@ -64,6 +65,10 @@ public:
 	unsigned get_index(unsigned) const;
 
 	void draw() const;
+	void draw_instanced(unsigned) const;
+private:
+	const void *setup_draw() const;
+	static void set_restart_index(unsigned);
 };
 
 } // namespace GL