X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=382cfbdb5df1ab6526df9e6c6c96e0004d620612;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=b882cf1be18f6f5e0b2ede67e831a8eed0ae1cee;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git diff --git a/source/core/batch.cpp b/source/core/batch.cpp index b882cf1b..382cfbdb 100644 --- a/source/core/batch.cpp +++ b/source/core/batch.cpp @@ -1,9 +1,5 @@ -#include #include "batch.h" -#include "buffer.h" #include "error.h" -#include "mesh.h" -#include "vertexarray.h" using namespace std; @@ -49,15 +45,12 @@ namespace Msp { namespace GL { Batch::Batch(PrimitiveType t): + BatchBackend(t), prim_type(t), - gl_prim_type(GL::get_gl_primitive_type(prim_type)), - index_type(UNSIGNED_SHORT), - gl_index_type(get_gl_type(index_type)), + index_type(VOID), max_index(0) -{ } - -Batch::~Batch() { + set_index_type(UNSIGNED_SHORT); } void Batch::set_index_type(DataType t) @@ -75,7 +68,7 @@ void Batch::set_index_type(DataType t) shrink(data); index_type = t; - gl_index_type = get_gl_type(t); + BatchBackend::set_index_type(t); update_offset(); dirty = true; } @@ -109,8 +102,8 @@ 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) - return MSP_primitive_restart; + else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN) + return check_restart(false); else return true; } @@ -119,8 +112,8 @@ 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) - static Require _req(MSP_primitive_restart); + if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN) + check_restart(true); if(other.data.empty()) return *this; @@ -129,7 +122,7 @@ Batch &Batch::append(const Batch &other) if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES) ; - else if(MSP_primitive_restart) + else if(check_restart(false)) { if(index_type==UNSIGNED_INT) ::append(data, 0xFFFFFFFF); @@ -170,12 +163,12 @@ void Batch::append_index(unsigned i) ::append(data, i); } -unsigned Batch::get_index_size() const +size_t 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)];