X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=4fb2720df4cb9f2dcc27fa05de4f7bdc9fdd9597;hb=53c15ccd0318a8f5428184eef19a350b6adf4c0c;hp=9192b6738c938125058e7e19f2ea4e77e8eae38a;hpb=be6ffe96ecb4707599fe1a6f620c348760213d46;p=libs%2Fgl.git diff --git a/source/core/batch.cpp b/source/core/batch.cpp index 9192b673..4fb2720d 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) @@ -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()) @@ -167,11 +163,6 @@ void Batch::append_index(unsigned i) ::append(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)