stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 16:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor shadow scale into an argument

Browse source
This commit is contained in:
fickleheart 2020-01-08 23:24:31 -06:00
parent fa4b49d52c
commit 9e8d20504e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/r_things.c
View file

@ -1209,7 +1209,7 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
return floorz; return floorz;
} }
static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t tx, fixed_t tz) static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, fixed_t tx, fixed_t tz)
{ {
vissprite_t *shadow; vissprite_t *shadow;
patch_t *patch; patch_t *patch;
@ -1229,11 +1229,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t tx, fix
trans = floordiff / (100*FRACUNIT) + 3; trans = floordiff / (100*FRACUNIT) + 3;
if (trans >= 9) return; if (trans >= 9) return;
scalemul = FRACUNIT - floordiff/640; scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
//@TODO make this configurable instead of hardcoding to the ring
if (thing->type == MT_RING)
scalemul = scalemul*2/3;
patch = W_CachePatchNum(sprites[SPR_THOK].spriteframes[0].lumppat[0], PU_CACHE); patch = W_CachePatchNum(sprites[SPR_THOK].spriteframes[0].lumppat[0], PU_CACHE);
xscale = FixedDiv(projection, tz); xscale = FixedDiv(projection, tz);
@ -1887,7 +1883,7 @@ static void R_ProjectSprite(mobj_t *thing)
if (thing->subsector->sector->numlights) if (thing->subsector->sector->numlights)
R_SplitSprite(vis); R_SplitSprite(vis);
// temporary: whitelist. eventually: MF/2/E flag? ///@TODO temporary: whitelist. eventually: MF/2/E flag?
if (( if ((
oldthing->type == MT_PLAYER || oldthing->type == MT_PLAYER ||
(oldthing->state - states) == S_RING || (oldthing->state - states) == S_RING ||
@ -1896,7 +1892,10 @@ static void R_ProjectSprite(mobj_t *thing)
oldthing->type == MT_EGGMOBILE4_MACE || oldthing->type == MT_EGGMOBILE4_MACE ||
(oldthing->type >= MT_SMALLMACE && oldthing->type <= MT_REDSPRINGBALL) // .W. (oldthing->type >= MT_SMALLMACE && oldthing->type <= MT_REDSPRINGBALL) // .W.
) && !papersprite) ) && !papersprite)
R_ProjectDropShadow(oldthing, vis, basetx, tz); R_ProjectDropShadow(oldthing, vis,
///@TODO make this scale configurable!
((oldthing->state - states) == S_RING) ? 2*FRACUNIT/3 : FRACUNIT,
basetx, tz);
// Debug // Debug
++objectsdrawn; ++objectsdrawn;