summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-06-16 21:44:05 +0200
committereray orçunus <erayorcunus@gmail.com>2019-06-16 21:44:05 +0200
commitbeb6f0d4c75fa5f7be4998f78929e0a66fc9540c (patch)
tree8a1f28b7f4987d222c26749e99529f9002e0f0ca /src/main.cpp
parentCPed fixes and needed functions for further commits (diff)
parentfix the cleanup... (diff)
downloadre3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar.gz
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar.bz2
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar.lz
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar.xz
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.tar.zst
re3-beb6f0d4c75fa5f7be4998f78929e0a66fc9540c.zip
Diffstat (limited to '')
-rw-r--r--src/main.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9b8fc145..976de407 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -140,8 +140,8 @@ Idle(void *arg)
Render2dStuff();
}else{
float viewWindow = tan(DEGTORAD(CDraw::GetFOV() * 0.5f));
- // ASPECT
- CameraSize(Scene.camera, nil, viewWindow, 4.0f/3.0f);
+ CDraw::CalculateAspectRatio();
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera))
@@ -172,8 +172,8 @@ FrontendIdle(void)
return;
float viewWindow = tan(DEGTORAD(CDraw::GetFOV() * 0.5f));
- // ASPECT
- CameraSize(Scene.camera, nil, viewWindow, 4.0f/3.0f);
+ CDraw::CalculateAspectRatio();
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera))
@@ -194,9 +194,8 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
float viewWindow = tan(DEGTORAD(CDraw::GetFOV() * 0.5f));
- // ASPECT
- float aspectRatio = CMenuManager::m_PrefsUseWideScreen ? 16.0f/9.0f : 4.0f/3.0f;
- CameraSize(Scene.camera, nil, viewWindow, aspectRatio);
+ CDraw::CalculateAspectRatio();
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
@@ -215,9 +214,8 @@ bool
DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
{
float viewWindow = tan(DEGTORAD(CDraw::GetFOV() * 0.5f));
- // ASPECT
- float aspectRatio = CMenuManager::m_PrefsUseWideScreen ? 16.0f/9.0f : 4.0f/3.0f;
- CameraSize(Scene.camera, nil, viewWindow, aspectRatio);
+ CDraw::CalculateAspectRatio();
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);