zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle parts of CameraView

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 22:58:26 +02:00
parent c6bb8cea89
commit 49b9863e42
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1073,6 +1073,7 @@ void DrawCrosshair(PLAYER* pp)
void CameraView(PLAYER* pp, int *tx, int *ty, int *tz, sectortype** tsect, DAngle *tang, fixedhoriz *thoriz) void CameraView(PLAYER* pp, int *tx, int *ty, int *tz, sectortype** tsect, DAngle *tang, fixedhoriz *thoriz)
{ {
DAngle ang; DAngle ang;
bool found_camera = false; bool found_camera = false;
bool player_in_camera = false; bool player_in_camera = false;
@ -1084,12 +1085,14 @@ void CameraView(PLAYER* pp, int *tx, int *ty, int *tz, sectortype** tsect, DAngl
SWStatIterator it(STAT_DEMO_CAMERA); SWStatIterator it(STAT_DEMO_CAMERA);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
ang = VecToAngle(*tx - actor->int_pos().X, *ty - actor->int_pos().Y); DVector3 test1(*tx * inttoworld, *ty * inttoworld, *tz * zinttoworld);
ang = VecToAngle(test1.XY() - actor->spr.pos.XY());
ang_test = deltaangle(ang, actor->spr.angle) < DAngle::fromBuild(actor->spr.lotag); ang_test = deltaangle(ang, actor->spr.angle) < DAngle::fromBuild(actor->spr.lotag);
FAFcansee_test = FAFcansee_test =
(FAFcansee_(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->sector(), *tx, *ty, *tz, pp->cursector) || (FAFcansee(actor->spr.pos, actor->sector(), test1, pp->cursector) ||
FAFcansee_(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->sector(), *tx, *ty, *tz + int_ActorSizeZ(pp->actor), pp->cursector)); FAFcansee(actor->spr.pos, actor->sector(), test1.plusZ(ActorSizeZ(pp->actor)), pp->cursector));
player_in_camera = ang_test && FAFcansee_test; player_in_camera = ang_test && FAFcansee_test;