From c137615aa75afda8c744e57278c138bd29d5d68e Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 1 Oct 2008 18:19:11 +0000 Subject: Rename "FuzzColumn"/"FuzzPatch" for Heretic/Hexen code to TLColumn/TLPatch for consistency; these are translucent draw functions, not fuzzy draw functions like Doom's R_DrawFuzzColumn. Subversion-branch: /branches/raven-branch Subversion-revision: 1313 --- src/heretic/doomdef.h | 2 +- src/heretic/in_lude.c | 12 ++++++------ src/heretic/r_draw.c | 37 ++++--------------------------------- src/heretic/r_local.h | 8 ++++---- src/heretic/r_main.c | 6 +++--- src/heretic/r_things.c | 10 +++++----- src/heretic/sb_bar.c | 6 +++--- 7 files changed, 26 insertions(+), 55 deletions(-) (limited to 'src/heretic') diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h index afadc19f..aac70e2f 100644 --- a/src/heretic/doomdef.h +++ b/src/heretic/doomdef.h @@ -231,7 +231,7 @@ typedef struct #define MF_MISSILE 0x10000 // don't hit same species, explode on block #define MF_DROPPED 0x20000 // dropped by a demon, not level spawned -#define MF_SHADOW 0x40000 // use fuzzy draw (shadow demons / invis) +#define MF_SHADOW 0x40000 // use translucent draw (shadow demons / invis) #define MF_NOBLOOD 0x80000 // don't bleed when shot (use puff) #define MF_CORPSE 0x100000 // don't stop moving halfway off a step #define MF_INFLOAT 0x200000 // floating to a height for a move, don't diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c index 21a37ca7..f0899abb 100644 --- a/src/heretic/in_lude.c +++ b/src/heretic/in_lude.c @@ -896,12 +896,12 @@ void IN_DrawDMStats(void) } else { - V_DrawFuzzPatch(40, ypos, - W_CacheLumpNum(patchFaceOkayBase + i, - PU_CACHE)); - V_DrawFuzzPatch(xpos, 18, - W_CacheLumpNum(patchFaceDeadBase + i, - PU_CACHE)); + V_DrawTLPatch(40, ypos, + W_CacheLumpNum(patchFaceOkayBase + i, + PU_CACHE)); + V_DrawTLPatch(xpos, 18, + W_CacheLumpNum(patchFaceDeadBase + i, + PU_CACHE)); } kpos = 86; for (j = 0; j < MAXPLAYERS; j++) diff --git a/src/heretic/r_draw.c b/src/heretic/r_draw.c index 4315c600..468645f6 100644 --- a/src/heretic/r_draw.c +++ b/src/heretic/r_draw.c @@ -120,22 +120,9 @@ void R_DrawColumnLow(void) while (count--); } +// Translucent column draw - blended with background using tinttable. -#define FUZZTABLE 50 - -#define FUZZOFF (SCREENWIDTH) -int fuzzoffset[FUZZTABLE] = { - FUZZOFF, -FUZZOFF, FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, -FUZZOFF, FUZZOFF, - FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, FUZZOFF, -FUZZOFF, FUZZOFF, - FUZZOFF, FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF, FUZZOFF, - -FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, FUZZOFF, FUZZOFF, -FUZZOFF, - FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, -FUZZOFF, -FUZZOFF, FUZZOFF, - FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, - FUZZOFF, FUZZOFF, -FUZZOFF, FUZZOFF, FUZZOFF, -FUZZOFF, FUZZOFF -}; -int fuzzpos = 0; - -void R_DrawFuzzColumn(void) +void R_DrawTLColumn(void) { int count; byte *dest; @@ -152,7 +139,7 @@ void R_DrawFuzzColumn(void) #ifdef RANGECHECK if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT) - I_Error("R_DrawFuzzColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); + I_Error("R_DrawTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); #endif dest = ylookup[dc_yl] + columnofs[dc_x]; @@ -160,28 +147,12 @@ void R_DrawFuzzColumn(void) fracstep = dc_iscale; frac = dc_texturemid + (dc_yl - centery) * fracstep; -// OLD FUZZY INVISO SPRITE STUFF -/* do - { - *dest = colormaps[6*256+dest[fuzzoffset[fuzzpos]]]; - if (++fuzzpos == FUZZTABLE) - fuzzpos = 0; - dest += SCREENWIDTH; - frac += fracstep; - } while (count--); -*/ - do { *dest = tinttable[((*dest) << 8) + dc_colormap[dc_source[(frac >> FRACBITS) & 127]]]; - //*dest = dest[SCREENWIDTH*10+5]; - -// *dest = //tinttable[((*dest)<<8)+colormaps[dc_source[(frac>>FRACBITS)&127]]]; - -// *dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]]; dest += SCREENWIDTH; frac += fracstep; } @@ -228,7 +199,7 @@ void R_DrawTranslatedColumn(void) while (count--); } -void R_DrawTranslatedFuzzColumn(void) +void R_DrawTranslatedTLColumn(void) { int count; byte *dest; diff --git a/src/heretic/r_local.h b/src/heretic/r_local.h index c7ae4329..d273fea7 100644 --- a/src/heretic/r_local.h +++ b/src/heretic/r_local.h @@ -302,7 +302,7 @@ extern int detailshift; // 0 = high, 1 = low extern void (*colfunc) (void); extern void (*basecolfunc) (void); -extern void (*fuzzcolfunc) (void); +extern void (*tlcolfunc) (void); extern void (*spanfunc) (void); int R_PointOnSide(fixed_t x, fixed_t y, node_t * node); @@ -455,10 +455,10 @@ extern byte *dc_source; // first pixel in a column void R_DrawColumn(void); void R_DrawColumnLow(void); -void R_DrawFuzzColumn(void); -void R_DrawFuzzColumnLow(void); +void R_DrawTLColumn(void); +void R_DrawTLColumnLow(void); void R_DrawTranslatedColumn(void); -void R_DrawTranslatedFuzzColumn(void); +void R_DrawTranslatedTLColumn(void); void R_DrawTranslatedColumnLow(void); extern int ds_y; diff --git a/src/heretic/r_main.c b/src/heretic/r_main.c index e75d35bb..f13ebfa7 100644 --- a/src/heretic/r_main.c +++ b/src/heretic/r_main.c @@ -77,7 +77,7 @@ int extralight; // bumped light from gun blasts void (*colfunc) (void); void (*basecolfunc) (void); -void (*fuzzcolfunc) (void); +void (*tlcolfunc) (void); void (*transcolfunc) (void); void (*spanfunc) (void); @@ -583,14 +583,14 @@ void R_ExecuteSetViewSize(void) if (!detailshift) { colfunc = basecolfunc = R_DrawColumn; - fuzzcolfunc = R_DrawFuzzColumn; + tlcolfunc = R_DrawTLColumn; transcolfunc = R_DrawTranslatedColumn; spanfunc = R_DrawSpan; } else { colfunc = basecolfunc = R_DrawColumnLow; - fuzzcolfunc = R_DrawFuzzColumn; + tlcolfunc = R_DrawTLColumn; transcolfunc = R_DrawTranslatedColumn; spanfunc = R_DrawSpanLow; } diff --git a/src/heretic/r_things.c b/src/heretic/r_things.c index a3bf3c19..0cf28aa7 100644 --- a/src/heretic/r_things.c +++ b/src/heretic/r_things.c @@ -29,7 +29,7 @@ #include "r_local.h" void R_DrawColumn(void); -void R_DrawFuzzColumn(void); +void R_DrawTLColumn(void); typedef struct { @@ -355,7 +355,7 @@ void R_DrawMaskedColumn(column_t * column, signed int baseclip) dc_source = (byte *) column + 3; dc_texturemid = basetexturemid - (column->topdelta << FRACBITS); // dc_source = (byte *)column + 3 - column->topdelta; - colfunc(); // either R_DrawColumn or R_DrawFuzzColumn + colfunc(); // either R_DrawColumn or R_DrawTLColumn } column = (column_t *) ((byte *) column + column->length + 4); } @@ -387,19 +387,19 @@ void R_DrawVisSprite(vissprite_t * vis, int x1, int x2) dc_colormap = vis->colormap; // if(!dc_colormap) -// colfunc = fuzzcolfunc; // NULL colormap = shadow draw +// colfunc = tlcolfunc; // NULL colormap = shadow draw if (vis->mobjflags & MF_SHADOW) { if (vis->mobjflags & MF_TRANSLATION) { - colfunc = R_DrawTranslatedFuzzColumn; + colfunc = R_DrawTranslatedTLColumn; dc_translation = translationtables - 256 + ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8)); } else { // Draw using shadow column function - colfunc = fuzzcolfunc; + colfunc = tlcolfunc; } } else if (vis->mobjflags & MF_TRANSLATION) diff --git a/src/heretic/sb_bar.c b/src/heretic/sb_bar.c index bcf214a8..3fefe54f 100644 --- a/src/heretic/sb_bar.c +++ b/src/heretic/sb_bar.c @@ -948,7 +948,7 @@ void DrawFullScreenStuff(void) { if (CPlayer->readyArtifact > 0) { - V_DrawFuzzPatch(286, 170, W_CacheLumpName("ARTIBOX", PU_CACHE)); + V_DrawTLPatch(286, 170, W_CacheLumpName("ARTIBOX", PU_CACHE)); V_DrawPatch(286, 170, W_CacheLumpName(patcharti[CPlayer->readyArtifact], PU_CACHE)); @@ -960,8 +960,8 @@ void DrawFullScreenStuff(void) x = inv_ptr - curpos; for (i = 0; i < 7; i++) { - V_DrawFuzzPatch(50 + i * 31, 168, W_CacheLumpName("ARTIBOX", - PU_CACHE)); + V_DrawTLPatch(50 + i * 31, 168, W_CacheLumpName("ARTIBOX", + PU_CACHE)); if (CPlayer->inventorySlotNum > x + i && CPlayer->inventory[x + i].type != arti_none) { -- cgit v1.2.3