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

Merge pull request #401 from wheremyfoodat/rdeepfired

Browse source 
Android: Toast when ROM fails to load
This commit is contained in:
wheremyfoodat 2024-02-10 16:49:19 +00:00 • committed by GitHub
commit f5d3cc9fbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/jni_driver.cpp
View file

@ -81,10 +81,12 @@ AlberFunction(void, Finalize)(JNIEnv* env, jobject obj) {
AlberFunction(jboolean, HasRomLoaded)(JNIEnv* env, jobject obj) { return romLoaded; }
AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
AlberFunction(jboolean, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
const char* pathStr = env->GetStringUTFChars(path, nullptr);
romLoaded = emulator->loadROM(pathStr);
env->ReleaseStringUTFChars(path, pathStr);
return romLoaded;
}
AlberFunction(void, LoadLuaScript)(JNIEnv* env, jobject obj, jstring script) {

4
src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
View file

@ -9,7 +9,7 @@ public class AlberDriver {
public static native void Initialize();
public static native void RunFrame(int fbo);
public static native boolean HasRomLoaded();
public static native void LoadRom(String path);
public static native boolean LoadRom(String path);
public static native void Finalize();
public static native void KeyDown(int code);
@ -25,4 +25,4 @@ public class AlberDriver {
public static native void setShaderJitEnabled(boolean enable);
static { System.loadLibrary("Alber"); }
}
}

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

@ -2,20 +2,23 @@ package com.panda3ds.pandroid.view;
import static android.opengl.GLES32.*;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect;
import android.opengl.GLSurfaceView;
import android.os.Handler;
import android.util.Log;
import android.widget.Toast;
import com.panda3ds.pandroid.AlberDriver;
import com.panda3ds.pandroid.data.SMDH;
import com.panda3ds.pandroid.data.config.GlobalConfig;
import com.panda3ds.pandroid.data.game.GameMetadata;
import com.panda3ds.pandroid.utils.Constants;
import com.panda3ds.pandroid.utils.GameUtils;
import com.panda3ds.pandroid.utils.PerformanceMonitor;
import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
import com.panda3ds.pandroid.view.renderer.layout.DefaultScreenLayout;
import com.panda3ds.pandroid.data.SMDH;
import com.panda3ds.pandroid.data.game.GameMetadata;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
@ -25,9 +28,11 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
private int screenWidth, screenHeight;
private int screenTexture;
public int screenFbo;
private final Context context;
PandaGlRenderer(String romPath) {
PandaGlRenderer(Context context, String romPath) {
super();
this.context = context;
this.romPath = romPath;
screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
@ -40,8 +45,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
if (screenTexture != 0) {
glDeleteTextures(1, new int[] {screenTexture}, 0);
}
if (screenFbo != 0) {
if (screenFbo != 0) {
glDeleteFramebuffers(1, new int[] {screenFbo}, 0);
}
@ -84,7 +89,29 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
AlberDriver.Initialize();
AlberDriver.setShaderJitEnabled(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT));
AlberDriver.LoadRom(romPath);
// If loading the ROM failed, display an error message and early exit
if (!AlberDriver.LoadRom(romPath)) {
// Get a handler that can be used to post to the main thread
Handler mainHandler = new Handler(context.getMainLooper());
Runnable runnable = new Runnable() {
@Override
public void run() {
Toast
.makeText(
context, "Failed to load ROM! Make sure it's a valid 3DS ROM and that storage permissions are configured properly.",
Toast.LENGTH_LONG
)
.show();
}
};
mainHandler.post(runnable);
GameMetadata game = GameUtils.getCurrentGame();
GameUtils.removeGame(game);
return;
}
// Load the SMDH
byte[] smdhData = AlberDriver.GetSmdh();
@ -93,12 +120,12 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
} else {
SMDH smdh = new SMDH(smdhData);
Log.i(Constants.LOG_TAG, "Loaded rom SDMH");
Log.i(Constants.LOG_TAG, String.format("Are you playing '%s' published by '%s'", smdh.getTitle(), smdh.getPublisher()));
Log.i(Constants.LOG_TAG, String.format("You are playing '%s' published by '%s'", smdh.getTitle(), smdh.getPublisher()));
GameMetadata game = GameUtils.getCurrentGame();
GameUtils.removeGame(game);
GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
}
PerformanceMonitor.initialize(getBackendName());
}
@ -150,4 +177,4 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
public String getBackendName() {
return "OpenGL";
}
}
}

2
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
View file

@ -21,7 +21,7 @@ public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNode
if (Debug.isDebuggerConnected()) {
setDebugFlags(DEBUG_LOG_GL_CALLS);
}
renderer = new PandaGlRenderer(romPath);
renderer = new PandaGlRenderer(getContext(), romPath);
setRenderer(renderer);
}