X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.h;h=c48a2cf4592c859e7b961b2f87f097fc1fa001d5;hb=5a2506c15b552f73998d5cb90326d6c7185e3ef7;hp=57552be4dd1f0210cd5512f3a76d637981a5b3a6;hpb=b0671fcac8564a24ec6d499c0a574d71d937ea7d;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.h b/cl_screen.h index 57552be4..c48a2cf4 100644 --- a/cl_screen.h +++ b/cl_screen.h @@ -3,8 +3,6 @@ #define CL_SCREEN_H // drawqueue stuff for use by client to feed 2D art to renderer -#define MAX_DRAWQUEUE 262144 - #define DRAWQUEUE_PIC 0 #define DRAWQUEUE_STRING 1 #define DRAWQUEUE_MESH 2 @@ -19,15 +17,18 @@ typedef struct drawqueue_s drawqueue_t; // a triangle mesh... embedded in the drawqueue +// each vertex is 4 floats (3 are used) +// each texcoord is 4 floats (3 are used) +// each color is 4 floats (4 are used) typedef struct drawqueuemesh_s { rtexture_t *texture; - int numindices; + int numtriangles; int numvertices; int *indices; float *vertices; float *texcoords; - qbyte *colors; + float *colors; } drawqueuemesh_t; @@ -38,7 +39,7 @@ void DrawQ_Clear(void); // draw an image void DrawQ_Pic(float x, float y, char *picname, float width, float height, float red, float green, float blue, float alpha, int flags); // draw a text string -void DrawQ_String(float x, float y, char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags); +void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags); // draw a filled rectangle void DrawQ_Fill (float x, float y, float w, float h, float red, float green, float blue, float alpha, int flags); // draw a triangle mesh