Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 14:15:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove magic numbers

Browse source
This commit is contained in:
offtkp 2023-11-28 21:11:58 +02:00
parent 7c9d17f5ca
commit a40e74a15d
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
View file

@ -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";

14
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
View file

@ -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);
}