X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=330b13e9e2053aef32b7d5c9fd6d1546724bf245;hb=fc117f42d5cd245a7a50eba5f566fb8cf4093671;hp=330aff43dca48da4bcb0a217f7e9d012360f856b;hpb=383059e15e8d7ea1aaf67c98d7ec3f29506f2949;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 330aff43..330b13e9 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -18,105 +18,250 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// draw.c -- this is the only file outside the refresh that touches the -// vid buffer - #include "quakedef.h" //#define GL_COLOR_INDEX8_EXT 0x80E5 -cvar_t scr_conalpha = {"scr_conalpha", "1"}; - -byte *draw_chars; // 8*8 graphic characters -qpic_t *draw_disc; +cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"}; -rtexture_t *char_texture; - -typedef struct -{ - rtexture_t *tex; -} glpic_t; - -rtexture_t *conbacktex; +static rtexture_t *char_texture; //============================================================================= /* Support Routines */ -typedef struct cachepic_s -{ - char name[MAX_QPATH]; - qpic_t pic; - byte padding[32]; // for appended glpic -} cachepic_t; - -#define MAX_CACHED_PICS 128 -cachepic_t menu_cachepics[MAX_CACHED_PICS]; -int menu_numcachepics; +#define MAX_CACHED_PICS 256 +#define CACHEPICHASHSIZE 256 +static cachepic_t *cachepichash[CACHEPICHASHSIZE]; +static cachepic_t cachepics[MAX_CACHED_PICS]; +static int numcachepics; -byte menuplyr_pixels[4096]; +static rtexturepool_t *drawtexturepool; -int pic_texels; -int pic_count; - -qpic_t *Draw_PicFromWad (char *name) +static qbyte pointerimage[256] = +{ + "333333332......." + "26777761........" + "2655541........." + "265541.........." + "2654561........." + "26414561........" + "251.14561......." + "21...14561......" + "1.....141......." + ".......1........" + "................" + "................" + "................" + "................" + "................" + "................" +}; + +static rtexture_t *draw_generatemousepointer(void) { - qpic_t *p; - glpic_t *gl; + int i; + qbyte buffer[256][4]; + for (i = 0;i < 256;i++) + { + if (pointerimage[i] == '.') + { + buffer[i][0] = 0; + buffer[i][1] = 0; + buffer[i][2] = 0; + buffer[i][3] = 0; + } + else + { + buffer[i][0] = (pointerimage[i] - '0') * 16; + buffer[i][1] = (pointerimage[i] - '0') * 16; + buffer[i][2] = (pointerimage[i] - '0') * 16; + buffer[i][3] = 255; + } + } + return R_LoadTexture(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE); +} - p = W_GetLumpName (name); - gl = (glpic_t *)p->data; +// must match NUMCROSSHAIRS in r_crosshairs.c +#define NUMCROSSHAIRS 5 - gl->tex = R_LoadTexture (name, p->width, p->height, p->data, TEXF_ALPHA | TEXF_PRECACHE); - return p; +static qbyte *crosshairtexdata[NUMCROSSHAIRS] = +{ + "................" + "................" + "................" + "...33......33..." + "...355....553..." + "....577..775...." + ".....77..77....." + "................" + "................" + ".....77..77....." + "....577..775...." + "...355....553..." + "...33......33..." + "................" + "................" + "................" + , + "................" + "................" + "................" + "...3........3..." + "....5......5...." + ".....7....7....." + "......7..7......" + "................" + "................" + "......7..7......" + ".....7....7....." + "....5......5...." + "...3........3..." + "................" + "................" + "................" + , + "................" + ".......77......." + ".......77......." + "................" + "................" + ".......44......." + ".......44......." + ".77..44..44..77." + ".77..44..44..77." + ".......44......." + ".......44......." + "................" + ".......77......." + ".......77......." + "................" + "................" + , + "................" + "................" + "................" + "................" + "................" + "................" + "................" + "................" + "........7777777." + "........752....." + "........72......" + "........7......." + "........7......." + "........7......." + "................" + "................" + , + "................" + "................" + "................" + "................" + "................" + "........7......." + "................" + "........4......." + ".....7.4.4.7...." + "........4......." + "................" + "........7......." + "................" + "................" + "................" + "................" +}; + +static rtexture_t *draw_generatecrosshair(int num) +{ + int i; + char *in; + qbyte data[16*16][4]; + in = crosshairtexdata[num]; + for (i = 0;i < 16*16;i++) + { + if (in[i] == '.') + { + data[i][0] = 255; + data[i][1] = 255; + data[i][2] = 255; + data[i][3] = 0; + } + else + { + data[i][0] = 255; + data[i][1] = 255; + data[i][2] = 255; + data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7); + } + } + return R_LoadTexture(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE); } - /* ================ Draw_CachePic ================ */ -qpic_t *Draw_CachePic (char *path) +// FIXME: move this to client somehow +cachepic_t *Draw_CachePic (char *path) { - cachepic_t *pic; - int i; - qpic_t *dat; - glpic_t *gl; + int i, crc, hashkey; + cachepic_t *pic; + qpic_t *p; - for (pic=menu_cachepics, i=0 ; i> 8) ^ crc) % CACHEPICHASHSIZE; + for (pic = cachepichash[hashkey];pic;pic = pic->chain) if (!strcmp (path, pic->name)) - return &pic->pic; - - if (menu_numcachepics == MAX_CACHED_PICS) - Sys_Error ("menu_numcachepics == MAX_CACHED_PICS"); - menu_numcachepics++; + return pic; + //for (pic = cachepics, i = 0;i < numcachepics;pic++, i++) + // if (!strcmp (path, pic->name)) + // return pic; + + if (numcachepics == MAX_CACHED_PICS) + Sys_Error ("numcachepics == MAX_CACHED_PICS"); + pic = cachepics + (numcachepics++); strcpy (pic->name, path); + // link into list + pic->chain = cachepichash[hashkey]; + cachepichash[hashkey] = pic; -// -// load the pic from disk -// - dat = (qpic_t *)COM_LoadMallocFile (path, false); - if (!dat) + // load the pic from disk + pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true); + if (pic->tex == NULL && (p = W_GetLumpName (path))) + { + if (!strcmp(path, "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_LoadTexture (drawtexturepool, path, 128, 128, pix, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE); + } + else + pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE); + } + if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.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) Sys_Error ("Draw_CachePic: failed to load %s", path); - SwapPic (dat); - - // HACK HACK HACK --- we need to keep the bytes for - // the translatable player picture just for the menu - // configuration dialog - if (!strcmp (path, "gfx/menuplyr.lmp")) - memcpy (menuplyr_pixels, dat->data, dat->width*dat->height); - - pic->pic.width = dat->width; - pic->pic.height = dat->height; - gl = (glpic_t *)pic->pic.data; - gl->tex = loadtextureimage(path, 0, 0, false, false, true); - if (!gl->tex) - gl->tex = R_LoadTexture (path, dat->width, dat->height, dat->data, TEXF_ALPHA | TEXF_PRECACHE); - - qfree(dat); - - return &pic->pic; + pic->width = R_TextureWidth(pic->tex); + pic->height = R_TextureHeight(pic->tex); + return pic; } /* @@ -124,412 +269,293 @@ qpic_t *Draw_CachePic (char *path) Draw_Init =============== */ -void gl_draw_start(void) +static void gl_draw_start(void) { - int i; - - char_texture = loadtextureimage ("conchars", 0, 0, false, false, true); - if (!char_texture) - { - draw_chars = W_GetLumpName ("conchars"); - for (i=0 ; i<128*128 ; i++) - if (draw_chars[i] == 0) - draw_chars[i] = 255; // proper transparent color - - // now turn them into textures - char_texture = R_LoadTexture ("charset", 128, 128, draw_chars, TEXF_ALPHA | TEXF_PRECACHE); - } + drawtexturepool = R_AllocTexturePool(); - conbacktex = loadtextureimage("gfx/conback", 0, 0, false, false, true); + numcachepics = 0; + memset(cachepichash, 0, sizeof(cachepichash)); - // get the other pics we need - draw_disc = Draw_PicFromWad ("disc"); + char_texture = Draw_CachePic("conchars")->tex; } -void gl_draw_shutdown(void) +static void gl_draw_shutdown(void) { + R_FreeTexturePool(&drawtexturepool); + + numcachepics = 0; + memset(cachepichash, 0, sizeof(cachepichash)); } -void gl_draw_newmap(void) +static void gl_draw_newmap(void) { } -char engineversion[40]; -int engineversionx, engineversiony; - -extern void R_Textures_Init(); void GL_Draw_Init (void) { - int i; Cvar_RegisterVariable (&scr_conalpha); -#if defined(__linux__) - sprintf (engineversion, "DarkPlaces Linux GL %.2f build %3i", (float) VERSION, buildnumber); -#elif defined(WIN32) - sprintf (engineversion, "DarkPlaces Windows GL %.2f build %3i", (float) VERSION, buildnumber); -#else - sprintf (engineversion, "DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber); -#endif - for (i = 0;i < 40 && engineversion[i];i++) - engineversion[i] += 0x80; // shift to orange - engineversionx = vid.width - strlen(engineversion) * 8 - 8; - engineversiony = vid.height - 8; - - R_Textures_Init(); + numcachepics = 0; + memset(cachepichash, 0, sizeof(cachepichash)); + R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap); } -/* -================ -Draw_Character - -Draws one 8*8 graphics character with 0 being transparent. -It can be clipped to the top of the screen to allow the console to be -smoothly scrolled off. -================ -*/ -void Draw_Character (int x, int y, int num) +void R_DrawQueue(void) { - int row, col; - float frow, fcol, size; - - if (num == 32) - return; // space + int pos, num, chartexnum, overbright; + float x, y, w, h, s, t, u, v; + cachepic_t *pic; + drawqueue_t *dq; + char *str, *currentpic; + int batch, additive; + unsigned int color; + + if (!r_render.integer) + return; - num &= 255; - - if (y <= -8) - return; // totally off screen + glViewport(vid.realx, vid.realy, vid.realwidth, vid.realheight); - row = num>>4; - col = num&15; + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999); - frow = row*0.0625; - fcol = col*0.0625; - size = 0.0625; + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); - if (!r_render.value) - return; - glBindTexture(GL_TEXTURE_2D, R_GetTexture(char_texture)); - // LordHavoc: NEAREST mode on text if not scaling up - if (glwidth <= (int) vid.width) - { - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - } - else - { - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - } + glDisable(GL_DEPTH_TEST); + glDisable(GL_CULL_FACE); + glEnable(GL_BLEND); + glEnable(GL_TEXTURE_2D); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - if (lighthalf) - glColor3f(0.5f,0.5f,0.5f); - else - glColor3f(1.0f,1.0f,1.0f); - glBegin (GL_QUADS); - glTexCoord2f (fcol, frow); - glVertex2f (x, y); - glTexCoord2f (fcol + size, frow); - glVertex2f (x+8, y); - glTexCoord2f (fcol + size, frow + size); - glVertex2f (x+8, y+8); - glTexCoord2f (fcol, frow + size); - glVertex2f (x, y+8); - glEnd (); - - // LordHavoc: revert to LINEAR mode -// if (glwidth < (int) vid.width) -// { -// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -// } -} + chartexnum = R_GetTexture(char_texture); -/* -================ -Draw_String -================ -*/ -// LordHavoc: sped this up a lot, and added maxlen -void Draw_String (int x, int y, char *str, int maxlen) -{ - int num; - float frow, fcol; - if (!r_render.value) - return; - if (y <= -8 || y >= (int) vid.height || x >= (int) vid.width || *str == 0) // completely offscreen or no text to print - return; - if (maxlen < 1) - maxlen = strlen(str); - else if (maxlen > (int) strlen(str)) - maxlen = strlen(str); - glBindTexture(GL_TEXTURE_2D, R_GetTexture(char_texture)); + additive = false; + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + currentpic = ""; + pic = NULL; + glBindTexture(GL_TEXTURE_2D, 0); + color = 0; + glColor4ub(0,0,0,0); // LordHavoc: NEAREST mode on text if not scaling up - if (glwidth <= (int) vid.width) + /* + if (vid.realwidth <= (int) vid.conwidth) { glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + CHECKGLERROR glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + CHECKGLERROR } else { glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + CHECKGLERROR glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + CHECKGLERROR } + */ - if (lighthalf) - glColor3f(0.5f,0.5f,0.5f); - else - glColor3f(1.0f,1.0f,1.0f); - glBegin (GL_QUADS); - while (maxlen-- && x < (int) vid.width) // stop rendering when out of characters or room + overbright = v_overbrightbits.integer; + batch = false; + for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size) { - if ((num = *str++) != 32) // skip spaces + dq = (drawqueue_t *)(r_refdef.drawqueue + pos); + if (dq->flags & DRAWFLAG_ADDITIVE) { - frow = (float) ((int) num >> 4)*0.0625; - fcol = (float) ((int) num & 15)*0.0625; - glTexCoord2f (fcol , frow );glVertex2f (x, y); - glTexCoord2f (fcol + 0.0625, frow );glVertex2f (x+8, y); - glTexCoord2f (fcol + 0.0625, frow + 0.0625);glVertex2f (x+8, y+8); - glTexCoord2f (fcol , frow + 0.0625);glVertex2f (x, y+8); + if (!additive) + { + if (batch) + { + batch = false; + glEnd(); + } + additive = true; + glBlendFunc(GL_SRC_ALPHA, GL_ONE); + } } - x += 8; - } - glEnd (); - - // LordHavoc: revert to LINEAR mode -// if (glwidth < (int) vid.width) -// { -// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -// } -} - -void Draw_GenericPic (rtexture_t *tex, float red, float green, float blue, float alpha, int x, int y, int width, int height) -{ - if (!r_render.value) - return; - if (lighthalf) - glColor4f(red * 0.5f, green * 0.5f, blue * 0.5f, alpha); - else - glColor4f(red, green, blue, alpha); - glBindTexture(GL_TEXTURE_2D, R_GetTexture(tex)); - glBegin (GL_QUADS); - glTexCoord2f (0, 0);glVertex2f (x, y); - glTexCoord2f (1, 0);glVertex2f (x+width, y); - glTexCoord2f (1, 1);glVertex2f (x+width, y+height); - glTexCoord2f (0, 1);glVertex2f (x, y+height); - glEnd (); -} - -/* -============= -Draw_AlphaPic -============= -*/ -void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha) -{ - Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,alpha, x,y,pic->width, pic->height); -} - - -/* -============= -Draw_Pic -============= -*/ -void Draw_Pic (int x, int y, qpic_t *pic) -{ - Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,1, x,y,pic->width, pic->height); -} - - -/* -============= -Draw_PicTranslate - -Only used for the player color selection menu -============= -*/ -void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation) -{ - int i, c; - byte *trans, *src, *dest; - rtexture_t *rt; - - c = pic->width * pic->height; - src = menuplyr_pixels; - dest = trans = qmalloc(c); - for (i = 0;i < c;i++) - *dest++ = translation[*src++]; - - rt = R_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, TEXF_ALPHA | TEXF_PRECACHE); - qfree(trans); - - if (!r_render.value) - return; - Draw_GenericPic (rt, 1,1,1,1, x, y, pic->width, pic->height); -} - - -/* -================ -Draw_ConsoleBackground - -================ -*/ -void Draw_ConsoleBackground (int lines) -{ - Draw_GenericPic (conbacktex, 1,1,1,scr_conalpha.value*lines/vid.height, 0, lines - vid.height, vid.width, vid.height); - // LordHavoc: draw version - Draw_String(engineversionx, lines - vid.height + engineversiony, engineversion, 9999); -} - -/* -============= -Draw_Fill - -Fills a box of pixels with a single color -============= -*/ -void Draw_Fill (int x, int y, int w, int h, int c) -{ - if (!r_render.value) - return; - glDisable (GL_TEXTURE_2D); - if (lighthalf) - { - byte *tempcolor = (byte *)&d_8to24table[c]; - glColor4ub ((byte) (tempcolor[0] >> 1), (byte) (tempcolor[1] >> 1), (byte) (tempcolor[2] >> 1), tempcolor[3]); - } - else - glColor4ubv ((byte *)&d_8to24table[c]); - - glBegin (GL_QUADS); - - glVertex2f (x,y); - glVertex2f (x+w, y); - glVertex2f (x+w, y+h); - glVertex2f (x, y+h); - - glEnd (); - glColor3f(1,1,1); - glEnable (GL_TEXTURE_2D); -} -//============================================================================= - -//============================================================================= - -/* -================ -GL_Set2D - -Setup as if the screen was 320*200 -================ -*/ -void GL_Set2D (void) -{ - if (!r_render.value) - return; - glViewport (glx, gly, glwidth, glheight); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity (); - glOrtho (0, vid.width, vid.height, 0, -99999, 99999); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity (); - - glDisable (GL_DEPTH_TEST); - glDisable (GL_CULL_FACE); - glEnable (GL_BLEND); - glDisable (GL_ALPHA_TEST); - glEnable(GL_TEXTURE_2D); - - // LordHavoc: added this - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - - glColor3f(1,1,1); -} - -// LordHavoc: SHOWLMP stuff -#define SHOWLMP_MAXLABELS 256 -typedef struct showlmp_s -{ - qboolean isactive; - float x; - float y; - char label[32]; - char pic[128]; -} showlmp_t; - -showlmp_t showlmp[SHOWLMP_MAXLABELS]; - -void SHOWLMP_decodehide(void) -{ - int i; - byte *lmplabel; - lmplabel = MSG_ReadString(); - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0) + else { - showlmp[i].isactive = false; - return; + if (additive) + { + if (batch) + { + batch = false; + glEnd(); + } + additive = false; + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + } + } + if (color != dq->color) + { + color = dq->color; + glColor4ub((qbyte)(((color >> 24) & 0xFF) >> overbright), (qbyte)(((color >> 16) & 0xFF) >> overbright), (qbyte)(((color >> 8) & 0xFF) >> overbright), (qbyte)(color & 0xFF)); + } + x = dq->x; + y = dq->y; + w = dq->scalex; + h = dq->scaley; + switch(dq->command) + { + case DRAWQUEUE_PIC: + str = (char *)(dq + 1); + if (*str) + { + if (strcmp(str, currentpic)) + { + if (batch) + { + batch = false; + glEnd(); + } + currentpic = str; + pic = Draw_CachePic(str); + glBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex)); + } + if (w == 0) + w = pic->width; + if (h == 0) + h = pic->height; + if (!batch) + { + batch = true; + glBegin(GL_QUADS); + } + //DrawQuad(dq->x, dq->y, w, h, 0, 0, 1, 1); + glTexCoord2f (0, 0);glVertex2f (x , y ); + glTexCoord2f (1, 0);glVertex2f (x+w, y ); + glTexCoord2f (1, 1);glVertex2f (x+w, y+h); + glTexCoord2f (0, 1);glVertex2f (x , y+h); + } + else + { + if (currentpic[0]) + { + if (batch) + { + batch = false; + glEnd(); + } + currentpic = ""; + glBindTexture(GL_TEXTURE_2D, 0); + } + if (!batch) + { + batch = true; + glBegin(GL_QUADS); + } + //DrawQuad(dq->x, dq->y, dq->scalex, dq->scaley, 0, 0, 1, 1); + glTexCoord2f (0, 0);glVertex2f (x , y ); + glTexCoord2f (1, 0);glVertex2f (x+w, y ); + glTexCoord2f (1, 1);glVertex2f (x+w, y+h); + glTexCoord2f (0, 1);glVertex2f (x , y+h); + } + break; + case DRAWQUEUE_STRING: + str = (char *)(dq + 1); + if (strcmp("conchars", currentpic)) + { + if (batch) + { + batch = false; + glEnd(); + } + currentpic = "conchars"; + glBindTexture(GL_TEXTURE_2D, chartexnum); + } + if (!batch) + { + batch = true; + glBegin(GL_QUADS); + } + while ((num = *str++) && x < vid.conwidth) + { + if (num != ' ') + { + 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); + //DrawQuad(x, y, w, h, (num & 15)*0.0625f + (0.5f / 256.0f), (num >> 4)*0.0625f + (0.5f / 256.0f), 0.0625f - (1.0f / 256.0f), 0.0625f - (1.0f / 256.0f)); + glTexCoord2f (s , t );glVertex2f (x , y ); + glTexCoord2f (s+u, t );glVertex2f (x+w, y ); + glTexCoord2f (s+u, t+v);glVertex2f (x+w, y+h); + glTexCoord2f (s , t+v);glVertex2f (x , y+h); + } + x += w; + } + break; } -} - -void SHOWLMP_decodeshow(void) -{ - int i, k; - byte lmplabel[256], picname[256]; - float x, y; - strcpy(lmplabel,MSG_ReadString()); - strcpy(picname, MSG_ReadString()); - if (nehahra) // LordHavoc: nasty old legacy junk - { - x = MSG_ReadByte(); - y = MSG_ReadByte(); } - else + if (batch) + glEnd(); + CHECKGLERROR + + if (!v_hwgamma.integer) { - x = MSG_ReadShort(); - y = MSG_ReadShort(); - } - k = -1; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive) + glDisable(GL_TEXTURE_2D); + CHECKGLERROR + t = v_contrast.value * (float) (1 << v_overbrightbits.integer); + if (t >= 1.01f) { - if (strcmp(showlmp[i].label, lmplabel) == 0) + glBlendFunc (GL_DST_COLOR, GL_ONE); + CHECKGLERROR + glBegin (GL_TRIANGLES); + while (t >= 1.01f) { - k = i; - break; // drop out to replace it + num = (int) ((t - 1.0f) * 255.0f); + if (num > 255) + num = 255; + glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255); + glVertex2f (-5000, -5000); + glVertex2f (10000, -5000); + glVertex2f (-5000, 10000); + t *= 0.5; } + glEnd (); + CHECKGLERROR } - else if (k < 0) // find first empty one to replace - k = i; - if (k < 0) - return; // none found to replace - // change existing one - showlmp[k].isactive = true; - strcpy(showlmp[k].label, lmplabel); - strcpy(showlmp[k].pic, picname); - showlmp[k].x = x; - showlmp[k].y = y; -} - -void SHOWLMP_drawall(void) -{ - int i; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive) - Draw_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic)); -} + else if (t <= 0.99f) + { + glBlendFunc(GL_ZERO, GL_SRC_COLOR); + CHECKGLERROR + glBegin(GL_TRIANGLES); + num = (int) (t * 255.0f); + glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255); + glVertex2f (-5000, -5000); + glVertex2f (10000, -5000); + glVertex2f (-5000, 10000); + glEnd(); + CHECKGLERROR + } + if (v_brightness.value >= 0.01f) + { + glBlendFunc (GL_ONE, GL_ONE); + CHECKGLERROR + num = (int) (v_brightness.value * 255.0f); + glColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255); + CHECKGLERROR + glBegin (GL_TRIANGLES); + glVertex2f (-5000, -5000); + glVertex2f (10000, -5000); + glVertex2f (-5000, 10000); + glEnd (); + CHECKGLERROR + } + glEnable(GL_TEXTURE_2D); + CHECKGLERROR + } -void SHOWLMP_clear(void) -{ - int i; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - showlmp[i].isactive = false; + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + CHECKGLERROR + glEnable (GL_CULL_FACE); + CHECKGLERROR + glEnable (GL_DEPTH_TEST); + CHECKGLERROR + glDisable (GL_BLEND); + CHECKGLERROR + glColor4ub (255, 255, 255, 255); + CHECKGLERROR }