diff options
| author | aap <aap@papnet.eu> | 2020-06-21 14:50:00 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-21 14:52:44 +0200 |
| commit | 60f736f20fe9493936dab95963b52b18d3353ffc (patch) | |
| tree | 40a934885b26e9d44e88a4dd3965627ecfddd364 /src/render | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar.gz re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar.bz2 re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar.lz re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar.xz re3-60f736f20fe9493936dab95963b52b18d3353ffc.tar.zst re3-60f736f20fe9493936dab95963b52b18d3353ffc.zip | |
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/Draw.cpp | 6 | ||||
| -rw-r--r-- | src/render/Draw.h | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp index e2dfc8d9..3f7d89c7 100644 --- a/src/render/Draw.cpp +++ b/src/render/Draw.cpp @@ -6,6 +6,7 @@ #ifdef ASPECT_RATIO_SCALE float CDraw::ms_fAspectRatio = DEFAULT_ASPECT_RATIO; +float CDraw::ms_fScaledFOV = 45.0f; #endif float CDraw::ms_fNearClipZ; @@ -60,8 +61,7 @@ void CDraw::SetFOV(float fov) { #ifdef ASPECT_RATIO_SCALE - ms_fFOV = ConvertFOV(fov); -#else - ms_fFOV = fov; + ms_fScaledFOV = ConvertFOV(fov); #endif + ms_fFOV = fov; } diff --git a/src/render/Draw.h b/src/render/Draw.h index 46e85e49..2976dc34 100644 --- a/src/render/Draw.h +++ b/src/render/Draw.h @@ -16,14 +16,15 @@ private: static float ms_fNearClipZ; static float ms_fFarClipZ; static float ms_fFOV; -public: - static float ms_fLODDistance; // set but unused? - #ifdef ASPECT_RATIO_SCALE // we use this variable to scale a lot of 2D elements // so better cache it static float ms_fAspectRatio; + // similar thing for 3D rendering + static float ms_fScaledFOV; #endif +public: + static float ms_fLODDistance; // set but unused? static uint8 FadeValue; static uint8 FadeRed; @@ -37,6 +38,11 @@ public: static void SetFOV(float fov); static float GetFOV(void) { return ms_fFOV; } +#ifdef ASPECT_RATIO_SCALE + static float GetScaledFOV(void) { return ms_fScaledFOV; } +#else + static float GetScaledFOV(void) { return ms_fFOV; } +#endif static float CalculateAspectRatio(void); #ifdef ASPECT_RATIO_SCALE |