#include "cl_video.h"
+cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
static rtexture_t *char_texture;
+cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
//=============================================================================
/* Support Routines */
-#define MAX_CACHED_PICS 256
+#define FONT_FILESIZE 13468
+#define MAX_CACHED_PICS 1024
#define CACHEPICHASHSIZE 256
static cachepic_t *cachepichash[CACHEPICHASHSIZE];
static cachepic_t cachepics[MAX_CACHED_PICS];
static rtexturepool_t *drawtexturepool;
-static qbyte concharimage[13396] =
+static unsigned char concharimage[FONT_FILESIZE] =
{
#include "lhfont.h"
};
-extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
-
static rtexture_t *draw_generateconchars(void)
{
int i;
- qbyte buffer[65536][4], *data = NULL;
+ unsigned char buffer[65536][4], *data = NULL;
+ double random;
- fs_filesize = 13396;
- data = LoadTGA (concharimage, 256, 256);
- fs_filesize = -1;
+ data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
// Gold numbers
for (i = 0;i < 8192;i++)
{
- buffer[i][0] = 115;
- buffer[i][1] = 87;
- buffer[i][2] = 31;
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 83 + (unsigned char)(random * 64);
+ buffer[i][1] = 71 + (unsigned char)(random * 32);
+ buffer[i][2] = 23 + (unsigned char)(random * 16);
buffer[i][3] = data[i*4+0];
}
// White chars
for (i = 8192;i < 32768;i++)
{
- buffer[i][0] = 123;
- buffer[i][1] = 123;
- buffer[i][2] = 123;
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 95 + (unsigned char)(random * 64);
+ buffer[i][1] = 95 + (unsigned char)(random * 64);
+ buffer[i][2] = 95 + (unsigned char)(random * 64);
buffer[i][3] = data[i*4+0];
}
// Gold numbers
for (i = 32768;i < 40960;i++)
{
- buffer[i][0] = 115;
- buffer[i][1] = 87;
- buffer[i][2] = 31;
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 83 + (unsigned char)(random * 64);
+ buffer[i][1] = 71 + (unsigned char)(random * 32);
+ buffer[i][2] = 23 + (unsigned char)(random * 16);
buffer[i][3] = data[i*4+0];
}
// Red chars
for (i = 40960;i < 65536;i++)
{
- buffer[i][0] = 143;
- buffer[i][1] = 67;
- buffer[i][2] = 51;
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 96 + (unsigned char)(random * 64);
+ buffer[i][1] = 43 + (unsigned char)(random * 32);
+ buffer[i][2] = 27 + (unsigned char)(random * 32);
buffer[i][3] = data[i*4+0];
}
+#if 0
+ Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
+
Mem_Free(data);
return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
}
-static qbyte pointerimage[256] =
-{
+static char *pointerimage =
"333333332......."
"26777761........"
"2655541........."
"................"
"................"
"................"
-};
+;
static rtexture_t *draw_generatemousepointer(void)
{
int i;
- qbyte buffer[256][4];
+ unsigned char buffer[256][4];
for (i = 0;i < 256;i++)
{
if (pointerimage[i] == '.')
return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
}
-// must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 5
-
-static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
+static char *crosshairtexdata[NUMCROSSHAIRS] =
{
"................"
"................"
".......44......."
".......44......."
"................"
+ "................"
".......77......."
".......77......."
"................"
- "................"
,
"................"
"................"
"........7......."
"........7......."
"........7......."
- "................"
+ "........7......."
"................"
,
"................"
"................"
"................"
"................"
+ ,
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ ".......55......."
+ ".......55......."
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
};
static rtexture_t *draw_generatecrosshair(int num)
{
int i;
char *in;
- qbyte data[16*16][4];
+ unsigned char data[16*16][4];
in = crosshairtexdata[num];
for (i = 0;i < 16*16;i++)
{
}
else
{
- data[i][0] = 255;
- data[i][1] = 255;
- data[i][2] = 255;
- data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7);
+ data[i][0] = data[i][1] = data[i][2] = (unsigned char) ((int) (in[i] - '0') * 127 / 7 + 128);
+ data[i][3] = 255;
}
}
- return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+ return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num+1), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
}
static rtexture_t *draw_generateditherpattern(void)
{
#if 1
int x, y;
- qbyte data[8*8*4];
+ unsigned char data[8*8*4];
for (y = 0;y < 8;y++)
{
for (x = 0;x < 8;x++)
}
return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
#else
- qbyte data[16];
+ unsigned char data[16];
memset(data, 255, sizeof(data));
data[0] = data[1] = data[2] = data[12] = data[13] = data[14] = 0;
return R_LoadTexture2D(drawtexturepool, "ditherpattern", 2, 2, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
// FIXME: move this to client somehow
cachepic_t *Draw_CachePic (const char *path, qboolean persistent)
{
- int i, crc, hashkey;
+ int crc, hashkey;
cachepic_t *pic;
- qpic_t *p;
- int persistentflag;
+ int flags;
+ fs_offset_t lmpsize;
+ unsigned char *lmpdata;
+ char lmpname[MAX_QPATH];
- if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+ if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+ {
clvideo_t *video;
- video = CL_GetVideo(path);
+ video = CL_GetVideoByName(path);
if( video )
return &video->cpif;
}
- if (persistent) {
- persistentflag = TEXF_PRECACHE;
- } else {
- persistentflag = 0;
- }
-
- crc = CRC_Block(path, strlen(path));
+ crc = CRC_Block((unsigned char *)path, strlen(path));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (path, pic->name))
return pic;
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
strlcpy (pic->name, path, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
- // load the pic from disk
- pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | persistentflag);
+ flags = TEXF_ALPHA;
+ if (persistent)
+ flags |= TEXF_PRECACHE;
+ if (!strcmp(path, "gfx/colorcontrol/ditherpattern"))
+ flags |= TEXF_CLAMP;
+ if (gl_texturecompression_2d.integer)
+ flags |= TEXF_COMPRESS;
+
+ // load a high quality image from disk if possible
+ pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
{
- // compatibility with older versions
- pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | persistentflag);
- // failed to find gfx/whatever.tga or similar, try the wad
- if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
+ // compatibility with older versions which did not require gfx/ prefix
+ pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
+ }
+ // if a high quality image was loaded, set the pic's size to match it, just
+ // in case there's no low quality version to get the size from
+ if (pic->tex)
+ {
+ pic->width = R_TextureWidth(pic->tex);
+ pic->height = R_TextureHeight(pic->tex);
+ }
+
+ // now read the low quality version (wad or lmp file), and take the pic
+ // size from that even if we don't upload the texture, this way the pics
+ // show up the right size in the menu even if they were replaced with
+ // higher or lower resolution versions
+ dpsnprintf(lmpname, sizeof(lmpname), "%s.lmp", path);
+ if (!strncmp(path, "gfx/", 4) && (lmpdata = FS_LoadFile(lmpname, tempmempool, false, &lmpsize)))
+ {
+ if (lmpsize >= 9)
{
- if (!strcmp(path, "gfx/conchars"))
- {
- qbyte *pix;
- // conchars is a raw image and with the wrong transparent color
- pix = (qbyte *)p;
- for (i = 0;i < 128 * 128;i++)
- if (pix[i] == 0)
- pix[i] = 255;
- pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
- }
- else
- pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
+ pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
+ pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
+ // if no high quality replacement image was found, upload the original low quality texture
+ if (!pic->tex)
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags, palette_transparent);
+ }
+ Mem_Free(lmpdata);
+ }
+ else if ((lmpdata = W_GetLumpName (path + 4)))
+ {
+ if (!strcmp(path, "gfx/conchars"))
+ {
+ // conchars is a raw image and with color 0 as transparent instead of 255
+ pic->width = 128;
+ pic->height = 128;
+ // if no high quality replacement image was found, upload the original low quality texture
+ if (!pic->tex)
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, flags, palette_font);
+ }
+ else
+ {
+ pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
+ pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
+ // if no high quality replacement image was found, upload the original low quality texture
+ if (!pic->tex)
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags, palette_transparent);
}
}
- if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
- pic->tex = draw_generateconchars();
- if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
- pic->tex = draw_generatemousepointer();
- if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga"))
- pic->tex = draw_generatemousepointer();
- if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
- pic->tex = draw_generatecrosshair(0);
- if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga"))
- pic->tex = draw_generatecrosshair(1);
- if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3.tga"))
- pic->tex = draw_generatecrosshair(2);
- if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4.tga"))
- pic->tex = draw_generatecrosshair(3);
- if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
- pic->tex = draw_generatecrosshair(4);
- if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
- pic->tex = draw_generateditherpattern();
+ // if it's not found on disk, check if it's one of the builtin images
if (pic->tex == NULL)
{
- Con_Printf("Draw_CachePic: failed to load %s\n", path);
- pic->tex = r_texture_notexture;
+ if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
+ pic->tex = draw_generateconchars();
+ if (pic->tex == NULL && !strcmp(path, "ui/mousepointer"))
+ pic->tex = draw_generatemousepointer();
+ if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001"))
+ pic->tex = draw_generatemousepointer();
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1"))
+ pic->tex = draw_generatecrosshair(0);
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2"))
+ pic->tex = draw_generatecrosshair(1);
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3"))
+ pic->tex = draw_generatecrosshair(2);
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4"))
+ pic->tex = draw_generatecrosshair(3);
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5"))
+ pic->tex = draw_generatecrosshair(4);
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6"))
+ pic->tex = draw_generatecrosshair(5);
+ if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern"))
+ pic->tex = draw_generateditherpattern();
+ if (pic->tex == NULL)
+ {
+ // don't complain about missing gfx/crosshair images
+ if (strncmp(path, "gfx/crosshair", 13))
+ Con_Printf("Draw_CachePic: failed to load %s\n", path);
+ pic->tex = r_texture_notexture;
+ }
+ pic->width = R_TextureWidth(pic->tex);
+ pic->height = R_TextureHeight(pic->tex);
}
- pic->width = R_TextureWidth(pic->tex);
- pic->height = R_TextureHeight(pic->tex);
return pic;
}
-cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, qbyte *pixels)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels)
{
int crc, hashkey;
cachepic_t *pic;
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((unsigned char *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (picname, pic->name))
{
if (pic->tex && pic->width == width && pic->height == height)
{
- R_UpdateTexture(pic->tex, pixels);
+ R_UpdateTexture(pic->tex, pixels, 0, 0, width, height);
return pic;
}
}
if (pic == NULL)
{
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
- strcpy (pic->name, picname);
+ strlcpy (pic->name, picname, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
int hashkey;
cachepic_t *pic;
// this doesn't really free the pic, but does free it's texture
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((unsigned char *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
{
*/
static void gl_draw_start(void)
{
+ int i;
drawtexturepool = R_AllocTexturePool();
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
char_texture = Draw_CachePic("gfx/conchars", true)->tex;
+ for (i = 1;i <= NUMCROSSHAIRS;i++)
+ r_crosshairs[i] = Draw_CachePic(va("gfx/crosshair%i", i), true);
+
+ // draw the loading screen so people have something to see in the newly opened window
+ SCR_UpdateLoadingScreen(true);
}
static void gl_draw_shutdown(void)
void GL_Draw_Init (void)
{
- numcachepics = 0;
- memset(cachepichash, 0, sizeof(cachepichash));
-
+ Cvar_RegisterVariable(&r_textshadow);
R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
}
-float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+static void _DrawQ_Setup(void)
+{
+ if (r_refdef.draw2dstage)
+ return;
+ r_refdef.draw2dstage = true;
+ CHECKGLERROR
+ qglViewport(r_view.x, vid.height - (r_view.y + r_view.height), r_view.width, r_view.height);CHECKGLERROR
+ GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1);
+ GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+ qglDepthFunc(GL_LEQUAL);CHECKGLERROR
+ qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR
+ GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
+ R_Mesh_Matrix(&identitymatrix);
+
+ GL_DepthMask(true);
+ GL_DepthRange(0, 1);
+ GL_PolygonOffset(0, 0);
+ GL_DepthTest(false);
+ GL_Color(1,1,1,1);
+ GL_AlphaTest(false);
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ if (gl_support_fragment_shader)
+ {
+ qglUseProgramObjectARB(0);CHECKGLERROR
+ }
+}
+
+static void _DrawQ_ProcessDrawFlag(int flags)
+{
+ _DrawQ_Setup();
+ CHECKGLERROR
+ if(flags == DRAWFLAG_ADDITIVE)
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+ else if(flags == DRAWFLAG_MODULATE)
+ GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+ else if(flags == DRAWFLAG_2XMODULATE)
+ GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+ else
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+}
-int quadelements[768];
-void R_DrawQueue(void)
+void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
{
- int pos, num, chartexnum, texnum, batch;
- float x, y, w, h, s, t, u, v, *av, *at, c[4];
- cachepic_t *pic;
- drawqueue_t *dq;
- char *str;
- int batchcount;
- unsigned int color;
- drawqueuemesh_t *mesh;
- rmeshstate_t m;
+ float floats[20];
- if (!r_render.integer)
- return;
+ _DrawQ_ProcessDrawFlag(flags);
+ GL_Color(red, green, blue, alpha);
- if (!quadelements[1])
+ R_Mesh_VertexPointer(floats, 0, 0);
+ R_Mesh_ColorPointer(NULL, 0, 0);
+ R_Mesh_ResetTextureState();
+ if (pic)
{
- // elements for rendering a series of quads as triangles
- for (batch = 0, pos = 0, num = 0;batch < 128;batch++, num += 4)
- {
- quadelements[pos++] = num;
- quadelements[pos++] = num + 1;
- quadelements[pos++] = num + 2;
- quadelements[pos++] = num;
- quadelements[pos++] = num + 2;
- quadelements[pos++] = num + 3;
- }
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ R_Mesh_TexBind(0, R_GetTexture(pic->tex));
+ R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
+ floats[12] = 0;floats[13] = 0;
+ floats[14] = 1;floats[15] = 0;
+ floats[16] = 1;floats[17] = 1;
+ floats[18] = 0;floats[19] = 1;
}
- r_view_width = bound(0, r_refdef.width, vid.width);
- r_view_height = bound(0, r_refdef.height, vid.height);
- r_view_depth = 1;
- r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
- r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
- r_view_z = 0;
- r_view_fov_x = bound(0.1, r_refdef.fov_x, 170);
- r_view_fov_y = bound(0.1, r_refdef.fov_y, 170);
- r_view_matrix = r_refdef.viewentitymatrix;
- GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
-
- qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
- GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
- qglDepthFunc(GL_LEQUAL);
- R_Mesh_Matrix(&r_identitymatrix);
+ floats[2] = floats[5] = floats[8] = floats[11] = 0;
+ floats[0] = floats[9] = x;
+ floats[1] = floats[4] = y;
+ floats[3] = floats[6] = x + width;
+ floats[7] = floats[10] = y + height;
+
+ R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+}
- chartexnum = R_GetTexture(char_texture);
+void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
+{
+ float floats[12];
- memset(&m, 0, sizeof(m));
+ _DrawQ_ProcessDrawFlag(flags);
+ GL_Color(red, green, blue, alpha);
- pic = NULL;
- texnum = 0;
- color = 0;
- GL_Color(1,1,1,1);
+ R_Mesh_VertexPointer(floats, 0, 0);
+ R_Mesh_ColorPointer(NULL, 0, 0);
+ R_Mesh_ResetTextureState();
- batch = false;
- batchcount = 0;
- for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
+ floats[2] = floats[5] = floats[8] = floats[11] = 0;
+ floats[0] = floats[9] = x;
+ floats[1] = floats[4] = y;
+ floats[3] = floats[6] = x + width;
+ floats[7] = floats[10] = y + height;
+
+ R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+}
+
+// color tag printing
+static vec4_t string_colors[] =
+{
+ // Quake3 colors
+ // LordHavoc: why on earth is cyan before magenta in Quake3?
+ // LordHavoc: note: Doom3 uses white for [0] and [7]
+ {0.0, 0.0, 0.0, 1.0}, // black
+ {1.0, 0.0, 0.0, 1.0}, // red
+ {0.0, 1.0, 0.0, 1.0}, // green
+ {1.0, 1.0, 0.0, 1.0}, // yellow
+ {0.0, 0.0, 1.0, 1.0}, // blue
+ {0.0, 1.0, 1.0, 1.0}, // cyan
+ {1.0, 0.0, 1.0, 1.0}, // magenta
+ {1.0, 1.0, 1.0, 1.0}, // white
+ // [515]'s BX_COLOREDTEXT extension
+ {1.0, 1.0, 1.0, 0.5}, // half transparent
+ {0.5, 0.5, 0.5, 1.0} // half brightness
+ // Black's color table
+ //{1.0, 1.0, 1.0, 1.0},
+ //{1.0, 0.0, 0.0, 1.0},
+ //{0.0, 1.0, 0.0, 1.0},
+ //{0.0, 0.0, 1.0, 1.0},
+ //{1.0, 1.0, 0.0, 1.0},
+ //{0.0, 1.0, 1.0, 1.0},
+ //{1.0, 0.0, 1.0, 1.0},
+ //{0.1, 0.1, 0.1, 1.0}
+};
+
+#define STRING_COLORS_COUNT (sizeof(string_colors) / sizeof(vec4_t))
+
+static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qboolean shadow)
+{
+ Vector4Copy(string_colors[colorindex], color);
+ Vector4Set(color, color[0] * r, color[1] * g, color[2] * b, color[3] * a);
+ if (shadow)
{
- dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
- color = dq->color;
-
- if(dq->flags == DRAWFLAG_ADDITIVE)
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
- else if(dq->flags == DRAWFLAG_MODULATE)
- GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
- else if(dq->flags == DRAWFLAG_2XMODULATE)
- GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
- else
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ float shadowalpha = color[0]+color[1]+color[2] * 0.8;
+ Vector4Set(color, 0, 0, 0, color[3] * bound(0, shadowalpha, 1));
+ }
+}
- GL_DepthMask(true);
- GL_DepthTest(false);
+float DrawQ_String(float startx, float starty, const char *text, int maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
+{
+ int i, num, shadow, colorindex = STRING_COLOR_DEFAULT;
+ float x = startx, y, s, t, u, v;
+ float *av, *at, *ac;
+ float color[4];
+ int batchcount;
+ float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
+ float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
+ float color4f[QUADELEMENTS_MAXQUADS*4*4];
+
+ if (maxlen < 1)
+ maxlen = 1<<30;
+
+ _DrawQ_ProcessDrawFlag(flags);
+
+ R_Mesh_ColorPointer(color4f, 0, 0);
+ R_Mesh_ResetTextureState();
+ R_Mesh_TexBind(0, R_GetTexture(char_texture));
+ R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
+ R_Mesh_VertexPointer(vertex3f, 0, 0);
- c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f);
- c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f);
- c[2] = (float) ((color >> 8) & 0xFF) * (1.0f / 255.0f);
- c[3] = (float) ( color & 0xFF) * (1.0f / 255.0f);
- x = dq->x;
- y = dq->y;
- w = dq->scalex;
- h = dq->scaley;
+ ac = color4f;
+ at = texcoord2f;
+ av = vertex3f;
+ batchcount = 0;
- switch(dq->command)
+ for (shadow = r_textshadow.value != 0;shadow >= 0;shadow--)
+ {
+ if (!outcolor || *outcolor == -1)
+ colorindex = STRING_COLOR_DEFAULT;
+ else
+ colorindex = *outcolor;
+ DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
+
+ x = startx;
+ y = starty;
+ if (shadow)
+ {
+ x += r_textshadow.value;
+ y += r_textshadow.value;
+ }
+ for (i = 0;i < maxlen && text[i];i++, x += w)
{
- case DRAWQUEUE_STRING:
- GL_Color(c[0], c[1], c[2], c[3]);
- str = (char *)(dq + 1);
- batchcount = 0;
- m.pointer_vertex = varray_vertex3f;
- m.pointer_color = NULL;
- m.pointer_texcoord[0] = varray_texcoord2f[0];
- m.tex[0] = chartexnum;
- R_Mesh_State(&m);
- at = varray_texcoord2f[0];
- av = varray_vertex3f;
- while ((num = *str++) && x < vid_conwidth.integer)
+ if (text[i] == ' ')
+ continue;
+ if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
{
- if (num != ' ')
+ if (text[i+1] == STRING_COLOR_TAG)
+ {
+ i++;
+ if (text[i] == ' ')
+ continue;
+ }
+ else if (text[i+1] >= '0' && text[i+1] <= '9')
{
- s = (num & 15)*0.0625f + (0.5f / 256.0f);
- t = (num >> 4)*0.0625f + (0.5f / 256.0f);
- u = 0.0625f - (1.0f / 256.0f);
- v = 0.0625f - (1.0f / 256.0f);
- at[ 0] = s ;at[ 1] = t ;
- at[ 2] = s+u;at[ 3] = t ;
- at[ 4] = s+u;at[ 5] = t+v;
- at[ 6] = s ;at[ 7] = t+v;
- av[ 0] = x ;av[ 1] = y ;av[ 2] = 10;
- av[ 3] = x+w;av[ 4] = y ;av[ 5] = 10;
- av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
- av[ 9] = x ;av[10] = y+h;av[11] = 10;
- at += 8;
- av += 12;
- batchcount++;
- if (batchcount >= 128)
- {
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
- GL_LockArrays(0, 0);
- batchcount = 0;
- at = varray_texcoord2f[0];
- av = varray_vertex3f;
- }
+ colorindex = text[i+1] - '0';
+ DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
+ i++;
+ x -= w;
+ continue;
}
- x += w;
}
- if (batchcount > 0)
+ num = text[i];
+ s = (num & 15)*0.0625f + (0.5f / 256.0f);
+ t = (num >> 4)*0.0625f + (0.5f / 256.0f);
+ u = 0.0625f - (1.0f / 256.0f);
+ v = 0.0625f - (1.0f / 256.0f);
+ ac[ 0] = color[0];ac[ 1] = color[1];ac[ 2] = color[2];ac[ 3] = color[3];
+ ac[ 4] = color[0];ac[ 5] = color[1];ac[ 6] = color[2];ac[ 7] = color[3];
+ ac[ 8] = color[0];ac[ 9] = color[1];ac[10] = color[2];ac[11] = color[3];
+ ac[12] = color[0];ac[13] = color[1];ac[14] = color[2];ac[15] = color[3];
+ at[ 0] = s ;at[ 1] = t ;
+ at[ 2] = s+u;at[ 3] = t ;
+ at[ 4] = s+u;at[ 5] = t+v;
+ at[ 6] = s ;at[ 7] = t+v;
+ av[ 0] = x ;av[ 1] = y ;av[ 2] = 10;
+ av[ 3] = x+w;av[ 4] = y ;av[ 5] = 10;
+ av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
+ av[ 9] = x ;av[10] = y+h;av[11] = 10;
+ ac += 16;
+ at += 8;
+ av += 12;
+ batchcount++;
+ if (batchcount >= QUADELEMENTS_MAXQUADS)
{
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
- GL_LockArrays(0, 0);
+ if (basealpha >= (1.0f / 255.0f))
+ {
+ GL_LockArrays(0, batchcount * 4);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
+ GL_LockArrays(0, 0);
+ }
+ batchcount = 0;
+ ac = color4f;
+ at = texcoord2f;
+ av = vertex3f;
}
- break;
- case DRAWQUEUE_MESH:
- mesh = (void *)(dq + 1);
- m.pointer_vertex = mesh->data_vertex3f;
- m.pointer_color = mesh->data_color4f;
- m.pointer_texcoord[0] = mesh->data_texcoord2f;
- m.tex[0] = R_GetTexture(mesh->texture);
- if (!m.tex[0])
- m.pointer_texcoord[0] = NULL;
- R_Mesh_State(&m);
- GL_LockArrays(0, mesh->num_vertices);
- R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+ }
+ }
+ if (batchcount > 0)
+ {
+ if (basealpha >= (1.0f / 255.0f))
+ {
+ GL_LockArrays(0, batchcount * 4);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
GL_LockArrays(0, 0);
- break;
- case DRAWQUEUE_SETCLIP:
- {
- // We have to convert the con coords into real coords
- int x , y, width, height;
- x = dq->x * ((float)vid.width / vid_conwidth.integer);
- // OGL uses top to bottom
- y = dq->y * ((float) vid.height / vid_conheight.integer);
- width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
- height = dq->scaley * ((float)vid.height / vid_conheight.integer);
+ }
+ }
- GL_Scissor(x, y, width, height);
+ if (outcolor)
+ *outcolor = colorindex;
+
+ // note: this relies on the proper text (not shadow) being drawn last
+ return x;
+}
- GL_ScissorTest(true);
+#if 0
+// not used
+static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qboolean ignorecolorcodes, int *outcolor)
+{
+ int color, numchars = 0;
+ char *outputend2c = output2c + maxoutchars - 2;
+ if (!outcolor || *outcolor == -1)
+ color = STRING_COLOR_DEFAULT;
+ else
+ color = *outcolor;
+ if (!maxreadchars)
+ maxreadchars = 1<<30;
+ textend = text + maxreadchars;
+ while (text != textend && *text)
+ {
+ if (*text == STRING_COLOR_TAG && !ignorecolorcodes && text + 1 != textend)
+ {
+ if (text[1] == STRING_COLOR_TAG)
+ text++;
+ else if (text[1] >= '0' && text[1] <= '9')
+ {
+ color = text[1] - '0';
+ text += 2;
+ continue;
}
- break;
- case DRAWQUEUE_RESETCLIP:
- GL_ScissorTest(false);
- break;
}
+ if (output2c >= outputend2c)
+ break;
+ *output2c++ = *text++;
+ *output2c++ = color;
+ numchars++;
+ }
+ output2c[0] = output2c[1] = 0;
+ if (outcolor)
+ *outcolor = color;
+ return numchars;
+}
+#endif
+
+void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
+{
+ float floats[36];
+
+ _DrawQ_ProcessDrawFlag(flags);
+
+ R_Mesh_VertexPointer(floats, 0, 0);
+ R_Mesh_ColorPointer(floats + 20, 0, 0);
+ R_Mesh_ResetTextureState();
+ if (pic)
+ {
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ R_Mesh_TexBind(0, R_GetTexture(pic->tex));
+ R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
+ floats[12] = s1;floats[13] = t1;
+ floats[14] = s2;floats[15] = t2;
+ floats[16] = s4;floats[17] = t4;
+ floats[18] = s3;floats[19] = t3;
+ }
+
+ floats[2] = floats[5] = floats[8] = floats[11] = 0;
+ floats[0] = floats[9] = x;
+ floats[1] = floats[4] = y;
+ floats[3] = floats[6] = x + width;
+ floats[7] = floats[10] = y + height;
+ floats[20] = r1;floats[21] = g1;floats[22] = b1;floats[23] = a1;
+ floats[24] = r2;floats[25] = g2;floats[26] = b2;floats[27] = a2;
+ floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
+ floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
+
+ R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+}
+
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
+{
+ _DrawQ_ProcessDrawFlag(flags);
+
+ R_Mesh_VertexPointer(mesh->data_vertex3f, 0, 0);
+ R_Mesh_ColorPointer(mesh->data_color4f, 0, 0);
+ R_Mesh_ResetTextureState();
+ R_Mesh_TexBind(0, R_GetTexture(mesh->texture));
+ R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
+
+ GL_LockArrays(0, mesh->num_vertices);
+ R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i, 0, 0);
+ GL_LockArrays(0, 0);
+}
+
+void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
+{
+ int num;
+
+ _DrawQ_ProcessDrawFlag(flags);
+
+ GL_Color(1,1,1,1);
+ CHECKGLERROR
+ qglBegin(GL_LINE_LOOP);
+ for (num = 0;num < mesh->num_vertices;num++)
+ {
+ if (mesh->data_color4f)
+ GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
+ qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
}
+ qglEnd();
+ CHECKGLERROR
+}
+
+//[515]: this is old, delete
+void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
+{
+ _DrawQ_ProcessDrawFlag(flags);
+
+ CHECKGLERROR
+ qglLineWidth(width);CHECKGLERROR
+
+ GL_Color(r,g,b,alpha);
+ CHECKGLERROR
+ qglBegin(GL_LINES);
+ qglVertex2f(x1, y1);
+ qglVertex2f(x2, y2);
+ qglEnd();
+ CHECKGLERROR
+}
+
+void DrawQ_SetClipArea(float x, float y, float width, float height)
+{
+ _DrawQ_Setup();
+ // We have to convert the con coords into real coords
+ // OGL uses top to bottom
+ GL_Scissor((int)(x * ((float)vid.width / vid_conwidth.integer)), (int)(y * ((float) vid.height / vid_conheight.integer)), (int)(width * ((float)vid.width / vid_conwidth.integer)), (int)(height * ((float)vid.height / vid_conheight.integer)));
+
+ GL_ScissorTest(true);
+}
+
+void DrawQ_ResetClipArea(void)
+{
+ _DrawQ_Setup();
+ GL_ScissorTest(false);
+}
+
+void DrawQ_Finish(void)
+{
+ r_refdef.draw2dstage = false;
+}
+
+static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+void R_DrawGamma(void)
+{
+ float c[4];
if (!vid_usinghwgamma)
{
// all the blends ignore depth
- memset(&m, 0, sizeof(m));
- m.pointer_vertex = blendvertex3f;
- R_Mesh_State(&m);
+ R_Mesh_VertexPointer(blendvertex3f, 0, 0);
+ R_Mesh_ColorPointer(NULL, 0, 0);
+ R_Mesh_ResetTextureState();
GL_DepthMask(true);
+ GL_DepthRange(0, 1);
+ GL_PolygonOffset(0, 0);
GL_DepthTest(false);
if (v_color_enable.integer)
{
while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
{
GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
- R_Mesh_Draw(0, 3, 1, polygonelements);
+ R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
VectorScale(c, 0.5, c);
}
}
{
GL_BlendFunc(GL_ONE, GL_ONE);
GL_Color(c[0], c[1], c[2], 1);
- R_Mesh_Draw(0, 3, 1, polygonelements);
+ R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
}
}
}
projects / xonotic / darkplaces.git / blobdiff