From a40e74a15d08798ae045bae2b64324949b8e1ac3 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 21:11:58 +0200
Subject: [PATCH] Remove magic numbers

---
 .../com/panda3ds/pandroid/utils/Constants.java     |  3 ++-
 .../panda3ds/pandroid/view/PandaGlRenderer.java    | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 2e706530..14d5c398 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -19,7 +19,8 @@ public class Constants {
     public static final int INPUT_KEY_SELECT = 1 << 2;
 
     public static final int N3DS_WIDTH = 400;
-    public static final int N3DS_HEIGHT = 240;
+    public static final int N3DS_HALF_HEIGHT = 240;
+    public static final int N3DS_FULL_HEIGHT = 480;
 
     public static final String EXTRA_PATH = "path";
     public static final String LOG_TAG = "Alber";
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index e6adbd9f..0e1826d1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -79,15 +79,16 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
             Rect bottomScreen = displayLayout.getBottomDisplayBounds();
 
             glBlitFramebuffer(
-                    0, 480,
-                    400, 240,
+                    0, Constants.N3DS_FULL_HEIGHT,
+                    Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT,
                     topScreen.left, screenHeight - topScreen.top,
                     topScreen.right, screenHeight - topScreen.bottom,
                     GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
+            // Remove the black bars on the bottom screen
             glBlitFramebuffer(
-                    40, 240,
-                    360, 0,
+                    40, Constants.N3DS_HALF_HEIGHT,
+                    Constants.N3DS_WIDTH - 40, 0,
                     bottomScreen.left, screenHeight - bottomScreen.top,
                     bottomScreen.right, screenHeight - bottomScreen.bottom,
                     GL_COLOR_BUFFER_BIT, GL_LINEAR);
@@ -97,7 +98,6 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
     public void onSurfaceChanged(GL10 unused, int width, int height) {
         screenWidth = width;
         screenHeight = height;
-        glDisable(GL_SCISSOR_TEST);
 
         displayLayout.update(screenWidth, screenHeight);
     }
@@ -105,8 +105,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
     @Override
     public void setLayout(ConsoleLayout layout) {
         displayLayout = layout;
-        displayLayout.setTopDisplaySourceSize(400, 240);
-        displayLayout.setBottomDisplaySourceSize(320, 240);
+        displayLayout.setTopDisplaySourceSize(Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT);
+        displayLayout.setBottomDisplaySourceSize(Constants.N3DS_WIDTH - 40 - 40, Constants.N3DS_HALF_HEIGHT);
         displayLayout.update(screenWidth, screenHeight);
     }