zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-13 22:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/blood/src/prediction.cpp

668 lines
22 KiB
C++
Raw Normal View History

- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "ns.h" // Must come before everything else!
#include <stdlib.h>
#include <string.h>
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"
- Blood: header dependency cleanup. These are extremely ordering dependent so now blood.h serves as an umbrella header for most.
2020-12-09 14:56:32 +00:00
#include "blood.h"
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
#include "choke.h"
#include "zstring.h"
- it compiles again (with lots of code commented out.)
2020-10-04 16:31:48 +00:00
#include "razemenu.h"
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
#include "gstrings.h"
#include "v_2ddrawer.h"
#include "v_video.h"
#include "v_font.h"
#include "glbackend/glbackend.h"
BEGIN_BLD_NS
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void fakePlayerProcess(PLAYER* pPlayer, InputPacket* pInput);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
void fakeActProcessSprites(void);
bool gPrediction = true;
VIEW predict, predictOld;
static VIEW predictFifo[256];
void viewInitializePrediction(void)
{
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
predict.at30 = gMe->angle.ang;
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
predict.at24 = gMe->horizon.horiz;
predict.at28 = gMe->horizon.horizoff;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at2c = gMe->slope;
predict.at6f = gMe->cantJump;
predict.at70 = gMe->isRunning;
predict.at72 = gMe->isUnderwater;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at71 = !!(gMe->input.actions & SB_JUMP);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at50 = gMe->pSprite->x;
predict.at54 = gMe->pSprite->y;
predict.at58 = gMe->pSprite->z;
predict.at68 = gMe->pSprite->sectnum;
predict.at73 = gMe->pSprite->flags;
predict.at5c = xvel[gMe->pSprite->index];
predict.at60 = yvel[gMe->pSprite->index];
predict.at64 = zvel[gMe->pSprite->index];
predict.at6a = gMe->pXSprite->height;
predict.at48 = gMe->posture;
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
predict.at4c = gMe->angle.spin;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at6e = !!(gMe->input.actions & SB_CENTERVIEW);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
memcpy(&predict.at75,&gSpriteHit[gMe->pSprite->extra],sizeof(SPRITEHIT));
- more renames.
2020-11-21 22:40:08 +00:00
predict.bobPhase = gMe->bobPhase;
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = gMe->bobAmp;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at8 = gMe->bobHeight;
predict.atc = gMe->bobWidth;
predict.at10 = gMe->swayPhase;
predict.at14 = gMe->swayAmp;
predict.at18 = gMe->swayHeight;
predict.at1c = gMe->swayWidth;
predict.at34 = gMe->zWeapon-gMe->zView-(12<<8);
predict.at38 = gMe->zView;
predict.at3c = gMe->zViewVel;
predict.at40 = gMe->zWeapon;
predict.at44 = gMe->zWeaponVel;
predictOld = predict;
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void viewUpdatePrediction(InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
predictOld = predict;
short bakCstat = gMe->pSprite->cstat;
gMe->pSprite->cstat = 0;
fakePlayerProcess(gMe, pInput);
fakeActProcessSprites();
gMe->pSprite->cstat = bakCstat;
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
//predictFifo[gPredictTail&255] = predict;
//gPredictTail++;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
static void sub_158B4(PLAYER *pPlayer)
{
predict.at38 = predict.at58 - pPlayer->pPosture[pPlayer->lifeMode][predict.at48].eyeAboveZ;
predict.at40 = predict.at58 - pPlayer->pPosture[pPlayer->lifeMode][predict.at48].weaponAboveZ;
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
static void fakeProcessInput(PLAYER *pPlayer, InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
POSTURE *pPosture = &pPlayer->pPosture[pPlayer->lifeMode][predict.at48];
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
predict.at70 = !!(gMe->input.actions & SB_RUN);
predict.at71 = !!(gMe->input.actions & SB_JUMP);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at48 == 1)
{
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
int x = Cos(predict.at30.asbuild());
int y = Sin(predict.at30.asbuild());
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->fvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int forward = pInput->fvel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (forward > 0)
forward = mulscale8(pPosture->frontAccel, forward);
else
forward = mulscale8(pPosture->backAccel, forward);
predict.at5c += mulscale30(forward, x);
predict.at60 += mulscale30(forward, y);
}
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->svel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int strafe = pInput->svel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
strafe = mulscale8(pPosture->sideAccel, strafe);
predict.at5c += mulscale30(strafe, y);
predict.at60 -= mulscale30(strafe, x);
}
}
else if (predict.at6a < 0x100)
{
int speed = 0x10000;
if (predict.at6a > 0)
speed -= divscale16(predict.at6a, 0x100);
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
int x = Cos(predict.at30.asbuild());
int y = Sin(predict.at30.asbuild());
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->fvel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int forward = pInput->fvel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (forward > 0)
forward = mulscale8(pPosture->frontAccel, forward);
else
forward = mulscale8(pPosture->backAccel, forward);
if (predict.at6a)
forward = mulscale16(forward, speed);
predict.at5c += mulscale30(forward, x);
predict.at60 += mulscale30(forward, y);
}
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
if (pInput->svel)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
- renamed the fields in Blood's packet structure to match Duke's.
2020-08-26 14:54:13 +00:00
int strafe = pInput->svel;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
strafe = mulscale8(pPosture->sideAccel, strafe);
if (predict.at6a)
strafe = mulscale16(strafe, speed);
predict.at5c += mulscale30(strafe, y);
predict.at60 -= mulscale30(strafe, x);
}
}
- InputPacket: Change `q16avel` to `avel`, changing type from fixed_t to float.
2020-10-08 03:47:30 +00:00
if (pInput->avel)
predict.at30 = degang(pInput->avel);
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_TURNAROUND)
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
if (!predict.at4c.asbuild())
predict.at4c = buildlook(-1024);
if (predict.at4c.asbuild() < 0)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
int speed;
if (predict.at48 == 1)
speed = 64;
else
speed = 128;
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
predict.at4c = buildlook(min(predict.at4c.asbuild()+speed, 0));
predict.at30 += buildang(speed);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
if (!predict.at71)
predict.at6f = 0;
switch (predict.at48)
{
case 1:
if (predict.at71)
predict.at64 -= pPosture->normalJumpZ;//0x5b05;
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_CROUCH)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at64 += pPosture->normalJumpZ;//0x5b05;
break;
case 2:
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (!(pInput->actions & SB_CROUCH))
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at48 = 0;
break;
default:
if (!predict.at6f && predict.at71 && predict.at6a == 0) {
if (packItemActive(pPlayer, 4)) predict.at64 = pPosture->pwupJumpZ;//-0x175555;
else predict.at64 = pPosture->normalJumpZ;//-0xbaaaa;
predict.at6f = 1;
}
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet # Conflicts: # source/core/inputstate.cpp # source/exhumed/src/exhumed.h
2020-08-28 23:19:48 +00:00
if (pInput->actions & SB_CROUCH)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at48 = 2;
break;
}
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
#if 0
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (predict.at6e && !(pInput->actions & (SB_LOOK_UP | SB_LOOK_DOWN)))
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
if (predict.at20 < 0)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = min(predict.at20+IntToFixed(4), 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 > 0)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = max(predict.at20-IntToFixed(4), 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 == 0)
predict.at6e = 0;
}
else
{
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (pInput->actions & SB_LOOK_UP)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = min(predict.at20+IntToFixed(4), IntToFixed(60));
- Blood: Revert upstream unsynchronised input implementation.
2020-09-16 00:06:50 +00:00
if (pInput->actions & SB_LOOK_DOWN)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
predict.at20 = max(predict.at20-IntToFixed(4), IntToFixed(-60));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- InputPacket: Change `q16horz` to `horz`, changing type from fixed_t to float.
2020-10-07 07:22:07 +00:00
predict.at20 = clamp(predict.at20+pInput->horz, IntToFixed(-60), IntToFixed(60));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at20 > 0)
- Remove `calcSinTableValue()` inline function and clean up use of `PI`/`fPI` and `BANG2RAD` #defines.
2020-11-22 08:20:16 +00:00
predict.at24 = FloatToFixed(fmulscale30(120., bsinf(FixedToFloat(predict.at20) * 8., 16)));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else if (predict.at20 < 0)
- Remove `calcSinTableValue()` inline function and clean up use of `PI`/`fPI` and `BANG2RAD` #defines.
2020-11-22 08:20:16 +00:00
predict.at24 = FloatToFixed(fmulscale30(180., bsinf(FixedToFloat(predict.at20) * 8., 16)));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
else
predict.at24 = 0;
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
#endif
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int nSector = predict.at68;
int florhit = predict.at75.florhit & 0xc000;
char va;
if (predict.at6a < 16 && (florhit == 0x4000 || florhit == 0))
va = 1;
else
va = 0;
if (va && (sector[nSector].floorstat&2) != 0)
{
int z1 = getflorzofslope(nSector, predict.at50, predict.at54);
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
int x2 = predict.at50+mulscale30(64, Cos(predict.at30.asbuild()));
int y2 = predict.at54+mulscale30(64, Sin(predict.at30.asbuild()));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
short nSector2 = nSector;
updatesector(x2, y2, &nSector2);
if (nSector2 == nSector)
{
int z2 = getflorzofslope(nSector2, x2, y2);
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
predict.at28 = q16horiz(interpolate(predict.at28.asq16(), IntToFixed(z1 - z2) >> 3, 0x4000));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
else
{
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
predict.at28 = q16horiz(interpolate(predict.at28.asq16(), 0, 0x4000));
if (klabs(predict.at28.asq16()) < 4)
predict.at28 = q16horiz(0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- Blood: Cut `q16horiz`/`q16slopehoriz` over to PlayerHorizon struct.
2020-10-07 06:16:58 +00:00
predict.at2c = -predict.at24.asq16() >> 9;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
- unified the packet structures of all games. Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter. Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 15:12:48 +00:00
void fakePlayerProcess(PLAYER *pPlayer, InputPacket *pInput)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
spritetype *pSprite = pPlayer->pSprite;
XSPRITE *pXSprite = pPlayer->pXSprite;
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][predict.at48];
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
top += predict.at58-pSprite->z;
bottom += predict.at58-pSprite->z;
int dzb = (bottom-predict.at58)/4;
int dzt = (predict.at58-top)/4;
int dw = pSprite->clipdist<<2;
short nSector = predict.at68;
if (!gNoClip)
{
pushmove_old((int32_t*)&predict.at50, (int32_t*)&predict.at54, (int32_t*)&predict.at58, &predict.at68, dw, dzt, dzb, CLIPMASK0);
if (predict.at68 == -1)
predict.at68 = nSector;
}
fakeProcessInput(pPlayer, pInput);
int nSpeed = approxDist(predict.at5c, predict.at60);
predict.at3c = interpolate(predict.at3c, predict.at64, 0x7000);
int dz = predict.at58-pPosture->eyeAboveZ-predict.at38;
if (dz > 0)
predict.at3c += mulscale16(dz<<8, 0xa000);
else
predict.at3c += mulscale16(dz<<8, 0x1800);
predict.at38 += predict.at3c>>8;
predict.at44 = interpolate(predict.at44, predict.at64, 0x5000);
dz = predict.at58-pPosture->weaponAboveZ-predict.at40;
if (dz > 0)
predict.at44 += mulscale16(dz<<8, 0x8000);
else
predict.at44 += mulscale16(dz<<8, 0xc00);
predict.at40 += predict.at44>>8;
predict.at34 = predict.at40 - predict.at38 - (12<<8);
- more renames.
2020-11-21 22:40:08 +00:00
predict.bobPhase = ClipLow(predict.bobPhase-4, 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
nSpeed >>= FRACBITS;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at48 == 1)
{
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = (predict.Kills+17)&2047;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at14 = (predict.at14+17)&2047;
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.at8 = mulscale30(10*pPosture->bobV,Sin(predict.Kills*2));
- more renames.
2020-11-21 22:40:08 +00:00
predict.atc = mulscale30(predict.bobPhase*pPosture->bobH,Sin(predict.Kills-256));
predict.at18 = mulscale30(predict.bobPhase*pPosture->swayV,Sin(predict.at14*2));
predict.at1c = mulscale30(predict.bobPhase*pPosture->swayH,Sin(predict.at14-0x155));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
{
if (pXSprite->height < 256)
{
- rewrote the EndMgr in Blood to work as a screen job. This removes the special handling for it in the main loop. Some functions and variables in the kill and secret managers were also given more meaningful names. Fixes #313
2020-09-01 19:27:32 +00:00
predict.Kills = (predict.Kills+(pPosture->pace[predict.at70]*4))&2047;
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at14 = (predict.at14+(pPosture->pace[predict.at70]*4)/2)&2047;
if (predict.at70)
{
- more renames.
2020-11-21 22:40:08 +00:00
if (predict.bobPhase < 60)
predict.bobPhase = ClipHigh(predict.bobPhase + nSpeed, 60);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
else
{
- more renames.
2020-11-21 22:40:08 +00:00
if (predict.bobPhase < 30)
predict.bobPhase = ClipHigh(predict.bobPhase + nSpeed, 30);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
}
- more renames.
2020-11-21 22:40:08 +00:00
predict.at8 = mulscale30(predict.bobPhase*pPosture->bobV,Sin(predict.Kills*2));
predict.atc = mulscale30(predict.bobPhase*pPosture->bobH,Sin(predict.Kills-256));
predict.at18 = mulscale30(predict.bobPhase*pPosture->swayV,Sin(predict.at14*2));
predict.at1c = mulscale30(predict.bobPhase*pPosture->swayH,Sin(predict.at14-0x155));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
if (!pXSprite->health)
return;
predict.at72 = 0;
if (predict.at48 == 1)
{
predict.at72 = 1;
int nSector = predict.at68;
int nLink = gLowerLink[nSector];
if (nLink > 0 && (sprite[nLink].type == kMarkerLowGoo || sprite[nLink].type == kMarkerLowWater))
{
if (getceilzofslope(nSector, predict.at50, predict.at54) > predict.at38)
predict.at72 = 0;
}
}
}
static void fakeMoveDude(spritetype *pSprite)
{
PLAYER *pPlayer = NULL;
int bottom, top;
if (IsPlayerSprite(pSprite))
pPlayer = &gPlayer[pSprite->type-kDudePlayer1];
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
GetSpriteExtents(pSprite, &top, &bottom);
top += predict.at58 - pSprite->z;
bottom += predict.at58 - pSprite->z;
int bz = (bottom-predict.at58)/4;
int tz = (predict.at58-top)/4;
int wd = pSprite->clipdist*4;
int nSector = predict.at68;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
if (predict.at5c || predict.at60)
{
if (pPlayer && gNoClip)
{
predict.at50 += predict.at5c>>12;
predict.at54 += predict.at60>>12;
if (!FindSector(predict.at50, predict.at54, &nSector))
nSector = predict.at68;
}
else
{
short bakCstat = pSprite->cstat;
pSprite->cstat &= ~257;
predict.at75.hit = ClipMove(&predict.at50, &predict.at54, &predict.at58, &nSector, predict.at5c >> 12, predict.at60 >> 12, wd, tz, bz, CLIPMASK0);
if (nSector == -1)
nSector = predict.at68;
if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate)
{
short nSector2 = nSector;
pushmove_old((int32_t*)&predict.at50, (int32_t*)&predict.at54, (int32_t*)&predict.at58, &nSector2, wd, tz, bz, CLIPMASK0);
if (nSector2 != -1)
nSector = nSector2;
}
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
pSprite->cstat = bakCstat;
}
switch (predict.at75.hit&0xc000)
{
case 0x8000:
{
int nHitWall = predict.at75.hit&0x3fff;
walltype *pHitWall = &wall[nHitWall];
if (pHitWall->nextsector != -1)
{
sectortype *pHitSector = &sector[pHitWall->nextsector];
if (top < pHitSector->ceilingz || bottom > pHitSector->floorz)
{
// ???
}
}
actWallBounceVector(&predict.at5c, &predict.at60, nHitWall, 0);
break;
}
}
}
if (predict.at68 != nSector)
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at68 = nSector;
}
char bUnderwater = 0;
char bDepth = 0;
int nXSector = sector[nSector].extra;
if (nXSector > 0)
{
XSECTOR *pXSector = &xsector[nXSector];
if (pXSector->Underwater)
bUnderwater = 1;
if (pXSector->Depth)
bDepth = 1;
}
int nUpperLink = gUpperLink[nSector];
int nLowerLink = gLowerLink[nSector];
if (nUpperLink >= 0 && (sprite[nUpperLink].type == kMarkerUpWater || sprite[nUpperLink].type == kMarkerUpGoo))
bDepth = 1;
if (nLowerLink >= 0 && (sprite[nLowerLink].type == kMarkerLowWater || sprite[nLowerLink].type == kMarkerLowGoo))
bDepth = 1;
if (pPlayer)
wd += 16;
if (predict.at64)
predict.at58 += predict.at64 >> 8;
- added back the hijacked 'detail' member to spritetype. This changes the Blood map loader to not use the in-game sprite structure for loading a level and moves the qsprite_filler array back into the sprite.
2020-10-02 20:14:01 +00:00
static_assert(sizeof(tspritetype) == sizeof(spritetype));
tspritetype pSpriteBak; memcpy(&pSpriteBak, pSprite, sizeof(pSpriteBak)); // how dare you??? (Use a tspritetype here so that if the sprite storage gets refactored, this line gets flagged.)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
spritetype *pTempSprite = pSprite;
pTempSprite->x = predict.at50;
pTempSprite->y = predict.at54;
pTempSprite->z = predict.at58;
pTempSprite->sectnum = predict.at68;
int ceilZ, ceilHit, floorZ, floorHit;
GetZRange(pTempSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, wd, CLIPMASK0);
GetSpriteExtents(pTempSprite, &top, &bottom);
if (predict.at73 & 2)
{
int vc = 58254;
if (bDepth)
{
if (bUnderwater)
{
int cz = getceilzofslope(nSector, predict.at50, predict.at54);
if (cz > top)
vc += ((bottom-cz)*-80099) / (bottom-top);
else
vc = 0;
}
else
{
int fz = getflorzofslope(nSector, predict.at50, predict.at54);
if (fz < bottom)
vc += ((bottom-fz)*-80099) / (bottom-top);
}
}
else
{
if (bUnderwater)
vc = 0;
else if (bottom >= floorZ)
vc = 0;
}
if (vc)
{
predict.at58 += ((vc*4)/2)>>8;
predict.at64 += vc;
}
}
GetSpriteExtents(pTempSprite, &top, &bottom);
if (bottom >= floorZ)
{
int floorZ2 = floorZ;
int floorHit2 = floorHit;
GetZRange(pTempSprite, &ceilZ, &ceilHit, &floorZ, &floorHit, pSprite->clipdist<<2, CLIPMASK0, PARALLAXCLIP_CEILING|PARALLAXCLIP_FLOOR);
if (bottom <= floorZ && predict.at58-floorZ2 < bz)
{
floorZ = floorZ2;
floorHit = floorHit2;
}
}
if (floorZ <= bottom)
{
predict.at75.florhit = floorHit;
predict.at58 += floorZ-bottom;
int var44 = predict.at64-velFloor[predict.at68];
if (var44 > 0)
{
actFloorBounceVector(&predict.at5c, &predict.at60, &var44, predict.at68, 0);
predict.at64 = var44;
if (klabs(predict.at64) < 0x10000)
{
predict.at64 = velFloor[predict.at68];
predict.at73 &= ~4;
}
else
predict.at73 |= 4;
}
else if (predict.at64 == 0)
predict.at73 &= ~4;
}
else
{
predict.at75.florhit = 0;
if (predict.at73 & 2)
predict.at73 |= 4;
}
if (top <= ceilZ)
{
predict.at75.ceilhit = ceilHit;
predict.at58 += ClipLow(ceilZ-top, 0);
if (predict.at64 <= 0 && (predict.at73&4))
predict.at64 = mulscale16(-predict.at64, 0x2000);
}
else
predict.at75.ceilhit = 0;
GetSpriteExtents(pTempSprite, &top, &bottom);
- added back the hijacked 'detail' member to spritetype. This changes the Blood map loader to not use the in-game sprite structure for loading a level and moves the qsprite_filler array back into the sprite.
2020-10-02 20:14:01 +00:00
memcpy(pSprite, &pSpriteBak, sizeof(pSpriteBak));
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
predict.at6a = ClipLow(floorZ-bottom, 0)>>8;
if (predict.at5c || predict.at60)
{
if ((floorHit & 0xc000) == 0xc000)
{
int nHitSprite = floorHit & 0x3fff;
if ((sprite[nHitSprite].cstat & 0x30) == 0)
{
predict.at5c += mulscale(4, predict.at50 - sprite[nHitSprite].x, 2);
predict.at60 += mulscale(4, predict.at54 - sprite[nHitSprite].y, 2);
return;
}
}
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0 && xsector[nXSector].Underwater)
return;
if (predict.at6a >= 0x100)
return;
int nDrag = gDudeDrag;
if (predict.at6a > 0)
nDrag -= scale(gDudeDrag, predict.at6a, 0x100);
predict.at5c -= mulscale16r(predict.at5c, nDrag);
predict.at60 -= mulscale16r(predict.at60, nDrag);
if (approxDist(predict.at5c, predict.at60) < 0x1000)
predict.at5c = predict.at60 = 0;
}
}
static void fakeActAirDrag(spritetype *, int num)
{
int xvec = 0;
int yvec = 0;
int nSector = predict.at68;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nSector >= 0 && nSector < kMaxSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
sectortype *pSector = &sector[nSector];
int nXSector = pSector->extra;
if (nXSector > 0)
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSector < kMaxXSectors);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
XSECTOR *pXSector = &xsector[nXSector];
if (pXSector->windVel && (pXSector->windAlways || pXSector->busy))
{
int vel = pXSector->windVel<<12;
if (!pXSector->windAlways && pXSector->busy)
vel = mulscale16(vel, pXSector->busy);
xvec = mulscale30(vel, Cos(pXSector->windAng));
yvec = mulscale30(vel, Sin(pXSector->windAng));
}
}
predict.at5c += mulscale16(xvec-predict.at5c, num);
predict.at60 += mulscale16(yvec-predict.at60, num);
predict.at64 -= mulscale16(predict.at64, num);
}
void fakeActProcessSprites(void)
{
spritetype *pSprite = gMe->pSprite;
if (pSprite->statnum == kStatDude)
{
int nXSprite = pSprite->extra;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSprite > 0 && nXSprite < kMaxXSprites);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
int nSector = predict.at68;
int nXSector = sector[nSector].extra;
XSECTOR *pXSector = NULL;
if (nXSector > 0)
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(nXSector > 0 && nXSector < kMaxXSectors);
assert(xsector[nXSector].reference == nSector);
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
pXSector = &xsector[nXSector];
}
if (pXSector)
{
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
top += predict.at58 - pSprite->z;
bottom += predict.at58 - pSprite->z;
if (getflorzofslope(nSector, predict.at50, predict.at54) < bottom)
{
int angle = pXSector->panAngle;
int speed = 0;
if (pXSector->panAlways || pXSector->state || pXSector->busy)
{
speed = pXSector->panVel << 9;
if (!pXSector->panAlways && pXSector->busy)
speed = mulscale16(speed, pXSector->busy);
}
if (sector[nSector].floorstat&64)
angle = (GetWallAngle(sector[nSector].wallptr)+512)&2047;
predict.at5c += mulscale30(speed,Cos(angle));
predict.at60 += mulscale30(speed,Sin(angle));
}
}
if (pXSector && pXSector->Underwater)
fakeActAirDrag(pSprite, 5376);
else
fakeActAirDrag(pSprite, 128);
if ((predict.at73 & 4) != 0 || predict.at5c != 0 || predict.at60 != 0 || predict.at64 != 0 || velFloor[predict.at68] != 0 || velCeil[predict.at68] != 0)
{
fakeMoveDude(pSprite);
}
}
}
void viewCorrectPrediction(void)
{
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
#if 0
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
spritetype *pSprite = gMe->pSprite;
VIEW *pView = &predictFifo[(gNetFifoTail-1)&255];
- Blood: Cut `q16ang`/`q16look_ang`/`q16rotscrnang` over to PlayerAngle struct.
2020-10-07 20:55:54 +00:00
if (gMe->angle.ang != pView->at30 || pView->at24 != gMe->horizon.horiz || pView->at50 != pSprite->x || pView->at54 != pSprite->y || pView->at58 != pSprite->z)
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
{
viewInitializePrediction();
predictOld = gPrevView[myconnectindex];
gPredictTail = gNetFifoTail;
while (gPredictTail < gNetFifoHead[myconnectindex])
{
viewUpdatePrediction(&gFifoInput[gPredictTail&255][myconnectindex]);
}
}
- transitioned Blood to the new main loop. Mostly working but interpolation is not correct yet and for some strange reason the numbers on the HUD are gone.
2020-09-01 21:34:04 +00:00
#endif
- split Blood prediction code into its own file.
2020-08-02 17:43:45 +00:00
}
END_BLD_NS
Reference in a new issue Copy permalink