From: Mikko Rasa Date: Tue, 8 Jun 2010 17:18:08 +0000 (+0000) Subject: Fix compile errors caused by faulty regex application in previous revision X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=95e926ee2bb662fe8795546db4bdebd1a0aff85b Fix compile errors caused by faulty regex application in previous revision --- diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp index 87b29015..70d1ee58 100644 --- a/source/vertexarraybuilder.cpp +++ b/source/vertexarraybuilder.cpp @@ -30,21 +30,21 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w) 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) @@ -54,22 +54,22 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w) u.c[1] = static_cast(cg*255); u.c[2] = static_cast(cb*255); u.c[3] = static_cast(ca*255); - *ptr+ += u.f; + *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; + *ptr++ = a.x; + if(size>=2) *ptr++ = a.y; + if(size>=3) *ptr++ = a.z; + if(size>=4) *ptr++ = a.w; break; } }