Centralizing more code in the plugin

vitor251093 · Jun 24, 2024 · 18407c0 · 18407c0
1 parent a008764
commit 18407c0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 25 deletions.
diff --git a/src/KHDays_Plugin.cpp b/src/KHDays_Plugin.cpp
@@ -39,6 +39,9 @@ bool KHDaysPlugin::_hasVisible3DOnBottomScreen = false;
 #define PARSE_BRIGHTNESS_FOR_BLACK_BACKGROUND(b) (b & (1 << 14) ? ((b - 1) & 0xF) : 0)
 #define PARSE_BRIGHTNESS_FOR_UNKNOWN_BACKGROUND(b) (b & (1 << 14) ? ((b - 1) & 0xF) : (b & (1 << 15) ? (0xF - ((b - 1) & 0xF)) : 0))
 
+#define renderer3D_OpenGL        1
+#define renderer3D_OpenGLCompute 2
+
 enum
 {
     gameScene_Intro,                    // 0
@@ -121,12 +124,12 @@ void KHDaysPlugin::hudRefresh(melonDS::NDS* nds)
 {
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetShowMap(ShowMap);
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetShowTarget(ShowTarget);
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetShowMissionGauge(ShowMissionGauge);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetShowMap(ShowMap);
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetShowTarget(ShowTarget);
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetShowMissionGauge(ShowMissionGauge);
@@ -222,11 +225,11 @@ bool KHDaysPlugin::shouldSkipFrame(melonDS::NDS* nds)
 
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetIsBottomScreen2DTextureBlack(isBottomBlack);
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetIsTopScreen2DTextureBlack(isTopBlack);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetIsBottomScreen2DTextureBlack(isBottomBlack);
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetIsTopScreen2DTextureBlack(isTopBlack);
             break;
@@ -579,6 +582,17 @@ void KHDaysPlugin::setAspectRatio(melonDS::NDS* nds, float aspectRatio)
     if (nds->ARM7Read32(aspectRatioMenuAddress) == 0x00001555) {
         nds->ARM7Write32(aspectRatioMenuAddress, aspectRatioKey);
     }
+
+    switch (videoRenderer)
+    {
+        case renderer3D_OpenGL:
+            static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetAspectRatio(aspectRatio / (4.f / 3.f));
+            break;
+        case renderer3D_OpenGLCompute:
+            static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetAspectRatio(aspectRatio / (4.f / 3.f));
+            break;
+        default: break;
+    }
 }
 
 bool KHDaysPlugin::setGameScene(melonDS::NDS* nds, int newGameScene)
@@ -596,10 +610,10 @@ bool KHDaysPlugin::setGameScene(melonDS::NDS* nds, int newGameScene)
     // Updating GameScene inside shader
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetGameScene(newGameScene);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetGameScene(newGameScene);
             break;
         default: break;

diff --git a/src/KHReCoded_Plugin.cpp b/src/KHReCoded_Plugin.cpp
@@ -2,6 +2,7 @@
 
 #include "GPU3D_OpenGL.h"
 #include "GPU3D_Compute.h"
+#include "CartValidator.h"
 
 #include <math.h>
 
@@ -28,6 +29,9 @@ bool KHReCodedPlugin::_had3DOnBottomScreen = false;
 #define PARSE_BRIGHTNESS_FOR_BLACK_BACKGROUND(b) (b & (1 << 14) ? ((b - 1) & 0xF) : 0)
 #define PARSE_BRIGHTNESS_FOR_UNKNOWN_BACKGROUND(b) (b & (1 << 14) ? ((b - 1) & 0xF) : (b & (1 << 15) ? (0xF - ((b - 1) & 0xF)) : 0))
 
+#define renderer3D_OpenGL        1
+#define renderer3D_OpenGLCompute 2
+
 enum
 {
     gameScene_Intro,              // 0
@@ -94,10 +98,10 @@ void KHReCodedPlugin::hudRefresh(melonDS::NDS* nds)
 {
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetShowMap(ShowMap);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetShowMap(ShowMap);
             break;
         default: break;
@@ -175,11 +179,11 @@ bool KHReCodedPlugin::shouldSkipFrame(melonDS::NDS* nds)
 
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetIsBottomScreen2DTextureBlack(isBottomBlack);
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetIsTopScreen2DTextureBlack(isTopBlack);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetIsBottomScreen2DTextureBlack(isBottomBlack);
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetIsTopScreen2DTextureBlack(isTopBlack);
             break;
@@ -434,6 +438,17 @@ void KHReCodedPlugin::setAspectRatio(melonDS::NDS* nds, float aspectRatio)
     if (nds->ARM7Read32(aspectRatioMenuAddress) == 0x00001555) {
         nds->ARM7Write32(aspectRatioMenuAddress, aspectRatioKey);
     }
+
+    switch (videoRenderer)
+    {
+        case renderer3D_OpenGL:
+            static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetAspectRatio(aspectRatio / (4.f / 3.f));
+            break;
+        case renderer3D_OpenGLCompute:
+            static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetAspectRatio(aspectRatio / (4.f / 3.f));
+            break;
+        default: break;
+    }
 }
 
 bool KHReCodedPlugin::setGameScene(melonDS::NDS* nds, int newGameScene)
@@ -451,10 +466,10 @@ bool KHReCodedPlugin::setGameScene(melonDS::NDS* nds, int newGameScene)
     // Updating GameScene inside shader
     switch (videoRenderer)
     {
-        case 1:
+        case renderer3D_OpenGL:
             static_cast<GLRenderer&>(nds->GPU.GetRenderer3D()).SetGameScene(newGameScene);
             break;
-        case 2:
+        case renderer3D_OpenGLCompute:
             static_cast<ComputeRenderer&>(nds->GPU.GetRenderer3D()).SetGameScene(newGameScene);
             break;
         default: break;

diff --git a/src/frontend/qt_sdl/Screen.cpp b/src/frontend/qt_sdl/Screen.cpp
@@ -124,19 +124,6 @@ void ScreenPanel::setupScreenLayout()
 
     Config::WindowHeight = h;
     Config::WindowWidth = w;
-
-    if (emuThread != nullptr && emuThread->NDS != nullptr) {
-        switch (videoRenderer)
-        {
-            case renderer3D_OpenGL:
-                static_cast<GLRenderer&>(emuThread->NDS->GPU.GetRenderer3D()).SetAspectRatio(aspectTop);
-                break;
-            case renderer3D_OpenGLCompute:
-                static_cast<ComputeRenderer&>(emuThread->NDS->GPU.GetRenderer3D()).SetAspectRatio(aspectTop);
-                break;
-            default: break;
-        }
-    }
 }
 
 QSize ScreenPanel::screenGetMinSize(int factor = 1)