X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexbuilder.h;h=8235c7afea0d8274d0847daa9e3b80eed024f083;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=3e02e1d47bd37837ba77e2740453d4738184ac41;hpb=b8fef9be469eb16e54068bac7e275ea225efc71c;p=libs%2Fgl.git

diff --git a/source/vertexbuilder.h b/source/vertexbuilder.h
index 3e02e1d4..8235c7af 100644
--- a/source/vertexbuilder.h
+++ b/source/vertexbuilder.h
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_GL_VERTEXBUILDER_H_
 
 #include <map>
-#include "types.h"
 
 namespace Msp {
 namespace GL {
@@ -38,15 +37,15 @@ 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); }