diff options
| author | aap <aap@papnet.eu> | 2020-06-21 00:40:07 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-21 00:40:07 +0200 |
| commit | e1c58131c4637e70dbe533c82a1edab134650b14 (patch) | |
| tree | b0467bbd6bdf78b49a6ebdac6834dc9ef2c4e40f /src/core/Camera.h | |
| parent | some PS2 cam code; fix for arrest cam (diff) | |
| download | re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar.gz re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar.bz2 re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar.lz re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar.xz re3-e1c58131c4637e70dbe533c82a1edab134650b14.tar.zst re3-e1c58131c4637e70dbe533c82a1edab134650b14.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Camera.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h index 395effa8..f370bb98 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -425,9 +425,12 @@ public: float CarZoomValueSmooth; float DistanceToWater; +#ifndef PS2_CAM_TRANSITION float FOVDuringInter; +#endif float LODDistMultiplier; float GenerationDistMultiplier; +#ifndef PS2_CAM_TRANSITION float m_fAlphaSpeedAtStartInter; float m_fAlphaWhenInterPol; float m_fAlphaDuringInterPol; @@ -438,6 +441,7 @@ public: float m_fFOVSpeedAtStartInter; float m_fStartingBetaForInterPol; float m_fStartingAlphaForInterPol; +#endif float m_PedOrientForBehindOrInFront; float m_CameraAverageSpeed; float m_CameraSpeedSoFar; @@ -487,7 +491,7 @@ public: CVector m_vecFixedModeSource; CVector m_vecFixedModeUpOffSet; CVector m_vecCutSceneOffset; - +#ifndef PS2_CAM_TRANSITION CVector m_cvecStartingSourceForInterPol; CVector m_cvecStartingTargetForInterPol; CVector m_cvecStartingUpForInterPol; @@ -497,11 +501,13 @@ public: CVector m_vecSourceWhenInterPol; CVector m_vecTargetWhenInterPol; CVector m_vecUpWhenInterPol; - +#endif CVector m_vecGameCamPos; +#ifndef PS2_CAM_TRANSITION CVector SourceDuringInter; CVector TargetDuringInter; CVector UpDuringInter; +#endif RwCamera *m_pRwCamera; CEntity *pTargetEntity; CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES]; |