X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=56c25efb592e990e7438eae5932c53b4b9af7b72;hb=cdefdb4b0f94613c2b41757fb33ae155efa9a205;hp=9639a3207e4b71bc265520fd9a5f096357d8361c;hpb=66e4a4d23d114e49743af89e06dee8bdc6f1fbde;p=libs%2Fgl.git

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 9639a320..56c25efb 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -47,16 +47,11 @@ namespace GL {
 Batch::Batch(PrimitiveType t):
 	BatchBackend(t),
 	prim_type(t),
-	index_type(VOID),
-	max_index(0)
+	index_type(VOID)
 {
 	set_index_type(UNSIGNED_SHORT);
 }
 
-Batch::~Batch()
-{
-}
-
 void Batch::set_index_type(DataType t)
 {
 	if(t==index_type)
@@ -74,7 +69,17 @@ void Batch::set_index_type(DataType t)
 	index_type = t;
 	BatchBackend::set_index_type(t);
 	update_offset();
-	dirty = true;
+	mark_dirty();
+}
+
+void Batch::set_patch_size(unsigned s)
+{
+	if(prim_type!=PATCHES)
+		throw invalid_operation("Batch::set_patch_size");
+	if(s<1)
+		throw invalid_argument("Batch::set_patch_size");
+
+	patch_size = s;
 }
 
 Batch &Batch::append(unsigned i)
@@ -82,7 +87,7 @@ Batch &Batch::append(unsigned i)
 	append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -97,7 +102,7 @@ Batch &Batch::append(const vector<unsigned> &ind)
 		append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -146,7 +151,7 @@ Batch &Batch::append(const Batch &other)
 		append_index(other.get_index(i));
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -167,11 +172,6 @@ void Batch::append_index(unsigned i)
 		::append<uint16_t>(data, i);
 }
 
-size_t Batch::get_index_size() const
-{
-	return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
-}
-
 unsigned Batch::get_index(size_t i) const
 {
 	if(index_type==UNSIGNED_INT)
@@ -185,6 +185,7 @@ Batch::Loader::Loader(Batch &b):
 	DataFile::ObjectLoader<Batch>(b)
 {
 	add("indices", &Loader::indices);
+	add("patch_size", &Loader::patch_size);
 }
 
 void Batch::Loader::indices(const vector<unsigned> &ind)
@@ -192,5 +193,10 @@ void Batch::Loader::indices(const vector<unsigned> &ind)
 	obj.append(ind);
 }
 
+void Batch::Loader::patch_size(unsigned s)
+{
+	obj.set_patch_size(s);
+}
+
 } // namespace GL
 } // namespace Msp