Make code much cleaner

Fancy2209 · Fancy2209 · commit 072708b7170f · 2025-02-07T18:37:34.000-01:00
diff --git a/src/render/ogc/SDL_render_ogc.c b/src/render/ogc/SDL_render_ogc.c
@@ -427,14 +427,8 @@ static int OGC_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL
 static int OGC_RenderSetViewPort(SDL_Renderer *renderer, SDL_RenderCommand *cmd)
 {
     const SDL_Rect *viewport = &cmd->data.viewport.rect;
-    #ifdef __wii__
-    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
-        OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h, 
-                         viewport->w==640 ? (viewport->h*16.0f/9.0f)+1 : viewport->w);
-    else
-    #endif
-    OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h, viewport->w);
-    
+
+    OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h);
     return 0;
 }
 
diff --git a/src/video/ogc/SDL_ogcgxcommon.c b/src/video/ogc/SDL_ogcgxcommon.c
@@ -40,37 +40,23 @@ static const f32 tex_pos[] __attribute__((aligned(32))) = {
     1.0,
 };
 
-/* On Widescreen if we pass the intended viewport width, the output will be streched
- * due to the fact the Wii's Widescreen is anamorphic, for this reason, we passs
- * a width value adjusted for widescreen, so we can modify the ortographic projection
- * of the viewport to allow the screen size to be displayed properly in widescreen
- * For example: If an app wants to output at 640x480, 
- * it will be streched unless the projection is setup for 854x480,
- * so we pass 854 on widthAdjustedForWidescreen 
- * 
- * The reason why we can't just check for the active aspect ratio
- * is that if the app is using SDL Renderer with a different logical size
- * from the window, it'd set the viewport to a size, than when we render we set it to another
- * and the image ends up distorted, an example of this is VVVVVV. */
-void OGC_set_viewport(int x, int y, int w, int h, int widthAdjustedForWidescreen)
+void OGC_set_viewport(int x, int y, int w, int h)
 {
-    SDL_Log("OGC_set_viewport: %d %d %d %d %d", x, y, w, h, widthAdjustedForWidescreen);
     Mtx44 proj;
 
     GX_SetViewport(x, y, (w > 640) ? 640 : w, h, 0, 1);
     GX_SetScissor(x, y, (w > 640) ? 640 : w, h);
 
     // matrix, t, b, l, r, n, f
-    guOrtho(proj, 0, h, 0, widthAdjustedForWidescreen, 0, 1);
+    guOrtho(proj, 0, h, 0, w, 0, 1);
     GX_LoadProjectionMtx(proj, GX_ORTHOGRAPHIC);
 }
 
-// takes in w, h and widthAdjustedForWidescreen to pass to OGC_set_viewport
-void OGC_draw_init(int w, int h, int widthAdjustedForWidescreen)
+void OGC_draw_init(int w, int h)
 {
     Mtx mv;
 
-    SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "OGC_draw_init called with %d, %d, %d", w, h, widthAdjustedForWidescreen);
+    SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "OGC_draw_init called with %d, %d", w, h);
 
     guMtxIdentity(mv);
     /* Ideally we would use 0.5 to center the coordinates on the pixels, but
@@ -100,7 +86,7 @@ void OGC_draw_init(int w, int h, int widthAdjustedForWidescreen)
     GX_SetTevOp(GX_TEVSTAGE0, GX_REPLACE);
     GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
 
-    OGC_set_viewport(0, 0, w, h, widthAdjustedForWidescreen);
+    OGC_set_viewport(0, 0, w, h);
 
     GX_InvVtxCache(); // update vertex cache
 }
diff --git a/src/video/ogc/SDL_ogcgxcommon.h b/src/video/ogc/SDL_ogcgxcommon.h
@@ -29,8 +29,8 @@
 
 #define GX_COLOR_AS_U32(c) *((u32*)&c)
 
-void OGC_draw_init(int w, int h, int widthAdjustedForWidescreen);
-void OGC_set_viewport(int x, int y, int w, int h, int widthAdjustedForWidescreen);
+void OGC_draw_init(int w, int h);
+void OGC_set_viewport(int x, int y, int w, int h);
 void OGC_load_texture(void *texels, int w, int h, u8 gx_format,
                       SDL_ScaleMode scale_mode);
 
diff --git a/src/video/ogc/SDL_ogcmouse.c b/src/video/ogc/SDL_ogcmouse.c
@@ -196,8 +196,14 @@ void OGC_draw_cursor(_THIS)
     screen_h = _this->displays[0].current_mode.h;
 
     curdata = mouse->cur_cursor->driverdata;
-    OGC_load_texture(curdata->texels, curdata->w, curdata->h, GX_TF_RGBA8,
-                     SDL_ScaleModeNearest);
+    #ifdef __wii__
+    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
+        OGC_load_texture(curdata->texels, curdata->w, curdata->h, GX_TF_RGBA8,
+                         SDL_ScaleModeLinear);
+    else
+    #endif
+        OGC_load_texture(curdata->texels, curdata->w, curdata->h, GX_TF_RGBA8,
+                         SDL_ScaleModeNearest);
 
     guMtxIdentity(mv);
 #ifdef __wii__
@@ -215,7 +221,7 @@ void OGC_draw_cursor(_THIS)
     guMtxTransApply(mv, mv, mouse->x, mouse->y, 0);
     GX_LoadPosMtxImm(mv, GX_PNMTX1);
 
-    OGC_set_viewport(0, 0, screen_w, screen_h, screen_w);
+    OGC_set_viewport(0, 0, screen_w, screen_h);
 
     GX_ClearVtxDesc();
     GX_SetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -247,8 +253,7 @@ void OGC_draw_cursor(_THIS)
         SDL_Renderer *renderer = SDL_GetRenderer(_this->windows);
         if (renderer) {
             OGC_set_viewport(renderer->viewport.x, renderer->viewport.y,
-                             renderer->viewport.w, renderer->viewport.h,
-                             renderer->viewport.w);
+                             renderer->viewport.w, renderer->viewport.h);
         }
     }
 }
diff --git a/src/video/ogc/SDL_ogcvideo.c b/src/video/ogc/SDL_ogcvideo.c
@@ -52,7 +52,6 @@
 
 /* A video mode with a 320 width; we'll build it programmatically. */
 static GXRModeObj s_mode320;
-static GXRModeObj s_mode704;
 
 static const GXRModeObj *s_ntsc_modes[] = {
     &TVNtsc240Ds,
@@ -96,11 +95,12 @@ static void init_display_mode(SDL_DisplayMode *mode, const GXRModeObj *vmode)
     mode->format = SDL_PIXELFORMAT_ARGB8888;
 
     #ifdef __wii__
-    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
-        mode->w = ((int)(vmode->fbWidth * 16.0f / 9.0f)) + 1;
-    else
+    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) {
+        mode->w = vmode->fbWidth * 16.0f / 9.0f;
+        mode->w = (mode->w + 1) & ~1;
+    }
     #endif
-        mode->w = vmode->fbWidth;
+    mode->w = vmode->fbWidth;
     mode->h = vmode->efbHeight;
     switch (format) {
     case VI_DEBUG:
@@ -114,7 +114,7 @@ static void init_display_mode(SDL_DisplayMode *mode, const GXRModeObj *vmode)
         mode->refresh_rate = 50;
         break;
     }
-    mode->driverdata = (GXRModeObj *)vmode;
+    mode->driverdata = (GXRModeObj*)vmode;
 }
 
 static void add_supported_modes(SDL_VideoDisplay *display, u32 tv_format)
@@ -153,32 +153,6 @@ static void add_supported_modes(SDL_VideoDisplay *display, u32 tv_format)
     init_display_mode(&mode, &s_mode320);
     SDL_AddDisplayMode(display, &mode);
 
-    // libogc uses 640 for the viWidth, but this does not work well for Widescreen
-    // as such we extend the viWidth to 704 on a new videomode
-    // TODO: Currently ony added on wii if it's widescreen,
-    // but should work on GC and a 4:3 Wii
-    // testing needed
-
-#ifdef __wii__
-    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) {
-        memcpy(&s_mode704, gx_modes[1], sizeof(s_mode704));
-        s_mode704.viWidth = 704;
-
-        // set Center point
-        if (&s_mode704 == &TVPal576IntDfScale || &s_mode704 == &TVPal576ProgScale) {
-            s_mode704.viXOrigin = (VI_MAX_WIDTH_PAL - s_mode704.viWidth) / 2;
-            s_mode704.viYOrigin = (VI_MAX_HEIGHT_PAL - s_mode704.viHeight) / 2;
-        } else {
-            s_mode704.viXOrigin = (VI_MAX_WIDTH_NTSC - s_mode704.viWidth) / 2;
-            s_mode704.viYOrigin = (VI_MAX_HEIGHT_NTSC - s_mode704.viHeight) / 2;
-        }
-
-        // Widescreen is anamorphic, so we provide a different width for the ortho projection
-        init_display_mode(&mode, &s_mode704);
-        SDL_AddDisplayMode(display, &mode);
-    }
-#endif
-
     /* Now add all the "standard" modes from libogc */
     while (*gx_modes) {
         init_display_mode(&mode, *gx_modes);
@@ -187,10 +161,24 @@ static void add_supported_modes(SDL_VideoDisplay *display, u32 tv_format)
     }
 }
 
-static void setup_video_mode(_THIS, GXRModeObj *vmode, int widthAdjustedForWidescreen)
+static void setup_video_mode(_THIS, GXRModeObj *vmode)
 {
     SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
 
+    // TODO: Should I make this only happen if the aspect ratio isn't 4:3?
+    if(vmode->viWidth == 240 || vmode->viWidth == 640)
+        vmode->viWidth = vmode->viWidth + (VI_MAX_WIDTH_NTSC - 640);
+    
+    // set Center point
+    if (VI_FORMAT_FROM_MODE(vmode->viTVMode) == VI_PAL) {
+        vmode->viXOrigin = (VI_MAX_WIDTH_PAL - vmode->viWidth) / 2;
+        vmode->viYOrigin = (VI_MAX_HEIGHT_PAL - vmode->viHeight) / 2;
+    } else {
+        vmode->viXOrigin = (VI_MAX_WIDTH_NTSC - vmode->viWidth) / 2;
+        vmode->viYOrigin = (VI_MAX_HEIGHT_NTSC - vmode->viHeight) / 2;
+    }
+
+
     VIDEO_SetBlack(true);
     VIDEO_Configure(vmode);
 
@@ -215,7 +203,7 @@ static void setup_video_mode(_THIS, GXRModeObj *vmode, int widthAdjustedForWides
     GX_SetFieldMode(vmode->field_rendering,
                     ((vmode->viHeight == 2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
 
-    OGC_draw_init(vmode->fbWidth, vmode->efbHeight, widthAdjustedForWidescreen);
+    OGC_draw_init(vmode->fbWidth, vmode->efbHeight);
 }
 
 static int OGC_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
@@ -230,7 +218,7 @@ static int OGC_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
     if (videodata->xfb[1])
         free(MEM_K1_TO_K0(videodata->xfb[1]));
 
-    setup_video_mode(_this, vmode, mode->w);
+    setup_video_mode(_this, vmode);
     return 0;
 }
 
@@ -312,30 +300,21 @@ int OGC_VideoInit(_THIS)
     VIDEO_Init();
 
     vmode = VIDEO_GetPreferredMode(NULL);
-#ifdef __wii__
-    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) {
-        vmode->viWidth = 704;
-
-        // set Center point
-        if (&s_mode704 == &TVPal576IntDfScale || &s_mode704 == &TVPal576ProgScale) {
-            vmode->viXOrigin = (VI_MAX_WIDTH_PAL - vmode->viWidth) / 2;
-            vmode->viYOrigin = (VI_MAX_HEIGHT_PAL - vmode->viHeight) / 2;
-        } else {
-            vmode->viXOrigin = (VI_MAX_WIDTH_NTSC - vmode->viWidth) / 2;
-            vmode->viYOrigin = (VI_MAX_HEIGHT_NTSC - vmode->viHeight) / 2;
-        }
+    vmode->viWidth = VI_MAX_WIDTH_NTSC; // VI_MAX_WIDTH is the same for all regions
+    // set Center point
+    if (VI_FORMAT_FROM_MODE(vmode->viTVMode) == VI_PAL) {
+        vmode->viXOrigin = (VI_MAX_WIDTH_PAL - vmode->viWidth) / 2;
+        vmode->viYOrigin = (VI_MAX_HEIGHT_PAL - vmode->viHeight) / 2;
+    } else {
+        vmode->viXOrigin = (VI_MAX_WIDTH_NTSC - vmode->viWidth) / 2;
+        vmode->viYOrigin = (VI_MAX_HEIGHT_NTSC - vmode->viHeight) / 2;
     }
-#endif
+
     videodata->gp_fifo = memalign(32, DEFAULT_FIFO_SIZE);
     memset(videodata->gp_fifo, 0, DEFAULT_FIFO_SIZE);
     GX_Init(videodata->gp_fifo, DEFAULT_FIFO_SIZE);
 
-#ifdef __wii__
-    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
-        setup_video_mode(_this, vmode, 854);
-    else
-#endif
-    setup_video_mode(_this, vmode, vmode->fbWidth);
+    setup_video_mode(_this, vmode);
     GX_SetCopyClear(background, GX_MAX_Z24);
 
     GX_SetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR);
