Style update: add spaces around assignment operators

[libs/gl.git] / source / vertexbuilder.h

diff --git a/source/vertexbuilder.h b/source/vertexbuilder.h
index 1b2d02d17726d60b4f6e023bf304aa2b74d98363..8235c7afea0d8274d0847daa9e3b80eed024f083 100644 (file)
--- a/source/vertexbuilder.h
+++ b/source/vertexbuilder.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GL_VERTEXBUILDER_H_
 #define MSP_GL_VERTEXBUILDER_H_
 
-#include "types.h"
+#include <map>
 
 namespace Msp {
 namespace GL {
@@ -24,6 +24,12 @@ data.  Attributes can be read from protected member variables.
 */
 class VertexBuilder
 {
+protected:
+       struct Attrib
+       {
+               float x, y, z, w;
+       };
+
 public:
        VertexBuilder();
        virtual ~VertexBuilder() { }
@@ -31,19 +37,24 @@ public:
        void vertex(float x, float y)                     { vertex(x, y, 0, 1); }
        void vertex(float x, float y, float z)            { vertex(x, y, z, 1); }
        void vertex(float x, float y, float z, float w)   { vertex_(x, y, z, w); }
-       void normal(float x, float y, float z)            { nx=x; ny=y; nz=z; }
+       void normal(float x, float y, float z)            { nx = x; ny = y; nz = z; }
        void texcoord(float s)                            { texcoord(s, 0, 0, 1); }
        void texcoord(float s, float t)                   { texcoord(s, t, 0, 1); }
        void texcoord(float s, float t, float r)          { texcoord(s, t, r, 1); }
-       void texcoord(float s, float t, float r, float q) { ts=s; tt=t; tr=r; tq=q; }
-       void color(ubyte r, ubyte g, ubyte b)             { color(r, g, b, 255); }
-       void color(ubyte r, ubyte g, ubyte b, ubyte a)    { color(r/255.f, g/255.f, b/255.f, a/255.f); }
+       void texcoord(float s, float t, float r, float q) { ts = s; tt = t; tr = r; tq = q; }
+       void color(unsigned char r, unsigned char g, unsigned char b)             { color(r, g, b, 255); }
+       void color(unsigned char r, unsigned char g, unsigned char b, unsigned char a)    { color(r/255.f, g/255.f, b/255.f, a/255.f); }
        void color(float r, float g, float b)             { color(r, g, b, 1); }
-       void color(float r, float g, float b, float a)    { cr=r; cg=g; cb=b; ca=a; }
+       void color(float r, float g, float b, float a)    { cr = r; cg = g; cb = b; ca = a; }
+       void attrib(unsigned i, float x)                  { attrib(i, x, 0, 0, 1); }
+       void attrib(unsigned i, float x, float y)         { attrib(i, x, y, 0, 1); }
+       void attrib(unsigned i, float x, float y, float z) { attrib(i, x, y, z, 1); }
+       void attrib(unsigned i, float x, float y, float z, float w);
 protected:
        float cr, cg, cb, ca;  // Color
        float ts, tt, tr, tq;  // TexCoord
        float nx, ny, nz;     // Normal
+       std::map<unsigned, Attrib> av;
 
        virtual void vertex_(float, float, float, float) =0;
 };