diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index dbbcec6c6..a358bdcdd 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -3766,6 +3766,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (HWR_UseShader()) { shader = SHADER_SPRITE; @@ -4052,6 +4054,8 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (HWR_UseShader()) { shader = SHADER_SPRITE; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index e1b31bda0..50a58e607 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1227,6 +1227,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode); } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + // dont forget to enabled the depth test because we can't do this like // before: polygons models are not sorted @@ -1241,7 +1243,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) else { md2s = md2_playermodels; - skinnum = (skin_t *)spr->mobj->localskin - skins; + skinnum = (skin_t *)spr->mobj->localskin - skins; } } else @@ -1266,6 +1268,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) if (md2->error) return; // we already failed loading this before :( + if (!md2->model) { CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename); @@ -1284,6 +1287,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) return; } } + //Hurdler: arf, I don't like that implementation at all... too much crappy gpatch = md2->glpatch; if (gpatch) diff --git a/src/r_main.cpp b/src/r_main.cpp index f6144c64e..dc6bbe684 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -141,10 +141,10 @@ static CV_PossibleValue_t drawdist_precip_cons_t[] = { #endif static CV_PossibleValue_t maxinterpdist_cons_t[] = { - /*{256, "256"},*/ {512, "512"}, {768, "768"}, - {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, - {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, - {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; + /*{256, "256"},*/ {512, "512"}, {768, "768"}, + {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, + {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, + {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; static CV_PossibleValue_t fov_cons_t[] = {{MINFOV*FRACUNIT, "MIN"}, {MAXFOV*FRACUNIT, "MAX"}, {0, NULL}}; @@ -170,14 +170,14 @@ consvar_t cv_tailspickup = {"tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnO consvar_t cv_precachetextures = {"precachetextures", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS] = { - {"chasecam", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"chasecam", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam2", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam3", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam4", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} }; consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS] = { - {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam3", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam3_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam4", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam4_OnChange, 0, NULL, NULL, 0, 0, NULL} @@ -195,6 +195,7 @@ consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE|CV_CALL|CV_NO consvar_t cv_lessprecip = {"lessweathereffects", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mobjscaleprecip = {"scaleprecipmobjscale", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_maxinterpdist = {"maxinterpdist", "Infinite", CV_SAVE, maxinterpdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_playerfade = {"playerfade", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_ripplewater = {"waterripples", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // Okay, whoever said homremoval causes a performance hit should be shot. @@ -211,6 +212,7 @@ consvar_t cv_randomdirlight = {"randomdirectionallight", "Off", CV_SAVE|CV_CALL consvar_t cv_showhud = {"showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_translucenthud = {"translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_uncappedhud = {"uncappedhud", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_soniccd = {"soniccd", "Off", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_allowmlook = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -1594,6 +1596,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_randomdirlight); CV_RegisterVar(&cv_maxinterpdist); + CV_RegisterVar(&cv_playerfade); CV_RegisterVar(&cv_ripplewater); diff --git a/src/r_main.h b/src/r_main.h index efe3fc31c..295e6e34d 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -195,6 +195,7 @@ extern consvar_t cv_fov, cv_fovchange; extern consvar_t cv_skybox; extern consvar_t cv_tailspickup; extern consvar_t cv_maxinterpdist; +extern consvar_t cv_playerfade; extern consvar_t cv_ripplewater; extern consvar_t cv_randomdirlight; diff --git a/src/r_things.cpp b/src/r_things.cpp index be7b6a713..d78ce729a 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -737,6 +737,13 @@ static void R_DrawFlippedMaskedColumn(drawcolumndata_t* dc, column_t *column) dc->texturemid = basetexturemid; } + +// Based off of R_GetLinedefTransTable +transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap) +{ + return static_cast((20*(FRACUNIT - ((alpha * (10 - transmap))/10) - 1) + FRACUNIT) >> (FRACBITS+1)); +} + // // R_DrawVisSprite // mfloorclip and mceilingclip should also be set. @@ -1604,6 +1611,8 @@ static void R_ProjectSprite(mobj_t *thing) else trans = 0; + trans = static_cast(R_GetThingTransTable(R_GetThingFade(oldthing), static_cast(trans))); + //SoM: 3/17/2000: Disregard sprites that are out of view.. if (vflip) { @@ -2939,6 +2948,31 @@ boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist) return true; } +fixed_t R_GetThingFade(mobj_t *thing) +{ + fixed_t fadealpha = FRACUNIT; + + if (!cv_playerfade.value || leveltime < starttime-(3*TICRATE) || !thing->player || thing->player == viewplayer) + return fadealpha; + + const INT32 playerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS; + const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS; + + if (playerdist < viewplayerdist) + { + if (playerdist < viewplayerdist / 2) // stronger fade when very close + { + fadealpha = (playerdist * FRACUNIT) / (viewplayerdist / 2) / 3; + } + else + { + fadealpha = (playerdist * FRACUNIT) / viewplayerdist; + } + } + + return fadealpha; +} + boolean R_CheckInterpDist(mobj_t *thing) { if (!cv_maxinterpdist.value) diff --git a/src/r_things.h b/src/r_things.h index e7afe7498..156c2d9d3 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -87,9 +87,12 @@ typedef struct void R_DrawMasked(maskcount_t* masks, INT32 nummasks); +transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap); + boolean R_ThingVisible(mobj_t *thing); boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist); boolean R_CheckInterpDist(mobj_t *thing); +fixed_t R_GetThingFade(mobj_t *thing); boolean R_ThingIsFullBright(mobj_t *thing); boolean R_ThingIsSemiBright(mobj_t *thing);