Get rid of the typedefs for fundamental types

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

diff --git a/source/vertexbuilder.h b/source/vertexbuilder.h
index 3e02e1d47bd37837ba77e2740453d4738184ac41..c92a276071d9ff64ce53ab343fc9a7faddd46c0f 100644 (file)
--- 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 {
@@ -43,8 +42,8 @@ public:
        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 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 attrib(unsigned i, float x)                  { attrib(i, x, 0, 0, 1); }