teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Seamless ROR transition

Browse source
This commit is contained in:
nukeykt 2019-09-08 01:39:26 +09:00 committed by Christoph Oelckers
parent ddf02bda17
commit d6d8762400
5 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/blood/src/actor.cpp
View file

@ -4814,12 +4814,18 @@ void MoveDude(spritetype *pSprite)
pPlayer->at31b = 1; pPlayer->at31b = 1;
sfxPlay3DSound(pSprite, 719, 0, 0); sfxPlay3DSound(pSprite, 719, 0, 0);
} }
vec3_t const oldpos = pSprite->pos;
int nLink = CheckLink(pSprite); int nLink = CheckLink(pSprite);
if (nLink) if (nLink)
{ {
GetZRange(pSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, wd, CLIPMASK0, PARALLAXCLIP_CEILING|PARALLAXCLIP_FLOOR); GetZRange(pSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, wd, CLIPMASK0, PARALLAXCLIP_CEILING|PARALLAXCLIP_FLOOR);
if (pPlayer) if (pPlayer)
{
if (bVanilla)
playerResetInertia(pPlayer); playerResetInertia(pPlayer);
else
playerCorrectInertia(pPlayer, &oldpos);
}
switch (nLink) switch (nLink)
{ {
case 12: case 12:

7
source/blood/src/player.cpp
View file

@ -814,6 +814,13 @@ void playerResetInertia(PLAYER *pPlayer)
viewBackupView(pPlayer->at57); viewBackupView(pPlayer->at57);
} }
void playerCorrectInertia(PLAYER* pPlayer, vec3_t const *oldpos)
{
pPlayer->at67 += pPlayer->pSprite->z-oldpos->z;
pPlayer->at6f += pPlayer->pSprite->z-oldpos->z;
viewCorrectViewOffsets(pPlayer->at57, oldpos);
}
void playerResetPowerUps(PLAYER* pPlayer) void playerResetPowerUps(PLAYER* pPlayer)
{ {
const int jumpBoots = 15; const int jumpBoots = 15;

1
source/blood/src/player.h
View file

@ -222,6 +222,7 @@ char playerSeqPlaying(PLAYER * pPlayer, int nSeq);
void playerSetRace(PLAYER *pPlayer, int nLifeMode); void playerSetRace(PLAYER *pPlayer, int nLifeMode);
void playerSetGodMode(PLAYER *pPlayer, char bGodMode); void playerSetGodMode(PLAYER *pPlayer, char bGodMode);
void playerResetInertia(PLAYER *pPlayer); void playerResetInertia(PLAYER *pPlayer);
void playerCorrectInertia(PLAYER* pPlayer, vec3_t const *oldpos);
void playerStart(int nPlayer); void playerStart(int nPlayer);
void playerReset(PLAYER *pPlayer); void playerReset(PLAYER *pPlayer);
void playerInit(int nPlayer, unsigned int a2); void playerInit(int nPlayer, unsigned int a2);

41
source/blood/src/view.cpp
View file

@ -895,6 +895,15 @@ void viewBackupView(int nPlayer)
pView->at1c = pPlayer->at53; pView->at1c = pPlayer->at53;
} }
void viewCorrectViewOffsets(int nPlayer, vec3_t const *oldpos)
{
PLAYER *pPlayer = &gPlayer[nPlayer];
VIEW *pView = &gPrevView[nPlayer];
pView->at50 += pPlayer->pSprite->x-oldpos->x;
pView->at54 += pPlayer->pSprite->y-oldpos->y;
pView->at38 += pPlayer->pSprite->z-oldpos->z;
}
void viewClearInterpolations(void) void viewClearInterpolations(void)
{ {
nInterpolations = 0; nInterpolations = 0;
@ -2546,7 +2555,7 @@ void viewProcessSprites(int32_t cX, int32_t cY, int32_t cZ, int32_t cA, int32_t
int othercameradist = 1280; int othercameradist = 1280;
int cameradist = -1; int cameradist = -1;
ClockTicks othercameraclock, cameraclock; int othercameraclock, cameraclock;
void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, fix16_t zm) void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum, int nAng, fix16_t zm)
{ {
@ -2587,7 +2596,7 @@ void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsec
*pY += mulscale16(vY, othercameradist); *pY += mulscale16(vY, othercameradist);
*pZ += mulscale16(vZ, othercameradist); *pZ += mulscale16(vZ, othercameradist);
othercameradist = ClipHigh(othercameradist+(((int)(totalclock-othercameraclock))<<10), 65536); othercameradist = ClipHigh(othercameradist+(((int)(totalclock-othercameraclock))<<10), 65536);
othercameraclock = totalclock; othercameraclock = (int)totalclock;
dassert(*vsectnum >= 0 && *vsectnum < kMaxSectors); dassert(*vsectnum >= 0 && *vsectnum < kMaxSectors);
FindSector(*pX, *pY, *pZ, vsectnum); FindSector(*pX, *pY, *pZ, vsectnum);
pSprite->cstat = bakCstat; pSprite->cstat = bakCstat;
@ -2633,7 +2642,7 @@ void CalcPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum,
*pY += mulscale16(vY, cameradist); *pY += mulscale16(vY, cameradist);
*pZ += mulscale16(vZ, cameradist); *pZ += mulscale16(vZ, cameradist);
cameradist = ClipHigh(cameradist+(((int)(totalclock-cameraclock))<<10), 65536); cameradist = ClipHigh(cameradist+(((int)(totalclock-cameraclock))<<10), 65536);
cameraclock = totalclock; cameraclock = (int)totalclock;
dassert(*vsectnum >= 0 && *vsectnum < kMaxSectors); dassert(*vsectnum >= 0 && *vsectnum < kMaxSectors);
FindSector(*pX, *pY, *pZ, vsectnum); FindSector(*pX, *pY, *pZ, vsectnum);
pSprite->cstat = bakCstat; pSprite->cstat = bakCstat;
@ -3062,7 +3071,7 @@ void viewDrawScreen(void)
} }
cZ += fix16_to_int(q16horiz*10); cZ += fix16_to_int(q16horiz*10);
cameradist = -1; cameradist = -1;
cameraclock = totalclock; cameraclock = (int)totalclock;
} }
else else
{ {
@ -3170,31 +3179,27 @@ void viewDrawScreen(void)
getzsofslope(vcc, vd8, vd4, &vc8, &vc4); getzsofslope(vcc, vd8, vd4, &vc8, &vc4);
if (vd0 >= vc4) if (vd0 >= vc4)
{ {
vd0 = vc4-(8<<4); vd0 = vc4-(gUpperLink[vcc] >= 0 ? 0 : (8<<8));
} }
if (vd0 <= vc8) if (vd0 <= vc8)
{ {
vd0 = vc8+(8<<4); vd0 = vc8+(gLowerLink[vcc] >= 0 ? 0 : (8<<8));
} }
v54 = ClipRange(v54, -200, 200); v54 = ClipRange(v54, -200, 200);
#if 0
RORHACKOTHER: RORHACKOTHER:
int ror_status[16]; int ror_status[16];
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
ror_status[i] = TestBitString(gotpic, 4080 + i); ror_status[i] = TestBitString(gotpic, 4080 + i);
#endif
yax_preparedrawrooms(); yax_preparedrawrooms();
DrawMirrors(vd8, vd4, vd0, fix16_from_int(v50), fix16_from_int(v54 + defaultHoriz), gInterpolate); DrawMirrors(vd8, vd4, vd0, fix16_from_int(v50), fix16_from_int(v54 + defaultHoriz), gInterpolate);
drawrooms(vd8, vd4, vd0, v50, v54 + defaultHoriz, vcc); drawrooms(vd8, vd4, vd0, v50, v54 + defaultHoriz, vcc);
yax_drawrooms(viewProcessSprites, vcc, 0, gInterpolate); yax_drawrooms(viewProcessSprites, vcc, 0, gInterpolate);
#if 0
bool do_ror_hack = false; bool do_ror_hack = false;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
if (!ror_status[i] && TestBitString(gotpic, 4080 + i)) if (ror_status[i] != TestBitString(gotpic, 4080 + i))
do_ror_hack = true; do_ror_hack = true;
if (do_ror_hack) if (do_ror_hack)
goto RORHACKOTHER; goto RORHACKOTHER;
#endif
memcpy(otherMirrorGotpic, gotpic+510, 2); memcpy(otherMirrorGotpic, gotpic+510, 2);
memcpy(gotpic+510, bakMirrorGotpic, 2); memcpy(gotpic+510, bakMirrorGotpic, 2);
viewProcessSprites(vd8, vd4, vd0, v50, gInterpolate); viewProcessSprites(vd8, vd4, vd0, v50, gInterpolate);
@ -3203,7 +3208,7 @@ RORHACKOTHER:
} }
else else
{ {
othercameraclock = totalclock; othercameraclock = (int)totalclock;
} }
if (!bDelirium) if (!bDelirium)
@ -3250,21 +3255,18 @@ RORHACKOTHER:
getzsofslope(nSectnum, cX, cY, &vfc, &vf8); getzsofslope(nSectnum, cX, cY, &vfc, &vf8);
if (cZ >= vf8) if (cZ >= vf8)
{ {
cZ = vf8-(8<<8); cZ = vf8-(gUpperLink[nSectnum] >= 0 ? 0 : (8<<8));
} }
if (cZ <= vfc) if (cZ <= vfc)
{ {
cZ = vfc+(8<<8); cZ = vfc+(gLowerLink[nSectnum] >= 0 ? 0 : (8<<8));
} }
q16horiz = ClipRange(q16horiz, F16(-200), F16(200)); q16horiz = ClipRange(q16horiz, F16(-200), F16(200));
#if 0
RORHACK: RORHACK:
int ror_status[16]; int ror_status[16];
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
ror_status[i] = TestBitString(gotpic, 4080+i); ror_status[i] = TestBitString(gotpic, 4080+i);
#endif
fix16_t deliriumPitchI = interpolate(fix16_from_int(deliriumPitchO), fix16_from_int(deliriumPitch), gInterpolate); fix16_t deliriumPitchI = interpolate(fix16_from_int(deliriumPitchO), fix16_from_int(deliriumPitch), gInterpolate);
DrawMirrors(cX, cY, cZ, cA, q16horiz + fix16_from_int(defaultHoriz) + deliriumPitchI, gInterpolate);
int bakCstat = gView->pSprite->cstat; int bakCstat = gView->pSprite->cstat;
if (gViewPos == 0) if (gViewPos == 0)
{ {
@ -3274,6 +3276,7 @@ RORHACK:
{ {
gView->pSprite->cstat |= 514; gView->pSprite->cstat |= 514;
} }
DrawMirrors(cX, cY, cZ, cA, q16horiz + fix16_from_int(defaultHoriz) + deliriumPitchI, gInterpolate);
#ifdef POLYMER #ifdef POLYMER
if (videoGetRenderMode() == REND_POLYMER) if (videoGetRenderMode() == REND_POLYMER)
polymer_setanimatesprites(viewProcessSprites, cX, cY, cZ, fix16_to_int(cA), gInterpolate); polymer_setanimatesprites(viewProcessSprites, cX, cY, cZ, fix16_to_int(cA), gInterpolate);
@ -3282,17 +3285,15 @@ RORHACK:
renderDrawRoomsQ16(cX, cY, cZ, cA, q16horiz + fix16_from_int(defaultHoriz) + deliriumPitchI, nSectnum); renderDrawRoomsQ16(cX, cY, cZ, cA, q16horiz + fix16_from_int(defaultHoriz) + deliriumPitchI, nSectnum);
yax_drawrooms(viewProcessSprites, nSectnum, 0, gInterpolate); yax_drawrooms(viewProcessSprites, nSectnum, 0, gInterpolate);
viewProcessSprites(cX, cY, cZ, fix16_to_int(cA), gInterpolate); viewProcessSprites(cX, cY, cZ, fix16_to_int(cA), gInterpolate);
#if 0
bool do_ror_hack = false; bool do_ror_hack = false;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
if (!ror_status[i] && TestBitString(gotpic, 4080+i)) if (ror_status[i] != TestBitString(gotpic, 4080+i))
do_ror_hack = true; do_ror_hack = true;
if (do_ror_hack) if (do_ror_hack)
{ {
gView->pSprite->cstat = bakCstat; gView->pSprite->cstat = bakCstat;
goto RORHACK; goto RORHACK;
} }
#endif
sub_5571C(1); sub_5571C(1);
int nSpriteSortCnt = spritesortcnt; int nSpriteSortCnt = spritesortcnt;
renderDrawMasks(); renderDrawMasks();

1
source/blood/src/view.h
View file

@ -119,6 +119,7 @@ void fakeActAirDrag(spritetype *pSprite, int num);
void fakeActProcessSprites(void); void fakeActProcessSprites(void);
void viewCorrectPrediction(void); void viewCorrectPrediction(void);
void viewBackupView(int nPlayer); void viewBackupView(int nPlayer);
void viewCorrectViewOffsets(int nPlayer, vec3_t const *oldpos);
void viewClearInterpolations(void); void viewClearInterpolations(void);
void viewAddInterpolation(void *data, INTERPOLATE_TYPE type); void viewAddInterpolation(void *data, INTERPOLATE_TYPE type);
void CalcInterpolations(void); void CalcInterpolations(void);