X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprimitivebuilder.cpp;fp=source%2Fprimitivebuilder.cpp;h=6a4d9bf0b866ccd1585a68ef05acf9b1c42df682;hp=92b2cb0eb0b76ef97c73875bd00f14651409c3b8;hb=16f6f15328b3a6eec87b1b5e5822368966d44a38;hpb=b8b06a0ff96763ba7e188d9fcacbd8c0e3dcd515 diff --git a/source/primitivebuilder.cpp b/source/primitivebuilder.cpp index 92b2cb0e..6a4d9bf0 100644 --- a/source/primitivebuilder.cpp +++ b/source/primitivebuilder.cpp @@ -12,6 +12,7 @@ namespace GL { PrimitiveBuilder::PrimitiveBuilder(VertexArray &a): array(a), + vab(array), in_batch(false) { } @@ -22,7 +23,6 @@ void PrimitiveBuilder::begin(PrimitiveType t) type=t; in_batch=true; - builder=array.modify(); begin_(); } @@ -32,7 +32,6 @@ void PrimitiveBuilder::end() if(!in_batch) throw InvalidState("end() called without begin()"); - builder=0; in_batch=false; end_(); @@ -56,10 +55,10 @@ PrimitiveType PrimitiveBuilder::get_type() const void PrimitiveBuilder::vertex_(float x, float y, float z, float w) { - builder->texcoord(ts, tt, tr,tq); - builder->color(cr, cg, cb, ca); - builder->normal(nx, ny, nz); - builder->vertex(x, y, z, w); + vab.texcoord(ts, tt, tr,tq); + vab.color(cr, cg, cb, ca); + vab.normal(nx, ny, nz); + vab.vertex(x, y, z, w); if(in_batch) element_(array.size()-1);