diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2019-10-07 14:08:39 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2019-10-07 14:08:39 +0200 |
| commit | 1df8e7976fd474225060cb7b4ac34bac6ef29906 (patch) | |
| tree | 74c4f2d668ddfc002ca34e2081d3a45a526375ab | |
| parent | CHud::Draw - removed render states, readded hud toogle with second controller (diff) | |
| download | re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar.gz re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar.bz2 re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar.lz re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar.xz re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.tar.zst re3-1df8e7976fd474225060cb7b4ac34bac6ef29906.zip | |
| -rw-r--r-- | src/core/PlayerSkin.cpp | 6 | ||||
| -rw-r--r-- | src/core/main.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
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)) |