X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=330aff43dca48da4bcb0a217f7e9d012360f856b;hb=ccedf7b7412cf79caef57fa151bc18c1718228c7;hp=8b0a43783c17af66c68a224457207ee79a80732a;hpb=4ee1d4780706dc1ed70ec4f7aa8b7712518a5c4f;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 8b0a4378..330aff43 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -23,100 +23,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -#define GL_COLOR_INDEX8_EXT 0x80E5 +//#define GL_COLOR_INDEX8_EXT 0x80E5 -cvar_t qsg_version = {"qsg_version", "1"}; cvar_t scr_conalpha = {"scr_conalpha", "1"}; byte *draw_chars; // 8*8 graphic characters qpic_t *draw_disc; -int char_texture; +rtexture_t *char_texture; typedef struct { - int texnum; - float sl, tl, sh, th; + rtexture_t *tex; } glpic_t; -int conbacktexnum; - -/* -============================================================================= - - scrap allocation - - Allocate all the little status bar obejcts into a single texture - to crutch up stupid hardware / drivers - -============================================================================= -*/ - -/* -#define MAX_SCRAPS 2 -#define BLOCK_WIDTH 256 -#define BLOCK_HEIGHT 256 - -int scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH]; -byte scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT*4]; -qboolean scrap_dirty; - -// returns a texture number and the position inside it -int Scrap_AllocBlock (int w, int h, int *x, int *y) -{ - int i, j; - int best, best2; - int texnum; - - for (texnum=0 ; texnum= best) - break; - if (scrap_allocated[texnum][i+j] > best2) - best2 = scrap_allocated[texnum][i+j]; - } - if (j == w) - { // this is a valid spot - *x = i; - *y = best = best2; - } - } - - if (best + h > BLOCK_HEIGHT) - continue; - - for (i=0 ; idata; - // load little ones into the scrap - /* - if (p->width < 64 && p->height < 64) - { - int x, y; - int i, j, k; - int texnum; - - texnum = Scrap_AllocBlock (p->width, p->height, &x, &y); - scrap_dirty = true; - k = 0; - for (i=0 ; iheight ; i++) - for (j=0 ; jwidth ; j++, k++) - scrap_texels[texnum][(y+i)*BLOCK_WIDTH + x + j] = p->data[k]; - if (!scraptexnum[texnum]) - scraptexnum[texnum] = GL_LoadTexture (va("scrapslot%d", texnum), BLOCK_WIDTH, BLOCK_HEIGHT, scrap_texels[texnum], false, true, 1); - gl->texnum = scraptexnum[texnum]; - gl->sl = (x+0.01)/(float)BLOCK_WIDTH; - gl->sh = (x+p->width-0.01)/(float)BLOCK_WIDTH; - gl->tl = (y+0.01)/(float)BLOCK_WIDTH; - gl->th = (y+p->height-0.01)/(float)BLOCK_WIDTH; - - pic_count++; - pic_texels += p->width*p->height; - } - else - { - */ - gl->texnum = GL_LoadPicTexture (p); - gl->sl = 0; - gl->sh = 1; - gl->tl = 0; - gl->th = 1; - //} + gl->tex = R_LoadTexture (name, p->width, p->height, p->data, TEXF_ALPHA | TEXF_PRECACHE); return p; } @@ -224,34 +110,25 @@ qpic_t *Draw_CachePic (char *path) pic->pic.height = dat->height; gl = (glpic_t *)pic->pic.data; - gl->texnum = loadtextureimage(path, 0, 0, false, false); - if (!gl->texnum) - gl->texnum = GL_LoadPicTexture (dat); - gl->sl = 0; - gl->sh = 1; - gl->tl = 0; - gl->th = 1; + 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; } -extern void LoadSky_f(void); - /* =============== Draw_Init =============== */ -void rmain_registercvars(); -extern int buildnumber; - -void gl_draw_start() +void gl_draw_start(void) { int i; - char_texture = loadtextureimage ("conchars", 0, 0, false, false); + char_texture = loadtextureimage ("conchars", 0, 0, false, false, true); if (!char_texture) { draw_chars = W_GetLumpName ("conchars"); @@ -260,33 +137,32 @@ void gl_draw_start() draw_chars[i] = 255; // proper transparent color // now turn them into textures - char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1); + char_texture = R_LoadTexture ("charset", 128, 128, draw_chars, TEXF_ALPHA | TEXF_PRECACHE); } - conbacktexnum = loadtextureimage("gfx/conback", 0, 0, false, false); - -// memset(scraptexnum, 0, sizeof(scraptexnum)); + conbacktex = loadtextureimage("gfx/conback", 0, 0, false, false, true); // get the other pics we need draw_disc = Draw_PicFromWad ("disc"); } -void gl_draw_shutdown() +void gl_draw_shutdown(void) +{ +} + +void gl_draw_newmap(void) { } char engineversion[40]; int engineversionx, engineversiony; -extern void GL_Textures_Init(); +extern void R_Textures_Init(); void GL_Draw_Init (void) { int i; - Cvar_RegisterVariable (&qsg_version); Cvar_RegisterVariable (&scr_conalpha); - Cmd_AddCommand ("loadsky", &LoadSky_f); - #if defined(__linux__) sprintf (engineversion, "DarkPlaces Linux GL %.2f build %3i", (float) VERSION, buildnumber); #elif defined(WIN32) @@ -299,8 +175,8 @@ void GL_Draw_Init (void) engineversionx = vid.width - strlen(engineversion) * 8 - 8; engineversiony = vid.height - 8; - GL_Textures_Init(); - R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown); + R_Textures_Init(); + R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap); } /* @@ -334,15 +210,23 @@ void Draw_Character (int x, int y, int num) if (!r_render.value) return; - glBindTexture(GL_TEXTURE_2D, char_texture); + glBindTexture(GL_TEXTURE_2D, R_GetTexture(char_texture)); // LordHavoc: NEAREST mode on text if not scaling up - if (glwidth < (int) vid.width) + 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); + } - glColor3f(1,1,1); + 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); @@ -355,8 +239,11 @@ void Draw_Character (int x, int y, int num) glEnd (); // LordHavoc: revert to LINEAR mode - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +// 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); +// } } /* @@ -377,16 +264,24 @@ void Draw_String (int x, int y, char *str, int maxlen) maxlen = strlen(str); else if (maxlen > (int) strlen(str)) maxlen = strlen(str); - glBindTexture(GL_TEXTURE_2D, char_texture); + glBindTexture(GL_TEXTURE_2D, R_GetTexture(char_texture)); // LordHavoc: NEAREST mode on text if not scaling up - if (glwidth < (int) vid.width) + 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); + } - glColor3f(1,1,1); + 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 { @@ -404,16 +299,22 @@ void Draw_String (int x, int y, char *str, int maxlen) glEnd (); // LordHavoc: revert to LINEAR mode - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +// 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 (int texnum, float red, float green, float blue, float alpha, int x, int y, int width, int height) +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; - glColor4f(red,green,blue,alpha); - glBindTexture(GL_TEXTURE_2D, texnum); + 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); @@ -429,21 +330,7 @@ Draw_AlphaPic */ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha) { - glpic_t *gl; - -// if (scrap_dirty) -// Scrap_Upload (); - gl = (glpic_t *)pic->data; - if (!r_render.value) - return; - glColor4f(1,1,1,alpha); - glBindTexture(GL_TEXTURE_2D, gl->texnum); - glBegin (GL_QUADS); - glTexCoord2f (gl->sl, gl->tl);glVertex2f (x, y); - glTexCoord2f (gl->sh, gl->tl);glVertex2f (x+pic->width, y); - glTexCoord2f (gl->sh, gl->th);glVertex2f (x+pic->width, y+pic->height); - glTexCoord2f (gl->sl, gl->th);glVertex2f (x, y+pic->height); - glEnd (); + Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,alpha, x,y,pic->width, pic->height); } @@ -454,21 +341,7 @@ Draw_Pic */ void Draw_Pic (int x, int y, qpic_t *pic) { - glpic_t *gl; - -// if (scrap_dirty) -// Scrap_Upload (); - gl = (glpic_t *)pic->data; - if (!r_render.value) - return; - glColor3f(1,1,1); - glBindTexture(GL_TEXTURE_2D, gl->texnum); - glBegin (GL_QUADS); - glTexCoord2f (gl->sl, gl->tl);glVertex2f (x, y); - glTexCoord2f (gl->sh, gl->tl);glVertex2f (x+pic->width, y); - glTexCoord2f (gl->sh, gl->th);glVertex2f (x+pic->width, y+pic->height); - glTexCoord2f (gl->sl, gl->th);glVertex2f (x, y+pic->height); - glEnd (); + Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,1, x,y,pic->width, pic->height); } @@ -483,6 +356,7 @@ 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; @@ -490,22 +364,12 @@ void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation) for (i = 0;i < c;i++) *dest++ = translation[*src++]; - c = GL_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, false, true, 1); + rt = R_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, TEXF_ALPHA | TEXF_PRECACHE); qfree(trans); if (!r_render.value) return; - Draw_GenericPic (c, 1,1,1,1, x, y, pic->width, pic->height); - /* - glBindTexture(GL_TEXTURE_2D, c); - glColor3f(1,1,1); - glBegin (GL_QUADS); - glTexCoord2f (0, 0);glVertex2f (x, y); - glTexCoord2f (1, 0);glVertex2f (x+pic->width, y); - glTexCoord2f (1, 1);glVertex2f (x+pic->width, y+pic->height); - glTexCoord2f (0, 1);glVertex2f (x, y+pic->height); - glEnd (); - */ + Draw_GenericPic (rt, 1,1,1,1, x, y, pic->width, pic->height); } @@ -517,7 +381,7 @@ Draw_ConsoleBackground */ void Draw_ConsoleBackground (int lines) { - Draw_GenericPic (conbacktexnum, 1,1,1,scr_conalpha.value*lines/vid.height, 0, lines - vid.height, vid.width, vid.height); + 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); } @@ -534,7 +398,13 @@ void Draw_Fill (int x, int y, int w, int h, int c) if (!r_render.value) return; glDisable (GL_TEXTURE_2D); - glColor3f (host_basepal[c*3]/255.0, host_basepal[c*3+1]/255.0, host_basepal[c*3+2]/255.0); + 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); @@ -597,7 +467,7 @@ typedef struct showlmp_s showlmp_t showlmp[SHOWLMP_MAXLABELS]; -void SHOWLMP_decodehide() +void SHOWLMP_decodehide(void) { int i; byte *lmplabel; @@ -610,15 +480,23 @@ void SHOWLMP_decodehide() } } -void SHOWLMP_decodeshow() +void SHOWLMP_decodeshow(void) { int i, k; byte lmplabel[256], picname[256]; float x, y; strcpy(lmplabel,MSG_ReadString()); strcpy(picname, MSG_ReadString()); - x = MSG_ReadByte(); - y = MSG_ReadByte(); + if (nehahra) // LordHavoc: nasty old legacy junk + { + x = MSG_ReadByte(); + y = MSG_ReadByte(); + } + else + { + x = MSG_ReadShort(); + y = MSG_ReadShort(); + } k = -1; for (i = 0;i < SHOWLMP_MAXLABELS;i++) if (showlmp[i].isactive) @@ -641,7 +519,7 @@ void SHOWLMP_decodeshow() showlmp[k].y = y; } -void SHOWLMP_drawall() +void SHOWLMP_drawall(void) { int i; for (i = 0;i < SHOWLMP_MAXLABELS;i++) @@ -649,7 +527,7 @@ void SHOWLMP_drawall() Draw_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic)); } -void SHOWLMP_clear() +void SHOWLMP_clear(void) { int i; for (i = 0;i < SHOWLMP_MAXLABELS;i++)