summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-01 10:12:42 +0100
committeraap <aap@papnet.eu>2020-12-01 10:12:42 +0100
commitd6fab1bc53627d55391d10a557a9e0cbcd11ac6d (patch)
tree964fd2001f1b3a167da369284b7c7beab2d7ebe9 /src/core
parentMerge pull request #856 from ZLau92/patch-2 (diff)
downloadre3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar.gz
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar.bz2
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar.lz
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar.xz
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.tar.zst
re3-d6fab1bc53627d55391d10a557a9e0cbcd11ac6d.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 9281a20a..cd748f09 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -94,9 +94,9 @@ CCamera::Init(void)
#endif
#ifdef PS2_MENU
- if ( !TheMemoryCard.m_bWantToLoad && !FrontEndMenuManager.m_bWantToRestart ) {
+ if ( !TheMemoryCard.m_bWantToLoad && !FrontEndMenuManager.m_bWantToRestart )
#endif
-
+ {
#ifdef FIX_BUGS
static const CCamera DummyCamera = CCamera(0.f);
*this = DummyCamera;
@@ -110,9 +110,7 @@ CCamera::Init(void)
#endif
m_pRwCamera = nil;
-#ifdef PS2_MENU
}
-#endif
m_1rstPersonRunCloseToAWall = false;
m_fPositionAlongSpline = 0.0f;
@@ -719,10 +717,14 @@ CCamera::Process(void)
LODDistMultiplier = 70.0f/CDraw::GetFOV() * CDraw::GetAspectRatio()/(4.0f/3.0f);
else
LODDistMultiplier = 1.0f;
- // missing on PS2
- GenerationDistMultiplier = 70.0f/CDraw::GetFOV() * fmin(CDraw::GetAspectRatio(),1.82f)/(4.0f/3.0f);
+#if GTA_VERSION > GTA3_PS2_160
+#ifndef FIX_BUGS
+ // this seems problematic for very wide aspect ratios
+ // maybe just leaving it at 1.0 is the best thing to do
+ GenerationDistMultiplier = LODDistMultiplier;
+#endif
LODDistMultiplier *= CRenderer::ms_lodDistScale;
- //
+#endif
// Keep track of speed
if(m_bJustInitalised || m_bJust_Switched){