diff --git a/src/r_draw.c b/src/r_draw.c index fa19a6ac2..faa9ba638 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -78,6 +78,7 @@ fixed_t dc_iscale, dc_texturemid; UINT8 dc_hires; // under MSVC boolean is a byte, while on other systems, it a bit, // soo lets make it a byte on all system for the ASM code UINT8 *dc_source; +INT32 dc_sourcelength; // ----------------------- // translucency stuff here diff --git a/src/r_draw.h b/src/r_draw.h index 58775fe1d..7dbeda7c9 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -62,6 +62,7 @@ extern lighttable_t *ds_colormap; extern fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep; extern INT32 ds_waterofs, ds_bgofs; extern UINT8 *ds_source; // start of a 64*64 tile image +extern INT32 dc_sourcelength; extern UINT8 *ds_transmap; extern INT32 ds_bgofs; diff --git a/src/r_draw8.c b/src/r_draw8.c index 6aabdb6dd..bf3b9740d 100644 --- a/src/r_draw8.c +++ b/src/r_draw8.c @@ -28,6 +28,8 @@ void R_DrawColumn_8(void) register UINT8 *dest; register fixed_t frac; fixed_t fracstep; + INT32 npow2min; + INT32 npow2max; count = dc_yh - dc_yl; @@ -51,13 +53,26 @@ void R_DrawColumn_8(void) fracstep = dc_iscale; frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires); - // Inner loop that does the actual texture mapping, e.g. a DDA-like scaling. // This is as fast as it gets. { register const UINT8 *source = dc_source; register const lighttable_t *colormap = dc_colormap; register INT32 heightmask = dc_texheight-1; + + if (dc_sourcelength <= 0) + { + // Note: we need to unconditionally clamp in npow2 draw loop to avoid a CPU branch + // This is to just render it effectively the identity function. + npow2min = INT32_MIN; + npow2max = INT32_MAX; + } + else + { + npow2min = -1; + npow2max = dc_sourcelength; + } + if (dc_texheight & heightmask) // not a power of 2 -- killough { heightmask++; @@ -74,7 +89,10 @@ void R_DrawColumn_8(void) // Re-map color indices from wall texture column // using a lighting/special effects LUT. // heightmask is the Tutti-Frutti fix - *dest = colormap[source[frac>>FRACBITS]]; + + // -1 is the lower clamp bound because column posts have a "safe" byte before the real data + // and a few bytes after as well + *dest = colormap[source[CLAMP(frac>>FRACBITS, npow2min, npow2max)]]; dest += vid.width; // Avoid overflow. @@ -115,6 +133,8 @@ void R_Draw2sMultiPatchColumn_8(void) register UINT8 *dest; register fixed_t frac; fixed_t fracstep; + INT32 npow2min; + INT32 npow2max; count = dc_yh - dc_yl; @@ -147,6 +167,20 @@ void R_Draw2sMultiPatchColumn_8(void) register const lighttable_t *colormap = dc_colormap; register INT32 heightmask = dc_texheight-1; register UINT8 val; + + if (dc_sourcelength <= 0) + { + // Note: we need to unconditionally clamp in npow2 draw loop to avoid a CPU branch + // This is to just render it effectively the identity function. + npow2min = INT32_MIN; + npow2max = INT32_MAX; + } + else + { + npow2min = -1; + npow2max = dc_sourcelength; + } + if (dc_texheight & heightmask) // not a power of 2 -- killough { heightmask++; @@ -163,7 +197,10 @@ void R_Draw2sMultiPatchColumn_8(void) // Re-map color indices from wall texture column // using a lighting/special effects LUT. // heightmask is the Tutti-Frutti fix - val = source[frac>>FRACBITS]; + + // -1 is the lower clamp bound because column posts have a "safe" byte before the real data + // and a few bytes after as well + val = source[CLAMP(frac>>FRACBITS, npow2min, npow2max)]; if (val != TRANSPARENTPIXEL) { @@ -223,6 +260,8 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void) register UINT8 *dest; register fixed_t frac; fixed_t fracstep; + INT32 npow2min; + INT32 npow2max; count = dc_yh - dc_yl; @@ -256,6 +295,20 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void) register const lighttable_t *colormap = dc_colormap; register INT32 heightmask = dc_texheight-1; register UINT8 val; + + if (dc_sourcelength <= 0) + { + // Note: we need to unconditionally clamp in npow2 draw loop to avoid a CPU branch + // This is to just render it effectively the identity function. + npow2min = INT32_MIN; + npow2max = INT32_MAX; + } + else + { + npow2min = -1; + npow2max = dc_sourcelength; + } + if (dc_texheight & heightmask) // not a power of 2 -- killough { heightmask++; @@ -272,7 +325,10 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void) // Re-map color indices from wall texture column // using a lighting/special effects LUT. // heightmask is the Tutti-Frutti fix - val = source[frac>>FRACBITS]; + + // -1 is the lower clamp bound because column posts have a "safe" byte before the real data + // and a few bytes after as well + val = source[CLAMP(frac>>FRACBITS, npow2min, npow2max)]; if (val != TRANSPARENTPIXEL) { @@ -376,6 +432,8 @@ void R_DrawTranslucentColumn_8(void) register INT32 count; register UINT8 *dest; register fixed_t frac, fracstep; + INT32 npow2min; + INT32 npow2max; count = dc_yh - dc_yl + 1; @@ -403,6 +461,20 @@ void R_DrawTranslucentColumn_8(void) register const UINT8 *transmap = dc_transmap; register const lighttable_t *colormap = dc_colormap; register INT32 heightmask = dc_texheight - 1; + + if (dc_sourcelength <= 0) + { + // Note: we need to unconditionally clamp in npow2 draw loop to avoid a CPU branch + // This is to just render it effectively the identity function. + npow2min = INT32_MIN; + npow2max = INT32_MAX; + } + else + { + npow2min = -1; + npow2max = dc_sourcelength; + } + if (dc_texheight & heightmask) { heightmask++; @@ -420,7 +492,11 @@ void R_DrawTranslucentColumn_8(void) // Re-map color indices from wall texture column // using a lighting/special effects LUT. // heightmask is the Tutti-Frutti fix - *dest = *(transmap + (colormap[source[frac>>FRACBITS]]<<8) + (*dest)); + + // -1 is the lower clamp bound because column posts have a "safe" byte before the real data + // and a few bytes after as well + *dest = *(transmap + (colormap[source[CLAMP(frac>>FRACBITS, npow2min, npow2max)]]<<8) + (*dest)); + dest += vid.width; if ((frac += fracstep) >= heightmask) @@ -458,6 +534,8 @@ void R_DrawTranslatedTranslucentColumn_8(void) register INT32 count; register UINT8 *dest; register fixed_t frac, fracstep; + INT32 npow2min; + INT32 npow2max; count = dc_yh - dc_yl + 1; @@ -477,6 +555,20 @@ void R_DrawTranslatedTranslucentColumn_8(void) // This is as fast as it gets. { register INT32 heightmask = dc_texheight - 1; + + if (dc_sourcelength <= 0) + { + // Note: we need to unconditionally clamp in npow2 draw loop to avoid a CPU branch + // This is to just render it effectively the identity function. + npow2min = INT32_MIN; + npow2max = INT32_MAX; + } + else + { + npow2min = -1; + npow2max = dc_sourcelength; + } + if (dc_texheight & heightmask) { heightmask++; @@ -494,7 +586,10 @@ void R_DrawTranslatedTranslucentColumn_8(void) // Re-map color indices from wall texture column // using a lighting/special effects LUT. // heightmask is the Tutti-Frutti fix - *dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]<<8) + (*dest)); + + // -1 is the lower clamp bound because column posts have a "safe" byte before the real data + // and a few bytes after as well + *dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[CLAMP(frac>>FRACBITS, npow2min, npow2max)]]]<<8) + (*dest)); dest += vid.width; if ((frac += fracstep) >= heightmask) diff --git a/src/r_main.c b/src/r_main.c index 3d39b8baa..20d619f46 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1449,7 +1449,7 @@ void R_RenderPlayerView(player_t *player) else { portalclipstart = 0; - portalclipend = viewwidth-1; + portalclipend = viewwidth; R_ClearClipSegs(); } R_ClearDrawSegs(); diff --git a/src/r_segs.c b/src/r_segs.c index b2bc01468..6ef58e28e 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -276,6 +276,7 @@ static void R_Render2sidedMultiPatchColumn(column_t *column) if (dc_yl <= dc_yh && dc_yh < vid.height && dc_yh > 0) { dc_source = (UINT8 *)column + 3; + dc_sourcelength = 0; if (colfunc == wallcolfunc) twosmultipatchfunc(); @@ -1448,6 +1449,7 @@ static void R_RenderSegLoop (void) dc_texturemid = rw_midtexturemid; dc_source = R_GetColumn(midtexture,texturecolumn); dc_texheight = textureheight[midtexture]>>FRACBITS; + dc_sourcelength = 0; colfunc(); // dont draw anything more for this column, since @@ -1495,6 +1497,7 @@ static void R_RenderSegLoop (void) dc_texturemid = rw_toptexturemid; dc_source = R_GetColumn(toptexture,texturecolumn); dc_texheight = textureheight[toptexture]>>FRACBITS; + dc_sourcelength = 0; colfunc(); ceilingclip[rw_x] = (INT16)mid; } @@ -1532,6 +1535,7 @@ static void R_RenderSegLoop (void) dc_source = R_GetColumn(bottomtexture, texturecolumn); dc_texheight = textureheight[bottomtexture]>>FRACBITS; + dc_sourcelength = 0; colfunc(); floorclip[rw_x] = (INT16)mid; } @@ -1609,6 +1613,12 @@ static INT64 R_CalcSegDist(seg_t* seg, INT64 x2, INT64 y2) } } +static inline INT32 get_flat_tex (INT32 texnum) +{ + texnum = R_GetTextureNum(texnum); + return textures[texnum]->holes ? 0 : texnum; // R_DrawWallColumn cannot render holey textures +} + // // R_StoreWallRange // A wall segment will be drawn @@ -1866,7 +1876,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) { fixed_t texheight; // single sided line - midtexture = R_GetTextureNum(sidedef->midtexture); + midtexture = get_flat_tex(sidedef->midtexture); texheight = textureheight[midtexture]; // a single sided line is terminal, so it must mark ends markfloor = markceiling = true; @@ -2056,15 +2066,15 @@ void R_StoreWallRange(INT32 start, INT32 stop) { // Special case... use offsets from 2nd side but only if it has a texture. side_t *def = &sides[linedef->sidenum[1]]; - toptexture = R_GetTextureNum(def->toptexture); + toptexture = get_flat_tex(def->toptexture); if (!toptexture) //Second side has no texture, use the first side's instead. - toptexture = R_GetTextureNum(sidedef->toptexture); + toptexture = get_flat_tex(sidedef->toptexture); texheight = textureheight[toptexture]; } else { - toptexture = R_GetTextureNum(sidedef->toptexture); + toptexture = get_flat_tex(sidedef->toptexture); texheight = textureheight[toptexture]; } if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked @@ -2089,7 +2099,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (worldlow > worldbottom || worldlowslope > worldbottomslope) // Only if VISIBLE!!! { // bottom texture - bottomtexture = R_GetTextureNum(sidedef->bottomtexture); + bottomtexture = get_flat_tex(sidedef->bottomtexture); if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked if (linedef->flags & ML_DONTPEGBOTTOM) diff --git a/src/r_things.c b/src/r_things.c index 7867ea199..4c1bc2356 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -44,7 +44,7 @@ CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2]; static void R_InitSkins(void); -#define MINZ (FRACUNIT*4) +#define MINZ (FRACUNIT*16) #define BASEYCENTER (BASEVIDHEIGHT/2) typedef struct @@ -591,6 +591,9 @@ void R_DrawMaskedColumn(column_t *column) basetexturemid = dc_texturemid; + if (!column || column == 0) + return; + for (; column->topdelta != 0xff ;) { // calculate unclipped screen coordinates @@ -626,6 +629,7 @@ void R_DrawMaskedColumn(column_t *column) if (dc_yl <= dc_yh && dc_yh > 0 && column->length != 0) { dc_source = (UINT8 *)column + 3; + dc_sourcelength = column->length; dc_texturemid = basetexturemid - (topdelta< 0 && column->length != 0) { dc_source = ZZ_Alloc(column->length); + dc_sourcelength = column->length; for (s = (UINT8 *)column+2+column->length, d = dc_source; d < dc_source+column->length; --s) *d++ = *s; dc_texturemid = basetexturemid - (topdelta<texturemid; - dc_texheight = 0; + dc_texheight = SHORT(patch->height); frac = vis->startfrac; windowtop = windowbottom = sprbotscreen = INT32_MAX; @@ -816,8 +821,10 @@ static void R_DrawVisSprite(vissprite_t *vis) this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->localskin)->highresscale); else if (vis->mobj->skin && ((skin_t *)vis->mobj->skin)->flags & SF_HIRES) this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->skin)->highresscale); + if (this_scale <= 0) this_scale = 1; + if (this_scale != FRACUNIT) { if (!vis->isScaled) @@ -883,12 +890,10 @@ static void R_DrawVisSprite(vissprite_t *vis) } else { - pwidth = SHORT(patch->width); - // Non-paper drawing loop for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale) - { - texturecolumn = CLAMP(frac >> FRACBITS, 0, pwidth - 1); + { + texturecolumn = CLAMP(frac >> FRACBITS, 0, SHORT(patch->width) - 1); column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn])); localcolfunc (column); @@ -896,6 +901,8 @@ static void R_DrawVisSprite(vissprite_t *vis) } colfunc = basecolfunc; + dc_hires = 0; + vis->x1 = x1; vis->x2 = x2; } @@ -932,7 +939,7 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis) dc_iscale = FixedDiv(FRACUNIT, vis->scale); dc_texturemid = FixedDiv(vis->texturemid, this_scale); - dc_texheight = 0; + dc_texheight = SHORT(patch->height); frac = vis->startfrac; spryscale = vis->scale; @@ -947,7 +954,14 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis) for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale) { - texturecolumn = CLAMP(frac >> FRACBITS, 0, SHORT(patch->width) - 1); + texturecolumn = frac>>FRACBITS; + + if (texturecolumn < 0 || texturecolumn >= patch->width) + { + CONS_Debug(DBG_RENDER, "R_DrawPrecipitationSpriteRange: bad texturecolumn\n"); + break; + } + column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn])); R_DrawMaskedColumn(column); @@ -1137,6 +1151,7 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t xscale, yscale, sortscale; //added : 02-02-98 : aaargll..if I were a math-guy!!! INT32 x1, x2; + INT32 x1test = 0, x2test = 0; spritedef_t *sprdef; spriteframe_t *sprframe; @@ -1540,6 +1555,11 @@ static void R_ProjectSprite(mobj_t *thing) //x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS; x1 = centerx + (FixedMul(tx,xscale) / FRACUNIT); + x1test = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS; + + if (x1test > viewwidth) + x1test = 0; + // off the right side? if (x1 > viewwidth) return; @@ -1548,6 +1568,11 @@ static void R_ProjectSprite(mobj_t *thing) //x2 = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS); x2--; x2 = (centerx + (FixedMul(tx,xscale) / FRACUNIT)) - 1; + x2test = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS) - 1; + + if (x2test < 0) + x2test = 0; + // off the left side if (x2 < 0) return; @@ -1556,9 +1581,15 @@ static void R_ProjectSprite(mobj_t *thing) // PORTAL SPRITE CLIPPING if (portalrender && portalclipline) { - if (x2 < portalclipstart || x1 > portalclipend) + if (x2 < portalclipstart || x1 >= portalclipend) return; + if (x2test < portalclipstart || x1test >= portalclipend) + { + x1test = 0; + x2test = 0; + } + if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) return; } @@ -1700,17 +1731,11 @@ static void R_ProjectSprite(mobj_t *thing) vis->mobj = thing; // Easy access! Tails 06-07-2002 - vis->x1 = x1 < 0 ? 0 : x1; - vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2; + vis->x1 = x1 < portalclipstart ? portalclipstart : x1; + vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2; - // PORTAL SEMI-CLIPPING - if (portalrender && portalclipline) - { - if (vis->x1 < portalclipstart) - vis->x1 = portalclipstart; - if (vis->x2 > portalclipend) - vis->x2 = portalclipend; - } + vis->x1test = x1test < portalclipstart ? portalclipstart : x1test; + vis->x2test = x2test >= portalclipend ? portalclipend-1 : x2test; vis->sector = thing->subsector->sector; vis->szt = (INT16)((centeryfrac - FixedMul(vis->gzt - viewz, sortscale))>>FRACBITS); @@ -1737,6 +1762,7 @@ static void R_ProjectSprite(mobj_t *thing) { vis->startfrac = spr_width-1; vis->xiscale = -iscale; + vis->xiscaletest = -vis->xiscaletest; } else { @@ -1744,10 +1770,13 @@ static void R_ProjectSprite(mobj_t *thing) vis->xiscale = iscale; } + vis->startfractest = vis->startfrac; + if (vis->x1 > x1) { vis->startfrac += FixedDiv(vis->xiscale, this_scale) * (vis->x1 - x1); vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1); + vis->startfractest += FixedDiv(vis->xiscaletest, this_scale) * (vis->x1test - x1test); } //Fab: lumppat is the lump number of the patch to use, this is different @@ -1920,7 +1949,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) // PORTAL SPRITE CLIPPING if (portalrender && portalclipline) { - if (x2 < portalclipstart || x1 > portalclipend) + if (x2 < portalclipstart || x1 >= portalclipend) return; if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) @@ -1954,17 +1983,11 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->scalestep = 0; vis->paperdistance = 0; - vis->x1 = x1 < 0 ? 0 : x1; - vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2; + vis->x1 = x1 < portalclipstart ? portalclipstart : x1; + vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2; - // PORTAL SEMI-CLIPPING - if (portalrender && portalclipline) - { - if (vis->x1 < portalclipstart) - vis->x1 = portalclipstart; - if (vis->x2 > portalclipend) - vis->x2 = portalclipend; - } + vis->x1test = 0; + vis->x2test = 0; vis->xscale = xscale; //SoM: 4/17/2000 vis->sector = thing->subsector->sector; diff --git a/src/r_things.h b/src/r_things.h index 4a6dbf185..235527735 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -55,6 +55,7 @@ extern fixed_t sprtopscreen; extern fixed_t sprbotscreen; extern fixed_t windowtop; extern fixed_t windowbottom; +extern INT32 lengthcol; INT32 R_ThingLightLevel(mobj_t *thing); fixed_t R_GetSpriteDirectionalLighting(angle_t angle); @@ -145,6 +146,9 @@ typedef struct vissprite_s mobj_t *mobj; // for easy access INT32 x1, x2; + INT32 x1test, x2test; + fixed_t xiscaletest; + fixed_t startfractest; fixed_t gx, gy; // for line side calculation fixed_t gz, gzt; // global bottom/top for silhouette clipping