From 1df8e7976fd474225060cb7b4ac34bac6ef29906 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Mon, 7 Oct 2019 15:08:39 +0300
Subject: [PATCH] Aspect ratio fix for player skin menu
---
src/core/PlayerSkin.cpp | 6 +++++-
src/core/main.cpp | 8 ++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/core/PlayerSkin.cpp b/src/core/PlayerSkin.cpp
index 111333ec..82427491 100644
--- a/src/core/PlayerSkin.cpp
+++ b/src/core/PlayerSkin.cpp
@@ -137,11 +137,15 @@ CPlayerSkin::RenderFrontendSkinEdit(void)
{
static float rotation = 0.0f;
RwRGBAReal AmbientColor = { 0.65f, 0.65f, 0.65f, 1.0f };
- const RwV3d pos = { 1.35f, 0.35f, 7.725f };
+ RwV3d pos = { 1.35f, 0.35f, 7.725f };
const RwV3d axis1 = { 1.0f, 0.0f, 0.0f };
const RwV3d axis2 = { 0.0f, 0.0f, 1.0f };
static uint32 LastFlash = 0;
+#ifdef ASPECT_RATIO_SCALE
+ pos.x = 1.35f * (SCREEN_ASPECT_RATIO / DEFAULT_ASPECT_RATIO);
+#endif
+
RwFrame *frame = RpClumpGetFrame(gpPlayerClump);
if (CTimer::GetTimeInMillisecondsPauseMode() - LastFlash > 7) {
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 50494ef3..8985d56a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -199,7 +199,11 @@ Idle(void *arg)
Render2dStuff();
}else{
float viewWindow = DEFAULT_VIEWWINDOW;
+#ifdef ASPECT_RATIO_SCALE
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
+#else
CameraSize(Scene.camera, nil, viewWindow, DEFAULT_ASPECT_RATIO);
+#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera))
@@ -234,7 +238,11 @@ FrontendIdle(void)
return;
float viewWindow = DEFAULT_VIEWWINDOW;
+#ifdef ASPECT_RATIO_SCALE
+ CameraSize(Scene.camera, nil, viewWindow, SCREEN_ASPECT_RATIO);
+#else
CameraSize(Scene.camera, nil, viewWindow, DEFAULT_ASPECT_RATIO);
+#endif
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
if(!RsCameraBeginUpdate(Scene.camera))