teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 19:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Tidy up nCameraa.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-06 22:49:04 +10:00 committed by Christoph Oelckers
parent 91c0ff814f
commit 8a4601ef8d
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/exhumed/src/view.cpp
View file

@ -44,7 +44,6 @@ int16_t nQuake[kMaxPlayers] = { 0 };
int nChunkTotal = 0; int nChunkTotal = 0;
DAngle nCameraa;
int nViewTop; int nViewTop;
bool bCamera = false; bool bCamera = false;
@ -180,7 +179,7 @@ void DrawView(double smoothRatio, bool sceneonly)
DExhumedActor* pEnemy = nullptr; DExhumedActor* pEnemy = nullptr;
int nEnemyPal = -1; int nEnemyPal = -1;
sectortype* pSector = nullptr; sectortype* pSector = nullptr;
DAngle nAngle, rotscrnang; DAngle nCameraa, rotscrnang;
fixedhoriz nCamerapan; fixedhoriz nCamerapan;
DoInterpolations(smoothRatio * (1. / MaxSmoothRatio)); DoInterpolations(smoothRatio * (1. / MaxSmoothRatio));
@ -196,7 +195,7 @@ void DrawView(double smoothRatio, bool sceneonly)
nCamera = pActor->spr.pos; nCamera = pActor->spr.pos;
pSector = pActor->sector(); pSector = pActor->sector();
nAngle = pActor->spr.angle; nCameraa = pActor->spr.angle;
rotscrnang = nullAngle; rotscrnang = nullAngle;
SetGreenPal(); SetGreenPal();
@ -224,13 +223,13 @@ void DrawView(double smoothRatio, bool sceneonly)
if (!SyncInput()) if (!SyncInput())
{ {
nCamerapan = PlayerList[nLocalPlayer].horizon.sum(); nCamerapan = PlayerList[nLocalPlayer].horizon.sum();
nAngle = PlayerList[nLocalPlayer].angle.sum(); nCameraa = PlayerList[nLocalPlayer].angle.sum();
rotscrnang = PlayerList[nLocalPlayer].angle.rotscrnang; rotscrnang = PlayerList[nLocalPlayer].angle.rotscrnang;
} }
else else
{ {
nCamerapan = PlayerList[nLocalPlayer].horizon.interpolatedsum(smoothRatio); nCamerapan = PlayerList[nLocalPlayer].horizon.interpolatedsum(smoothRatio);
nAngle = PlayerList[nLocalPlayer].angle.interpolatedsum(smoothRatio * (1. / MaxSmoothRatio)); nCameraa = PlayerList[nLocalPlayer].angle.interpolatedsum(smoothRatio * (1. / MaxSmoothRatio));
rotscrnang = PlayerList[nLocalPlayer].angle.interpolatedrotscrn(smoothRatio * (1. / MaxSmoothRatio)); rotscrnang = PlayerList[nLocalPlayer].angle.interpolatedrotscrn(smoothRatio * (1. / MaxSmoothRatio));
} }
@ -247,8 +246,6 @@ void DrawView(double smoothRatio, bool sceneonly)
nCamerapan = q16horiz(clamp(nCamerapan.asq16(), gi->playerHorizMin(), gi->playerHorizMax())); nCamerapan = q16horiz(clamp(nCamerapan.asq16(), gi->playerHorizMin(), gi->playerHorizMax()));
} }
nCameraa = nAngle;
if (nSnakeCam >= 0 && !sceneonly) if (nSnakeCam >= 0 && !sceneonly)
{ {
nCamerapan = q16horiz(0); nCamerapan = q16horiz(0);
@ -256,15 +253,15 @@ void DrawView(double smoothRatio, bool sceneonly)
else else
{ {
nCamera.Z = min(nCamera.Z + nQuake[nLocalPlayer] * zinttoworld, pPlayerActor->sector()->floorz); nCamera.Z = min(nCamera.Z + nQuake[nLocalPlayer] * zinttoworld, pPlayerActor->sector()->floorz);
nCameraa += DAngle::fromBuild((nQuake[nLocalPlayer] >> 7) % 31); nCameraa += DAngle::fromBam((nQuake[nLocalPlayer] % 4095) << 14);
if (bCamera) if (bCamera)
{ {
nCamera.Z -= 10; nCamera.Z -= 10;
if (!calcChaseCamPos(nCamera, pPlayerActor, &pSector, nAngle, nCamerapan, smoothRatio)) if (!calcChaseCamPos(nCamera, pPlayerActor, &pSector, nCameraa, nCamerapan, smoothRatio))
{ {
nCamera.Z += 10; nCamera.Z += 10;
calcChaseCamPos(nCamera, pPlayerActor, &pSector, nAngle, nCamerapan, smoothRatio); calcChaseCamPos(nCamera, pPlayerActor, &pSector, nCameraa, nCamerapan, smoothRatio);
} }
} }
} }
@ -424,7 +421,6 @@ void SerializeView(FSerializer& arc)
arc("camera", nCamera) arc("camera", nCamera)
("touchfloor", bTouchFloor) ("touchfloor", bTouchFloor)
("chunktotal", nChunkTotal) ("chunktotal", nChunkTotal)
("cameraa", nCameraa)
("camera", bCamera) ("camera", bCamera)
.Array("vertpan", dVertPan, countof(dVertPan)) .Array("vertpan", dVertPan, countof(dVertPan))
.Array("quake", nQuake, countof(nQuake)) .Array("quake", nQuake, countof(nQuake))