zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: simplified rotation interpolation functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 16:39:29 +01:00
parent 33c707c708
commit a93dbaf5fe
5 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

39
source/games/sw/src/rotator.cpp
View file

@ -234,22 +234,17 @@ bool TestRotatorMatchActive(short match)
void DoRotatorSetInterp(DSWActor* actor)
{
SPRITEp sp = &actor->s();
short w,startwall,endwall;
startwall = sp->sector()->wallptr;
endwall = startwall + sp->sector()->wallnum - 1;
// move points
for (w = startwall; w <= endwall; w++)
for(auto& wal : wallsofsector(sp->sector()))
{
StartInterpolation(w, Interp_Wall_X);
StartInterpolation(w, Interp_Wall_Y);
StartInterpolation(&wal, Interp_Wall_X);
StartInterpolation(&wal, Interp_Wall_Y);
uint16_t const nextwall = wall[w].nextwall;
if (validWallIndex(nextwall))
if (wal.twoSided())
{
StartInterpolation(wall[nextwall].point2, Interp_Wall_X);
StartInterpolation(wall[nextwall].point2, Interp_Wall_Y);
auto w2 = wal.nextWall()->point2Wall();
StartInterpolation(w2, Interp_Wall_X);
StartInterpolation(w2, Interp_Wall_Y);
}
}
}
@ -257,22 +252,16 @@ void DoRotatorSetInterp(DSWActor* actor)
void DoRotatorStopInterp(DSWActor* actor)
{
SPRITEp sp = &actor->s();
short w,startwall,endwall;
startwall = sp->sector()->wallptr;
endwall = startwall + sp->sector()->wallnum - 1;
// move points
for (w = startwall; w <= endwall; w++)
for (auto& wal : wallsofsector(sp->sector()))
{
StopInterpolation(w, Interp_Wall_X);
StopInterpolation(w, Interp_Wall_Y);
StopInterpolation(&wal, Interp_Wall_X);
StopInterpolation(&wal, Interp_Wall_Y);
uint16_t const nextwall = wall[w].nextwall;
if (validWallIndex(nextwall))
if (wal.twoSided())
{
StopInterpolation(wall[nextwall].point2, Interp_Wall_X);
StopInterpolation(wall[nextwall].point2, Interp_Wall_Y);
auto w2 = wal.nextWall()->point2Wall();
StopInterpolation(w2, Interp_Wall_X);
StopInterpolation(w2, Interp_Wall_Y);
}
}
}