X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbatch.cpp;h=a59fad99f03b988309ef60042324df71ebf3c6ab;hp=741d5a49413f5f2f0538e710ffe0148aa497de25;hb=f50822b9e73a6ecdacbc4af4c4d9aba435a72386;hpb=eb6a546dcffc1b67f0a23d8b075fbdc86a2872a0

diff --git a/source/batch.cpp b/source/batch.cpp
index 741d5a49..a59fad99 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -103,10 +103,10 @@ Batch &Batch::append(unsigned i)
 	return *this;
 }
 
-void Batch::append(const vector<unsigned> &ind)
+Batch &Batch::append(const vector<unsigned> &ind)
 {
 	if(ind.empty())
-		return;
+		return *this;
 
 	data.reserve(data.size()+ind.size()*get_index_size());
 	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
@@ -114,6 +114,8 @@ void Batch::append(const vector<unsigned> &ind)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
@@ -126,7 +128,7 @@ bool Batch::can_append(PrimitiveType other_type)
 		return true;
 }
 
-void Batch::append(const Batch &other)
+Batch &Batch::append(const Batch &other)
 {
 	if(other.prim_type!=prim_type)
 		throw invalid_argument("Batch::append");
@@ -141,7 +143,7 @@ void Batch::append(const Batch &other)
 	}
 
 	if(other.data.empty())
-		return;
+		return *this;
 
 	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
 		;
@@ -176,6 +178,8 @@ void Batch::append(const Batch &other)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 void Batch::append_index(unsigned i)
@@ -221,6 +225,17 @@ unsigned Batch::get_index(unsigned i) const
 }
 
 void Batch::draw() const
+{
+	BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
+	const void *data_ptr = setup_draw();
+
+	if(EXT_draw_range_elements)
+		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
+	else
+		glDrawElements(prim_type, size(), data_type, data_ptr);
+}
+
+const void *Batch::setup_draw() const
 {
 	if(restart)
 	{
@@ -238,23 +253,15 @@ void Batch::draw() const
 	else if(restart_index && restart_index<=max_index)
 		set_restart_index(0);
 
-	Buffer *ibuf = get_buffer();
-	const void *data_ptr;
-	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-	if(ibuf)
+	if(get_buffer())
 	{
 		if(dirty)
 			update_buffer();
 
-		data_ptr = reinterpret_cast<const void *>(get_offset());
+		return reinterpret_cast<const void *>(get_offset());
 	}
 	else
-		data_ptr = &data[0];
-
-	if(EXT_draw_range_elements)
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
-	else
-		glDrawElements(prim_type, size(), data_type, data_ptr);
+		return &data[0];
 }
 
 void Batch::set_restart_index(unsigned index)