X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=8807b2c539c983e61de11628627d5b6392986b7c;hb=759612fd66034135c13134ffb8199514204b9684;hp=785fca826ae30e5c9c524b0a2f08a242a2aad15f;hpb=7d6b7b18221e670810bdd0505995b8f1fa012eb4;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index 785fca82..8807b2c5 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -96,25 +96,7 @@ void Batch::set_data_type(DataType t)
 
 Batch &Batch::append(unsigned i)
 {
-	if(data.empty())
-		min_index = max_index = i;
-	else
-	{
-		min_index = min(min_index, i);
-		max_index = max(max_index, i);
-	}
-
-	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-		set_data_type(UNSIGNED_INT);
-	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-		set_data_type(UNSIGNED_SHORT);
-
-	if(data_type==UNSIGNED_SHORT)
-		::append<unsigned short>(data, i);
-	else if(data_type==UNSIGNED_INT)
-		::append<unsigned>(data, i);
-	else
-		data.push_back(i);
+	append_index(i);
 	
 	update_offset();
 	dirty = true;
@@ -127,57 +109,37 @@ void Batch::append(const vector<unsigned> &ind)
 	if(ind.empty())
 		return;
 
-	if(data.empty())
-		min_index = max_index = ind.front();
-
+	data.reserve(data.size()+ind.size()*get_index_size());
 	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-	{
-		min_index = min(min_index, *i);
-		max_index = max(max_index, *i);
-	}
+		append_index(*i);
 
-	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-		set_data_type(UNSIGNED_INT);
-	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-		set_data_type(UNSIGNED_SHORT);
+	update_offset();
+	dirty = true;
+}
 
-	unsigned base = data.size();
-	data.resize(data.size()+ind.size()*get_index_size());
-	if(data_type==UNSIGNED_SHORT)
-	{
-		unsigned short *ptr = reinterpret_cast<unsigned short *>(&data[base]);
-		for(unsigned i=0; i<ind.size(); ++i)
-			ptr[i] = ind[i];
-	}
-	else if(data_type==UNSIGNED_INT)
-	{
-		unsigned *ptr = reinterpret_cast<unsigned *>(&data[base]);
-		for(unsigned i=0; i<ind.size(); ++i)
-			ptr[i] = ind[i];
-	}
+bool Batch::can_append(PrimitiveType other_type)
+{
+	if(other_type!=prim_type)
+		return false;
+	else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+		return NV_primitive_restart;
 	else
-	{
-		for(unsigned i=0; i<ind.size(); ++i)
-			data[base+i] = ind[i];
-	}
-	dirty = true;
+		return true;
 }
 
 void Batch::append(const Batch &other)
 {
 	if(other.prim_type!=prim_type)
 		throw invalid_argument("Batch::append");
-	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP)
-		throw incompatible_data("Batch::append");
-	else if(prim_type==POLYGON)
-		throw incompatible_data("Batch::append");
-	else if(prim_type==TRIANGLE_FAN)
+	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
 		static Require _req(NV_primitive_restart);
 
 	if(other.data.empty())
 		return;
 
-	if(NV_primitive_restart)
+	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+		;
+	else if(NV_primitive_restart)
 	{
 		restart = true;
 		if(data_type==UNSIGNED_SHORT)
@@ -204,7 +166,33 @@ void Batch::append(const Batch &other)
 
 	unsigned count = other.size();
 	for(unsigned i=0; i<count; ++i)
-		append(other.get_index(i));
+		append_index(other.get_index(i));
+
+	update_offset();
+	dirty = true;
+}
+
+void Batch::append_index(unsigned i)
+{
+	if(data.empty())
+		min_index = max_index = i;
+	else
+	{
+		min_index = min(min_index, i);
+		max_index = max(max_index, i);
+	}
+
+	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
+		set_data_type(UNSIGNED_INT);
+	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
+		set_data_type(UNSIGNED_SHORT);
+
+	if(data_type==UNSIGNED_SHORT)
+		::append<unsigned short>(data, i);
+	else if(data_type==UNSIGNED_INT)
+		::append<unsigned>(data, i);
+	else
+		data.push_back(i);
 }
 
 void Batch::upload_data() const
@@ -251,7 +239,7 @@ void Batch::draw() const
 			restart_index = index;
 		}
 	}
-	else if(restart_index && restart_index<max_index)
+	else if(restart_index && restart_index<=max_index)
 	{
 		glDisableClientState(GL_PRIMITIVE_RESTART_NV);
 		restart_index = 0;