X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarraybuilder.cpp;h=87b290152b6eae6d047512c088c85cfe765b7d5b;hp=f9adcf582ac197dd951dee643f35d6bc8a2edbb5;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hpb=f17794d55923d4fb4f63e9d082d8d84a735a04e8 diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp index f9adcf58..87b29015 100644 --- a/source/vertexarraybuilder.cpp +++ b/source/vertexarraybuilder.cpp @@ -22,54 +22,54 @@ VertexArrayBuilder::~VertexArrayBuilder() void VertexArrayBuilder::vertex_(float x, float y, float z, float w) { - float *ptr=array.append(); + float *ptr = array.append(); for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c) { - unsigned size=(*c&3)+1; - unsigned type=*c>>2; + unsigned size = (*c&3)+1; + unsigned type = *c>>2; switch(type) { case 0: - *ptr++=x; - *ptr++=y; - if(size>=3) *ptr++=z; - if(size>=4) *ptr++=w; + *ptr+ += x; + *ptr+ += y; + if(size>=3) *ptr+ += z; + if(size>=4) *ptr+ += w; break; case 1: - *ptr++=nx; - *ptr++=ny; - *ptr++=nz; + *ptr+ += nx; + *ptr+ += ny; + *ptr+ += nz; break; case 2: - *ptr++=ts; - if(size>=2) *ptr++=tt; - if(size>=3) *ptr++=tr; - if(size>=4) *ptr++=tq; + *ptr+ += ts; + if(size>=2) *ptr+ += tt; + if(size>=3) *ptr+ += tr; + if(size>=4) *ptr+ += tq; break; case 3: if(size==1) { union { unsigned char c[4]; float f; } u; - u.c[0]=static_cast(cr*255); - u.c[1]=static_cast(cg*255); - u.c[2]=static_cast(cb*255); - u.c[3]=static_cast(ca*255); - *ptr++=u.f; + u.c[0] = static_cast(cr*255); + u.c[1] = static_cast(cg*255); + u.c[2] = static_cast(cb*255); + u.c[3] = static_cast(ca*255); + *ptr+ += u.f; } else { - *ptr++=cr; - *ptr++=cg; - *ptr++=cb; - if(size>=4) *+ptr++=ca; + *ptr+ += cr; + *ptr+ += cg; + *ptr+ += cb; + if(size>=4) *+ptr+ += ca; } break; default: - const Attrib &a=av[type-4]; - *ptr++=a.x; - if(size>=2) *ptr++=a.y; - if(size>=3) *ptr++=a.z; - if(size>=4) *ptr++=a.w; + const Attrib &a = av[type-4]; + *ptr+ += a.x; + if(size>=2) *ptr+ += a.y; + if(size>=3) *ptr+ += a.z; + if(size>=4) *ptr+ += a.w; break; } }