X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvertexbuilder.h;fp=source%2Fvertexbuilder.h;h=c92a276071d9ff64ce53ab343fc9a7faddd46c0f;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hp=3e02e1d47bd37837ba77e2740453d4738184ac41;hpb=8f2430208cfa7bb9dc5bd655dde88acc21db54d2;p=libs%2Fgl.git diff --git a/source/vertexbuilder.h b/source/vertexbuilder.h index 3e02e1d4..c92a2760 100644 --- a/source/vertexbuilder.h +++ b/source/vertexbuilder.h @@ -9,7 +9,6 @@ Distributed under the LGPL #define MSP_GL_VERTEXBUILDER_H_ #include -#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); }