stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 15:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use percentage calc instead of interval decrement for tic-based fading

Browse source
This commit is contained in:
mazmazz 2018-09-11 10:28:24 -04:00
parent c468451a63
commit 9a52816cb4
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_saveg.c
View file

@ -1590,12 +1590,12 @@ static void SaveFadeThinker(const thinker_t *th, const UINT8 type)
WRITEUINT32(save_p, ht->sectornum); WRITEUINT32(save_p, ht->sectornum);
WRITEUINT32(save_p, ht->ffloornum); WRITEUINT32(save_p, ht->ffloornum);
WRITEINT32(save_p, ht->alpha); WRITEINT32(save_p, ht->alpha);
WRITEINT16(save_p, ht->sourcevalue);
WRITEINT16(save_p, ht->destvalue); WRITEINT16(save_p, ht->destvalue);
WRITEINT16(save_p, ht->destlightlevel); WRITEINT16(save_p, ht->destlightlevel);
WRITEINT16(save_p, ht->speed); WRITEINT16(save_p, ht->speed);
WRITEUINT8(save_p, (UINT8)ht->ticbased); WRITEUINT8(save_p, (UINT8)ht->ticbased);
WRITEINT32(save_p, ht->timer); WRITEINT32(save_p, ht->timer);
WRITEUINT32(save_p, ht->interval);
WRITEUINT8(save_p, ht->doexists); WRITEUINT8(save_p, ht->doexists);
WRITEUINT8(save_p, ht->dotranslucent); WRITEUINT8(save_p, ht->dotranslucent);
WRITEUINT8(save_p, ht->dolighting); WRITEUINT8(save_p, ht->dolighting);
@ -2602,12 +2602,12 @@ static inline void LoadFadeThinker(actionf_p1 thinker)
ht->sectornum = READUINT32(save_p); ht->sectornum = READUINT32(save_p);
ht->ffloornum = READUINT32(save_p); ht->ffloornum = READUINT32(save_p);
ht->alpha = READINT32(save_p); ht->alpha = READINT32(save_p);
ht->sourcevalue = READINT16(save_p);
ht->destvalue = READINT16(save_p); ht->destvalue = READINT16(save_p);
ht->destlightlevel = READINT16(save_p); ht->destlightlevel = READINT16(save_p);
ht->speed = READINT16(save_p); ht->speed = READINT16(save_p);
ht->ticbased = (boolean)READUINT8(save_p); ht->ticbased = (boolean)READUINT8(save_p);
ht->timer = READINT32(save_p); ht->timer = READINT32(save_p);
ht->interval = READUINT32(save_p);
ht->doexists = READUINT8(save_p); ht->doexists = READUINT8(save_p);
ht->dotranslucent = READUINT8(save_p); ht->dotranslucent = READUINT8(save_p);
ht->dolighting = READUINT8(save_p); ht->dolighting = READUINT8(save_p);

41
src/p_spec.c
View file

@ -105,7 +105,7 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *
static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t offset, INT32 line, INT32 sourceline); static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t offset, INT32 line, INT32 sourceline);
static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data, boolean finalize); static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data, boolean finalize);
#define P_RemoveFakeFloorFader(l) P_ResetFakeFloorFader(l, NULL, false); #define P_RemoveFakeFloorFader(l) P_ResetFakeFloorFader(l, NULL, false);
static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, boolean ticbased, INT32 *timer, UINT32 interval, static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destvalue, INT16 speed, boolean ticbased, INT32 *timer,
boolean doexists, boolean dotranslucent, boolean dolighting, boolean docollision, boolean doghostfade, boolean exactalpha); boolean doexists, boolean dotranslucent, boolean dolighting, boolean docollision, boolean doghostfade, boolean exactalpha);
static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloornum, static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloornum,
INT16 destvalue, INT16 speed, boolean ticbased, boolean relative, INT16 destvalue, INT16 speed, boolean ticbased, boolean relative,
@ -3363,9 +3363,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
P_RemoveFakeFloorFader(rover); P_RemoveFakeFloorFader(rover);
P_FadeFakeFloor(rover, P_FadeFakeFloor(rover,
rover->alpha,
max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)), max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)),
0, // set alpha immediately 0, // set alpha immediately
false, NULL, 0, // tic-based logic false, NULL, // tic-based logic
false, // do not handle FF_EXISTS false, // do not handle FF_EXISTS
!(line->flags & ML_NOCLIMB), // handle FF_TRANSLUCENT !(line->flags & ML_NOCLIMB), // handle FF_TRANSLUCENT
false, // do not handle lighting false, // do not handle lighting
@ -3437,9 +3438,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
P_RemoveFakeFloorFader(rover); P_RemoveFakeFloorFader(rover);
P_FadeFakeFloor(rover, P_FadeFakeFloor(rover,
rover->alpha,
max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)), max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)),
0, // set alpha immediately 0, // set alpha immediately
false, NULL, 0, // tic-based logic false, NULL, // tic-based logic
!(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS !(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS
!(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT
!(line->flags & ML_EFFECT2), // do not handle lighting !(line->flags & ML_EFFECT2), // do not handle lighting
@ -7513,13 +7515,13 @@ static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data, boolean finaliz
{ {
if (finalize) if (finalize)
P_FadeFakeFloor(rover, P_FadeFakeFloor(rover,
fadingdata->sourcevalue,
fadingdata->alpha >= fadingdata->destvalue ? fadingdata->alpha >= fadingdata->destvalue ?
fadingdata->alpha - 1 : // trigger fade-out finish fadingdata->alpha - 1 : // trigger fade-out finish
fadingdata->alpha + 1, // trigger fade-in finish fadingdata->alpha + 1, // trigger fade-in finish
0, 0,
fadingdata->ticbased, fadingdata->ticbased,
&fadingdata->timer, &fadingdata->timer,
fadingdata->interval,
fadingdata->doexists, fadingdata->doexists,
fadingdata->dotranslucent, fadingdata->dotranslucent,
fadingdata->docollision, fadingdata->docollision,
@ -7538,7 +7540,7 @@ static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data, boolean finaliz
} }
} }
static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, boolean ticbased, INT32 *timer, UINT32 interval, static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destvalue, INT16 speed, boolean ticbased, INT32 *timer,
boolean doexists, boolean dotranslucent, boolean dolighting, boolean docollision, boolean doghostfade, boolean exactalpha) boolean doexists, boolean dotranslucent, boolean dolighting, boolean docollision, boolean doghostfade, boolean exactalpha)
{ {
boolean stillfading = false; boolean stillfading = false;
@ -7592,8 +7594,12 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
{ {
if (!ticbased) if (!ticbased)
alpha -= speed; alpha -= speed;
else if (ticbased && !((*timer) % interval)) else
alpha = max(alpha - speed, destvalue); {
INT16 delta = abs(destvalue - sourcevalue);
fixed_t factor = min(FixedDiv(speed - (*timer), speed), 1*FRACUNIT);
alpha = max(min(alpha, sourcevalue - (INT16)FixedMul(delta, factor)), destvalue);
}
stillfading = true; stillfading = true;
} }
} }
@ -7601,7 +7607,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
{ {
// finish fading in // finish fading in
if (speed < 1 || (!ticbased && alpha + speed >= destvalue - speed) || if (speed < 1 || (!ticbased && alpha + speed >= destvalue - speed) ||
(ticbased && (--(*timer) <= 0|| alpha >= destvalue))) (ticbased && (--(*timer) <= 0 || alpha >= destvalue)))
{ {
alpha = destvalue; alpha = destvalue;
@ -7623,8 +7629,12 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
{ {
if (!ticbased) if (!ticbased)
alpha += speed; alpha += speed;
else if (ticbased && !((*timer) % interval)) else
alpha = min(alpha + speed, destvalue); {
INT16 delta = abs(destvalue - sourcevalue);
fixed_t factor = min(FixedDiv(speed - (*timer), speed), 1*FRACUNIT);
alpha = min(max(alpha, sourcevalue + (INT16)FixedMul(delta, factor)), destvalue);
}
stillfading = true; stillfading = true;
} }
} }
@ -7813,22 +7823,19 @@ static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloor
d->sectornum = (UINT32)sectornum; d->sectornum = (UINT32)sectornum;
d->ffloornum = (UINT32)ffloornum; d->ffloornum = (UINT32)ffloornum;
d->alpha = rover->alpha; d->alpha = d->sourcevalue = rover->alpha;
d->destvalue = max(1, min(256, relative ? rover->alpha + destvalue : destvalue)); // ffloor->alpha is 1-256 d->destvalue = max(1, min(256, relative ? rover->alpha + destvalue : destvalue)); // ffloor->alpha is 1-256
if (ticbased) if (ticbased)
{ {
d->ticbased = true; d->ticbased = true;
d->timer = abs(speed); d->timer = d->speed = abs(speed); // use d->speed as total duration
d->speed = max(abs(FixedFloor(FixedDiv(d->destvalue - d->alpha, d->timer))/FRACUNIT), 1);
d->interval = max(FixedFloor(FixedDiv(d->timer, abs(d->destvalue - d->alpha)))/FRACUNIT, 1);
} }
else else
{ {
d->speed = max(1, speed); // minimum speed 1/tic // if speed < 1, alpha is set immediately in thinker
d->ticbased = false; d->ticbased = false;
d->speed = max(1, speed); // minimum speed 1/tic // if speed < 1, alpha is set immediately in thinker
d->timer = -1; d->timer = -1;
d->interval = 0;
} }
d->doexists = doexists; d->doexists = doexists;
@ -7872,7 +7879,7 @@ static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloor
*/ */
void T_Fade(fade_t *d) void T_Fade(fade_t *d)
{ {
if (d->rover && !P_FadeFakeFloor(d->rover, d->destvalue, d->speed, d->ticbased, &d->timer, d->interval, if (d->rover && !P_FadeFakeFloor(d->rover, d->sourcevalue, d->destvalue, d->speed, d->ticbased, &d->timer,
d->doexists, d->dotranslucent, d->dolighting, d->docollision, d->doghostfade, d->exactalpha)) d->doexists, d->dotranslucent, d->dolighting, d->docollision, d->doghostfade, d->exactalpha))
{ {
// Finalize lighting, copypasta from P_AddFakeFloorFader // Finalize lighting, copypasta from P_AddFakeFloorFader

2
src/p_spec.h
View file

@ -469,12 +469,12 @@ typedef struct
UINT32 sectornum; ///< Number of ffloor target sector UINT32 sectornum; ///< Number of ffloor target sector
UINT32 ffloornum; ///< Number of ffloor of target sector UINT32 ffloornum; ///< Number of ffloor of target sector
INT32 alpha; ///< Internal alpha counter INT32 alpha; ///< Internal alpha counter
INT16 sourcevalue; ///< Transparency value to fade from
INT16 destvalue; ///< Transparency value to fade to INT16 destvalue; ///< Transparency value to fade to
INT16 destlightlevel; ///< Light level to fade to INT16 destlightlevel; ///< Light level to fade to
INT16 speed; ///< Speed to fade by INT16 speed; ///< Speed to fade by
boolean ticbased; ///< Tic-based logic toggle boolean ticbased; ///< Tic-based logic toggle
INT32 timer; ///< Timer for tic-based logic INT32 timer; ///< Timer for tic-based logic
UINT32 interval; ///< Skip interval for tic-based logic
boolean doexists; ///< Handle FF_EXISTS boolean doexists; ///< Handle FF_EXISTS
boolean dotranslucent; ///< Handle FF_TRANSLUCENT boolean dotranslucent; ///< Handle FF_TRANSLUCENT
boolean dolighting; ///< Handle shadows and light blocks boolean dolighting; ///< Handle shadows and light blocks