X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=56c25efb592e990e7438eae5932c53b4b9af7b72;hb=HEAD;hp=4fb2720df4cb9f2dcc27fa05de4f7bdc9fdd9597;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git diff --git a/source/core/batch.cpp b/source/core/batch.cpp index 4fb2720d..56c25efb 100644 --- a/source/core/batch.cpp +++ b/source/core/batch.cpp @@ -47,8 +47,7 @@ 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); } @@ -70,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) @@ -78,7 +87,7 @@ Batch &Batch::append(unsigned i) append_index(i); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -93,7 +102,7 @@ Batch &Batch::append(const vector &ind) append_index(i); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -142,7 +151,7 @@ Batch &Batch::append(const Batch &other) append_index(other.get_index(i)); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -176,6 +185,7 @@ Batch::Loader::Loader(Batch &b): DataFile::ObjectLoader(b) { add("indices", &Loader::indices); + add("patch_size", &Loader::patch_size); } void Batch::Loader::indices(const vector &ind) @@ -183,5 +193,10 @@ void Batch::Loader::indices(const vector &ind) obj.append(ind); } +void Batch::Loader::patch_size(unsigned s) +{ + obj.set_patch_size(s); +} + } // namespace GL } // namespace Msp