Skip to content

Commit 7162ef8

Browse files
committed
Коллизия камеры ( вариант от @dsh2dsh )
Для включения: `g_camera_collision on` `g_camera_collision_cop_mode on`
1 parent 24a7510 commit 7162ef8

24 files changed

+918
-101
lines changed

ogsr_engine/xrGame/Actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static Fbox bbCrouchBox;
8686
static Fvector vFootCenter;
8787
static Fvector vFootExt;
8888

89-
Flags32 psActorFlags = {AF_KEYPRESS_ON_START | AF_CAM_COLLISION | AF_AI_VOLUMETRIC_LIGHTS | AF_DOF_ZOOM | AF_DOF_RELOAD | AF_3D_PDA | AF_ALWAYSRUN | AF_FIRST_PERSON_DEATH};
89+
Flags32 psActorFlags{AF_KEYPRESS_ON_START | AF_CAM_COLLISION | AF_CAM_COLLISION_COP | AF_AI_VOLUMETRIC_LIGHTS | AF_DOF_ZOOM | AF_DOF_RELOAD | AF_3D_PDA | AF_ALWAYSRUN | AF_FIRST_PERSON_DEATH};
9090

9191
static bool updated;
9292

ogsr_engine/xrGame/Actor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ class CActor : public CEntityAlive,
352352
protected:
353353
void cam_Set(EActorCameras style);
354354
void cam_Update(float dt, float fFOV);
355+
void cam_Lookout(const Fmatrix& xform, float camera_height);
355356
void camUpdateLadder(float dt);
356357
void cam_SetLadder();
357358
void cam_UnsetLadder();

0 commit comments

Comments
 (0)