From 1edb27c470309df9ae26659fef6b1d071264c71e Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Fri, 17 Nov 2000 11:28:38 +0000 Subject: [PATCH] obliterated Draw_TransPic and relatives, also fixed Draw_TransPicTranslate, and restored pics to normal brightness git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@82 d7cf8633-e32d-0410-b094-e92efae38249 --- draw.h | 3 +-- gl_draw.c | 71 ++++++++++++------------------------------------ menu.c | 81 ++++++++++++++++++++++++++----------------------------- sbar.c | 31 +++++++-------------- vid_wgl.c | 1 - 5 files changed, 65 insertions(+), 122 deletions(-) diff --git a/draw.h b/draw.h index ddb8e35b..f82092c3 100644 --- a/draw.h +++ b/draw.h @@ -27,8 +27,7 @@ void Draw_Init (void); void Draw_Character (int x, int y, int num); void Draw_GenericPic (int texnum, float red, float green, float blue, float alpha, float x, float y, float width, float height); void Draw_Pic (int x, int y, qpic_t *pic); -void Draw_TransPic (int x, int y, qpic_t *pic); -void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation); +void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation); void Draw_ConsoleBackground (int lines); void Draw_Fill (int x, int y, int w, int h, int c); void Draw_String (int x, int y, char *str, int maxlen); // LordHavoc: added maxlen diff --git a/gl_draw.c b/gl_draw.c index 69c8d7b8..4e8b7186 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern unsigned char d_15to8table[65536]; cvar_t qsg_version = {"qsg_version", "1"}; -cvar_t gl_conalpha = {"gl_conalpha", "1"}; +cvar_t scr_conalpha = {"scr_conalpha", "1"}; byte *draw_chars; // 8*8 graphic characters qpic_t *draw_disc; @@ -319,7 +319,7 @@ void GL_Draw_Init (void) { int i; Cvar_RegisterVariable (&qsg_version); - Cvar_RegisterVariable (&gl_conalpha); + Cvar_RegisterVariable (&scr_conalpha); Cmd_AddCommand ("loadsky", &LoadSky_f); @@ -490,13 +490,8 @@ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha) if (scrap_dirty) Scrap_Upload (); gl = (glpic_t *)pic->data; -// glDisable(GL_ALPHA_TEST); -// glEnable (GL_BLEND); -// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -// glCullFace(GL_FRONT); - glColor4f(0.8,0.8,0.8,alpha); + glColor4f(1,1,1,alpha); glBindTexture(GL_TEXTURE_2D, gl->texnum); -// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glBegin (GL_QUADS); glTexCoord2f (gl->sl, gl->tl); glVertex2f (x, y); @@ -507,9 +502,6 @@ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha) glTexCoord2f (gl->sl, gl->th); glVertex2f (x, y+pic->height); glEnd (); - glColor3f(1,1,1); -// glEnable(GL_ALPHA_TEST); -// glDisable (GL_BLEND); } @@ -525,7 +517,7 @@ void Draw_Pic (int x, int y, qpic_t *pic) if (scrap_dirty) Scrap_Upload (); gl = (glpic_t *)pic->data; - glColor3f(0.8,0.8,0.8); + glColor3f(1,1,1); glBindTexture(GL_TEXTURE_2D, gl->texnum); glBegin (GL_QUADS); glTexCoord2f (gl->sl, gl->tl); @@ -542,55 +534,26 @@ void Draw_Pic (int x, int y, qpic_t *pic) /* ============= -Draw_TransPic -============= -*/ -void Draw_TransPic (int x, int y, qpic_t *pic) -{ - if (x < 0 || (unsigned)(x + pic->width) > vid.width || y < 0 || (unsigned)(y + pic->height) > vid.height) - Sys_Error ("Draw_TransPic: bad coordinates"); - -// glEnable(GL_BLEND); -// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -// glDisable(GL_ALPHA_TEST); - Draw_Pic (x, y, pic); -// glDisable(GL_BLEND); -} - - -/* -============= -Draw_TransPicTranslate +Draw_PicTranslate Only used for the player color selection menu ============= */ -void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation) +void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation) { - int v, u, c; - unsigned trans[64*64], *dest; - byte *src; - int p; + int i, c; + byte *trans, *src, *dest; c = pic->width * pic->height; + src = menuplyr_pixels; + dest = trans = malloc(c); + for (i = 0;i < c;i++) + *dest++ = translation[*src++]; - dest = trans; - for (v=0 ; v<64 ; v++, dest += 64) - { - src = &menuplyr_pixels[ ((v*pic->height)>>6) *pic->width]; - for (u=0 ; u<64 ; u++) - { - p = src[(u*pic->width)>>6]; - if (p == 255) - dest[u] = p; - else - dest[u] = d_8to24table[translation[p]]; - } - } - - glBindTexture(GL_TEXTURE_2D, GL_LoadTexture ("translatedplayerpic", 64, 64, (void *) trans, false, true, 1)); + glBindTexture(GL_TEXTURE_2D, GL_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, false, true, 1)); + free(trans); - glColor3f(0.8,0.8,0.8); + glColor3f(1,1,1); glBegin (GL_QUADS); glTexCoord2f (0, 0); glVertex2f (x, y); @@ -618,7 +581,7 @@ void Draw_ConsoleBackground (int lines) if (lines >= (int) vid.height) Draw_Pic(0, lines - vid.height, conback); else - Draw_AlphaPic (0, lines - vid.height, conback, gl_conalpha.value*lines/vid.height); + Draw_AlphaPic (0, lines - vid.height, conback, scr_conalpha.value*lines/vid.height); // Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y); // LordHavoc: draw version Draw_String(engineversionx, lines - vid.height + engineversiony, engineversion, 9999); @@ -745,7 +708,7 @@ void SHOWLMP_drawall() int i; for (i = 0;i < SHOWLMP_MAXLABELS;i++) if (showlmp[i].isactive) - Draw_TransPic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic)); + Draw_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic)); } void SHOWLMP_clear() diff --git a/menu.c b/menu.c index a24f30ab..28de58ec 100644 --- a/menu.c +++ b/menu.c @@ -150,11 +150,6 @@ void M_PrintWhite (int cx, int cy, char *str) } } -void M_DrawTransPic (int x, int y, qpic_t *pic) -{ - Draw_TransPic (x + ((vid.width - 320)>>1), y, pic); -} - void M_DrawPic (int x, int y, qpic_t *pic) { Draw_Pic (x + ((vid.width - 320)>>1), y, pic); @@ -190,9 +185,9 @@ void M_BuildTranslationTable(int top, int bottom) } -void M_DrawTransPicTranslate (int x, int y, qpic_t *pic) +void M_DrawPicTranslate (int x, int y, qpic_t *pic) { - Draw_TransPicTranslate (x + ((vid.width - 320)>>1), y, pic, translationTable); + Draw_PicTranslate (x + ((vid.width - 320)>>1), y, pic, translationTable); } @@ -206,15 +201,15 @@ void M_DrawTextBox (int x, int y, int width, int lines) cx = x; cy = y; p = Draw_CachePic ("gfx/box_tl.lmp"); - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); p = Draw_CachePic ("gfx/box_ml.lmp"); for (n = 0; n < lines; n++) { cy += 8; - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); } p = Draw_CachePic ("gfx/box_bl.lmp"); - M_DrawTransPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, p); // draw middle cx += 8; @@ -222,17 +217,17 @@ void M_DrawTextBox (int x, int y, int width, int lines) { cy = y; p = Draw_CachePic ("gfx/box_tm.lmp"); - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); p = Draw_CachePic ("gfx/box_mm.lmp"); for (n = 0; n < lines; n++) { cy += 8; if (n == 1) p = Draw_CachePic ("gfx/box_mm2.lmp"); - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); } p = Draw_CachePic ("gfx/box_bm.lmp"); - M_DrawTransPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, p); width -= 2; cx += 16; } @@ -240,15 +235,15 @@ void M_DrawTextBox (int x, int y, int width, int lines) // draw right side cy = y; p = Draw_CachePic ("gfx/box_tr.lmp"); - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); p = Draw_CachePic ("gfx/box_mr.lmp"); for (n = 0; n < lines; n++) { cy += 8; - M_DrawTransPic (cx, cy, p); + M_DrawPic (cx, cy, p); } p = Draw_CachePic ("gfx/box_br.lmp"); - M_DrawTransPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, p); } //============================================================================= @@ -415,25 +410,25 @@ void M_Main_Draw (void) int f; qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/ttl_main.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); // Nehahra if (nehahra) { if (NehGameType == TYPE_BOTH) - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); + M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); else if (NehGameType == TYPE_GAME) - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/gamemenu.lmp")); + M_DrawPic (72, 32, Draw_CachePic ("gfx/gamemenu.lmp")); else - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/demomenu.lmp")); + M_DrawPic (72, 32, Draw_CachePic ("gfx/demomenu.lmp")); } else - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); + M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); f = (int)(host_time * 10)%6; - M_DrawTransPic (54, 32 + m_main_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_main_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); } @@ -599,14 +594,14 @@ void M_SinglePlayer_Draw (void) int f; qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/ttl_sgl.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") ); + M_DrawPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") ); f = (int)(host_time * 10)%6; - M_DrawTransPic (54, 32 + m_singleplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_singleplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); } @@ -847,14 +842,14 @@ void M_MultiPlayer_Draw (void) int f; qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); - M_DrawTransPic (72, 32, Draw_CachePic ("gfx/mp_menu.lmp") ); + M_DrawPic (72, 32, Draw_CachePic ("gfx/mp_menu.lmp") ); f = (int)(host_time * 10)%6; - M_DrawTransPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); if (serialAvailable || ipxAvailable || tcpipAvailable) return; @@ -934,7 +929,7 @@ void M_Setup_Draw (void) { qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); @@ -953,10 +948,10 @@ void M_Setup_Draw (void) M_Print (72, 140, "Accept Changes"); p = Draw_CachePic ("gfx/bigbox.lmp"); - M_DrawTransPic (160, 64, p); + M_DrawPic (160, 64, p); p = Draw_CachePic ("gfx/menuplyr.lmp"); M_BuildTranslationTable(setup_top*16, setup_bottom*16); - M_DrawTransPicTranslate (172, 72, p); + M_DrawPicTranslate (172, 72, p); M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); @@ -1127,7 +1122,7 @@ void M_Net_Draw (void) int f; qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); @@ -1147,7 +1142,7 @@ void M_Net_Draw (void) } if (p) - M_DrawTransPic (72, f, p); + M_DrawPic (72, f, p); f += 19; @@ -1165,27 +1160,27 @@ void M_Net_Draw (void) } if (p) - M_DrawTransPic (72, f, p); + M_DrawPic (72, f, p); f += 19; if (ipxAvailable) p = Draw_CachePic ("gfx/netmen3.lmp"); else p = Draw_CachePic ("gfx/dim_ipx.lmp"); - M_DrawTransPic (72, f, p); + M_DrawPic (72, f, p); f += 19; if (tcpipAvailable) p = Draw_CachePic ("gfx/netmen4.lmp"); else p = Draw_CachePic ("gfx/dim_tcp.lmp"); - M_DrawTransPic (72, f, p); + M_DrawPic (72, f, p); if (m_net_items == 5) // JDC, could just be removed { f += 19; p = Draw_CachePic ("gfx/netmen5.lmp"); - M_DrawTransPic (72, f, p); + M_DrawPic (72, f, p); } f = (320-26*8)/2; @@ -1197,7 +1192,7 @@ void M_Net_Draw (void) M_Print (f, 166, net_helpMessage[m_net_cursor*4+3]); f = (int)(host_time * 10)%6; - M_DrawTransPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); } @@ -1406,7 +1401,7 @@ void M_Options_Draw (void) float r; qpic_t *p; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_option.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); @@ -2004,7 +1999,7 @@ void M_SerialConfig_Draw (void) char *startJoin; char *directModem; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); basex = (320-p->width)/2; M_DrawPic (basex, 4, p); @@ -2258,7 +2253,7 @@ void M_ModemConfig_Draw (void) qpic_t *p; int basex; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); basex = (320-p->width)/2; M_DrawPic (basex, 4, p); @@ -2444,7 +2439,7 @@ void M_LanConfig_Draw (void) char *startJoin; char *protocol; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); basex = (320-p->width)/2; M_DrawPic (basex, 4, p); @@ -2813,7 +2808,7 @@ void M_GameOptions_Draw (void) qpic_t *p; int x; - M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); p = Draw_CachePic ("gfx/p_multi.lmp"); M_DrawPic ( (320-p->width)/2, 4, p); diff --git a/sbar.c b/sbar.c index d429f698..fd63c133 100644 --- a/sbar.c +++ b/sbar.c @@ -260,19 +260,6 @@ void Sbar_DrawAlphaPic (int x, int y, qpic_t *pic, float alpha) Draw_AlphaPic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic, alpha); } -/* -============= -Sbar_DrawTransPic -============= -*/ -void Sbar_DrawTransPic (int x, int y, qpic_t *pic) -{ - if (cl.gametype == GAME_DEATHMATCH) - Draw_TransPic (x /*+ ((vid.width - 320)>>1)*/, y + (vid.height-SBAR_HEIGHT), pic); - else - Draw_TransPic (x + ((vid.width - 320)>>1), y + (vid.height-SBAR_HEIGHT), pic); -} - /* ================ Sbar_DrawCharacter @@ -362,7 +349,7 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color) else frame = *ptr -'0'; - Sbar_DrawTransPic (x,y,sb_nums[color][frame]); + Sbar_DrawPic (x,y,sb_nums[color][frame]); x += 24; ptr++; } @@ -954,7 +941,7 @@ void Sbar_IntermissionNumber (int x, int y, int num, int digits, int color) else frame = *ptr -'0'; - Draw_TransPic (x,y,sb_nums[color][frame]); + Draw_Pic (x,y,sb_nums[color][frame]); x += 24; ptr++; } @@ -1114,22 +1101,22 @@ void Sbar_IntermissionOverlay (void) Draw_Pic (64, 24, pic); pic = Draw_CachePic ("gfx/inter.lmp"); - Draw_TransPic (0, 56, pic); + Draw_Pic (0, 56, pic); // time dig = cl.completed_time/60; Sbar_IntermissionNumber (160, 64, dig, 3, 0); num = cl.completed_time - dig*60; - Draw_TransPic (234,64,sb_colon); - Draw_TransPic (246,64,sb_nums[0][num/10]); - Draw_TransPic (266,64,sb_nums[0][num%10]); + Draw_Pic (234,64,sb_colon); + Draw_Pic (246,64,sb_nums[0][num/10]); + Draw_Pic (266,64,sb_nums[0][num%10]); Sbar_IntermissionNumber (160, 104, cl.stats[STAT_SECRETS], 3, 0); - Draw_TransPic (232,104,sb_slash); + Draw_Pic (232,104,sb_slash); Sbar_IntermissionNumber (240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0); Sbar_IntermissionNumber (160, 144, cl.stats[STAT_MONSTERS], 3, 0); - Draw_TransPic (232,144,sb_slash); + Draw_Pic (232,144,sb_slash); Sbar_IntermissionNumber (240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0); } @@ -1148,5 +1135,5 @@ void Sbar_FinaleOverlay (void) scr_copyeverything = 1; pic = Draw_CachePic ("gfx/finale.lmp"); - Draw_TransPic ( (vid.width-pic->width)/2, 16, pic); + Draw_Pic ( (vid.width-pic->width)/2, 16, pic); } diff --git a/vid_wgl.c b/vid_wgl.c index 64f9c41a..374a7d81 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -1671,7 +1671,6 @@ extern void M_Menu_Options_f (void); extern void M_Print (int cx, int cy, char *str); extern void M_PrintWhite (int cx, int cy, char *str); extern void M_DrawCharacter (int cx, int line, int num); -extern void M_DrawTransPic (int x, int y, qpic_t *pic); extern void M_DrawPic (int x, int y, qpic_t *pic); static int vid_line, vid_wmodes; -- 2.39.2