Merge pull request #82 from ag-advania/Zection_dev_noTouchPlz

Zection dev no touch plz
ag-advania · Dec 12, 2024 · 437c82b · 437c82b
2 parents 168bbb8 + 0ae2c0e
commit 437c82b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/src/frontend/qt_sdl/Config.cpp b/src/frontend/qt_sdl/Config.cpp
@@ -54,7 +54,7 @@ DefaultList<int> DefaultInts =
     {"Instance*.Window*.Width", 256},
     {"Instance*.Window*.Height", 384},
     {"Screen.VSyncInterval", 1},
-    {"3D.Renderer", renderer3D_Software}, // melonPrimeDS. renderer3D_Software  renderer3D_OpenGL  renderer3D_OpenGLCompute:
+    {"3D.Renderer", renderer3D_OpenGLCompute}, // melonPrimeDS. renderer3D_Software  renderer3D_OpenGL  renderer3D_OpenGLCompute:
     {"3D.GL.ScaleFactor", 4}, // melonPrimeDS. 8 is too much 4 is enough
 #ifdef JIT_ENABLED
     {"JIT.MaxBlockSize", 32},

diff --git a/src/frontend/qt_sdl/EmuThread.cpp b/src/frontend/qt_sdl/EmuThread.cpp
@@ -1097,6 +1097,7 @@ void EmuThread::run()
 
         // MelonPrimeDS Functions START
 
+        emuInstance->setVSyncGL(false); // MelonPrimeDS VsyncAlwaysOff
 
         // auto isFocused = emuInstance->getMainWindow()->panel->getFocused();
         bool isFocused = emuInstance->getMainWindow()->panel->getFocused();
@@ -1118,6 +1119,10 @@ void EmuThread::run()
                 // Set the initialization complete flag
                 hasInitialized = true;
 
+                // updateRenderer
+                videoRenderer = emuInstance->getGlobalConfig().GetInt("3D.Renderer");
+                updateRenderer();
+
                 // Hide cursor
                 showCursorOnMelonPrimeDS(false);
 
@@ -1660,6 +1665,9 @@ void EmuThread::run()
                         showCursorOnMelonPrimeDS(true);
                     }
 
+                    videoRenderer = renderer3D_Software;
+                    updateRenderer();
+
                     if (emuInstance->isTouching) {
                         emuInstance->nds->TouchScreen(emuInstance->touchX, emuInstance->touchY);
                     }
@@ -1762,6 +1770,12 @@ void EmuThread::handleMessages()
                 emuInstance->audioEnable();
                 emit windowEmuPause(false);
                 emuInstance->osdAddMessage(0, "Resumed");
+
+                // MelonPrimeDS {
+                // applyVideoSettings Immediately when resumed
+                videoRenderer = emuInstance->getGlobalConfig().GetInt("3D.Renderer");
+                updateRenderer();
+                // MelonPrimeDS }
             }
             break;
 

diff --git a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
@@ -2335,16 +2335,15 @@
 				    </widget>
 			    </item>
 
-			    <item row="3" column="0">
-				    <!-- Label for metroidSetVideoQuality -->
-				    <widget class="QLabel" name="metroidSetVideoQualityLabel">
-					    <property name="text">
-						    <string>Restarting melonPrimeDS required:</string>
-					    </property>
-				    </widget>
-			    </item>
-
-
+				<!-- SnapTap -->
+				<item row="3" column="0">
+					<widget class="QCheckBox" name="cbMetroidEnableSnapTap">
+						<property name="text">
+							<string>Enable SnapTap (Faster directional switching for smooth strafing)</string>
+						</property>
+					</widget>
+				</item>
+
 			    <!-- Low quality -->
 			    <item row="4" column="0">
 				    <widget class="QPushButton" name="metroidSetVideoQualityToLow">
@@ -2358,7 +2357,7 @@
 			    <item row="5" column="0">
 				    <widget class="QPushButton" name="metroidSetVideoQualityToHigh">
 					    <property name="text">
-						    <string>Video quality: High (Excellent in-game graphics, but menus flicker)</string>
+						    <string>Video quality: High (Lower Performance, Menu flickering)</string>
 					    </property>
 				    </widget>
 			    </item>
@@ -2367,19 +2366,11 @@
 				<item row="6" column="0">
 					<widget class="QPushButton" name="metroidSetVideoQualityToHigh2">
 						<property name="text">
-							<string>Video quality: High2 (Excellent in-game graphics, but menus flicker) (Fast but unstable)</string>
+							<string>Video quality: High2 (Recommended. Best Performance, Menu flickering, Minor Visual Glitches) </string>
 						</property>
 					</widget>
 				</item>
 
-				<!-- SnapTap -->
-				<item row="7" column="0">
-					<widget class="QCheckBox" name="cbMetroidEnableSnapTap">
-						<property name="text">
-							<string>Enable SnapTap</string>
-						</property>
-					</widget>
-				</item>
 
 			</layout>
 	    </widget>