teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified motion blur

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 01:08:12 +02:00
parent 5b8af8ff04
commit 4dedda91c5
2 changed files with 13 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
source/games/sw/src/draw.cpp
View file

@ -261,7 +261,7 @@ void DoShadows(tspriteArray& tsprites, tspritetype* tsp, int viewz, int camang)
auto sect = tsp->sectp;
// make sure its the correct sector
// DoShadowFindGroundPoint calls FAFgetzrangepoint and this is sensitive
updatesector(tsp->int_pos().X, tsp->int_pos().Y, &sect);
updatesector(tsp->pos, &sect);
if (sect == nullptr)
{
@ -346,55 +346,32 @@ void DoShadows(tspriteArray& tsprites, tspritetype* tsp, int viewz, int camang)
//DoVoxelShadow(New);
}
inline int MOVEx(int vel, int ang)
{
return (MulScale(vel, bcos(ang), 14));
}
inline int MOVEy(int vel, int ang)
{
return (MulScale(vel, bsin(ang), 14));
}
void DoMotionBlur(tspriteArray& tsprites, tspritetype const * const tsp)
{
auto ownerActor = static_cast<DSWActor*>(tsp->ownerActor);
int nx,ny,nz = 0,dx,dy,dz;
int i, ang;
DVector3 npos(0, 0, 0), dpos(0, 0, 0);
int i;
int xrepeat, yrepeat, repeat_adj = 0;
int z_amt_per_pixel;
double z_amt_per_pixel;
ang = NORM_ANGLE(tsp->int_ang() + 1024);
auto angle = tsp->angle + DAngle180;
if (!ownerActor->hasU() || ownerActor->int_xvel() == 0)
if (!ownerActor->hasU() || ownerActor->vel.X == 0)
{
return;
}
if ((tsp->extra & SPRX_PLAYER_OR_ENEMY))
{
z_amt_per_pixel = IntToFixed((int)-ownerActor->user.jump_speed * ACTORMOVETICS)/tsp->ownerActor->int_xvel();
z_amt_per_pixel = (- ownerActor->user.jump_speed * ACTORMOVETICS) * maptoworld / tsp->ownerActor->vel.X;
}
else
{
z_amt_per_pixel = IntToFixed((int)-ownerActor->int_zvel())/tsp->ownerActor->int_xvel();
z_amt_per_pixel = -ownerActor->vel.Z / tsp->ownerActor->vel.X;
}
switch (ownerActor->user.motion_blur_dist)
{
case 64:
case 128:
case 256:
case 512:
nz = FixedToInt(z_amt_per_pixel * ownerActor->user.motion_blur_dist);
[[fallthrough]];
default:
dx = nx = MOVEx(ownerActor->user.motion_blur_dist, ang);
dy = ny = MOVEy(ownerActor->user.motion_blur_dist, ang);
break;
}
dz = nz;
dpos.XY() = npos.XY() = angle.ToVector() * ownerActor->user.motion_blur_dist;
dpos.Z = npos.Z = z_amt_per_pixel * ownerActor->user.motion_blur_dist * (1./16);
xrepeat = tsp->xrepeat;
yrepeat = tsp->yrepeat;
@ -418,13 +395,8 @@ void DoMotionBlur(tspriteArray& tsprites, tspritetype const * const tsp)
*tSpr = *tsp;
tSpr->cstat |= CSTAT_SPRITE_TRANSLUCENT|CSTAT_SPRITE_TRANS_FLIP;
tSpr->pos.X += (dx * inttoworld);
tSpr->pos.Y += (dy * inttoworld);
dx += nx;
dy += ny;
tSpr->add_int_z(dz);
dz += nz;
tSpr->pos += dpos;
dpos += npos;
tSpr->xrepeat = uint8_t(xrepeat);
tSpr->yrepeat = uint8_t(yrepeat);

2
source/games/sw/src/sprite.cpp
View file

@ -877,7 +877,7 @@ void SpawnUser(DSWActor* actor, short id, STATE* state)
actor->user.bounce = 0;
actor->user.motion_blur_num = 0;
actor->user.motion_blur_dist = 256;
actor->user.motion_blur_dist = 16;
actor->backuppos();
actor->user.oz = actor->opos.Z;