X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=c68beab908f8dc2a07c699a8b7bd6a9e41b5f35c;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=fa28e9564d569267b322f8fead7a0761258b8045;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index fa28e956..c68beab9 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -53,10 +53,6 @@ Batch::Batch(PrimitiveType t):
 	set_index_type(UNSIGNED_SHORT);
 }
 
-Batch::~Batch()
-{
-}
-
 void Batch::set_index_type(DataType t)
 {
 	if(t==index_type)
@@ -74,7 +70,7 @@ void Batch::set_index_type(DataType t)
 	index_type = t;
 	BatchBackend::set_index_type(t);
 	update_offset();
-	dirty = true;
+	mark_dirty();
 }
 
 Batch &Batch::append(unsigned i)
@@ -82,7 +78,7 @@ Batch &Batch::append(unsigned i)
 	append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -97,7 +93,7 @@ Batch &Batch::append(const vector<unsigned> &ind)
 		append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -106,7 +102,7 @@ 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)
+	else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
 		return check_restart(false);
 	else
 		return true;
@@ -116,7 +112,7 @@ Batch &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 || prim_type==TRIANGLE_FAN)
+	if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
 		check_restart(true);
 
 	if(other.data.empty())
@@ -146,7 +142,7 @@ Batch &Batch::append(const Batch &other)
 		append_index(other.get_index(i));
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -167,12 +163,7 @@ void Batch::append_index(unsigned i)
 		::append<uint16_t>(data, i);
 }
 
-unsigned Batch::get_index_size() const
-{
-	return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
-}
-
-unsigned Batch::get_index(unsigned i) const
+unsigned Batch::get_index(size_t i) const
 {
 	if(index_type==UNSIGNED_INT)
 		return *(uint32_t *)&data[i*sizeof(uint32_t)];