-
-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/wheremyfoodat/Panda3DS
- Loading branch information
Showing
77 changed files
with
2,237 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| name: Android Build | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| pull_request: | ||
|
|
||
| env: | ||
| # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) | ||
| BUILD_TYPE: Release | ||
|
|
||
| jobs: | ||
| x64: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Fetch submodules | ||
| run: git submodule update --init --recursive | ||
|
|
||
| - name: Setup Vulkan SDK | ||
| uses: humbletim/[email protected] | ||
| with: | ||
| vulkan-query-version: latest | ||
| vulkan-use-cache: true | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'zulu' # See 'Supported distributions' for available options | ||
| java-version: '17' | ||
|
|
||
| - name: Configure CMake | ||
| run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DENABLE_VULKAN=0 | ||
|
|
||
| - name: Build | ||
| run: | | ||
| cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} | ||
| mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/x86_64/ | ||
| cd src/pandroid | ||
| ./gradlew assembleDebug | ||
| cd ../.. | ||
| - name: Upload executable | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: Android APK (x86-64) | ||
| path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk' | ||
|
|
||
| arm64: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Fetch submodules | ||
| run: git submodule update --init --recursive | ||
|
|
||
| - name: Setup Vulkan SDK | ||
| uses: humbletim/[email protected] | ||
| with: | ||
| vulkan-query-version: latest | ||
| vulkan-use-cache: true | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'zulu' # See 'Supported distributions' for available options | ||
| java-version: '17' | ||
|
|
||
| - name: Configure CMake | ||
| run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DCMAKE_CXX_FLAGS="-march=armv8.1-a+crypto" | ||
|
|
||
| - name: Build | ||
| run: | | ||
| cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} | ||
| mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/arm64-v8a/ | ||
| cd src/pandroid | ||
| ./gradlew assembleDebug | ||
| cd ../.. | ||
| - name: Upload executable | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: Android APK (arm64) | ||
| path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk' | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| #include "emulator.hpp" | ||
|
|
||
| #ifndef __ANDROID__ | ||
| #include <SDL_filesystem.h> | ||
| #endif | ||
|
|
||
| #include <fstream> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| #include <EGL/egl.h> | ||
| #include <android/log.h> | ||
| #include <jni.h> | ||
|
|
||
| #include <stdexcept> | ||
|
|
||
| #include "emulator.hpp" | ||
| #include "renderer_gl/renderer_gl.hpp" | ||
| #include "services/hid.hpp" | ||
|
|
||
| std::unique_ptr<Emulator> emulator = nullptr; | ||
| HIDService* hidService = nullptr; | ||
| RendererGL* renderer = nullptr; | ||
| bool romLoaded = false; | ||
|
|
||
| #define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name | ||
|
|
||
| void throwException(JNIEnv* env, const char* message) { | ||
| jclass exceptionClass = env->FindClass("java/lang/RuntimeException"); | ||
| env->ThrowNew(exceptionClass, message); | ||
| } | ||
|
|
||
| extern "C" { | ||
| AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) { | ||
| emulator = std::make_unique<Emulator>(); | ||
|
|
||
| if (emulator->getRendererType() != RendererType::OpenGL) { | ||
| return throwException(env, "Renderer type is not OpenGL"); | ||
| } | ||
|
|
||
| renderer = static_cast<RendererGL*>(emulator->getRenderer()); | ||
| hidService = &emulator->getServiceManager().getHID(); | ||
|
|
||
| if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(eglGetProcAddress))) { | ||
| return throwException(env, "Failed to load OpenGL ES 2.0"); | ||
| } | ||
|
|
||
| __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor); | ||
| emulator->initGraphicsContext(nullptr); | ||
| } | ||
|
|
||
| AlberFunction(void, RunFrame)(JNIEnv* env, jobject obj, jint fbo) { | ||
| renderer->setFBO(fbo); | ||
| // TODO: don't reset entire state manager | ||
| renderer->resetStateManager(); | ||
| emulator->runFrame(); | ||
|
|
||
| hidService->updateInputs(emulator->getTicks()); | ||
| } | ||
|
|
||
| AlberFunction(void, Finalize)(JNIEnv* env, jobject obj) { | ||
| emulator = nullptr; | ||
| hidService = nullptr; | ||
| renderer = nullptr; | ||
| } | ||
|
|
||
| AlberFunction(jboolean, HasRomLoaded)(JNIEnv* env, jobject obj) { return romLoaded; } | ||
|
|
||
| AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) { | ||
| const char* pathStr = env->GetStringUTFChars(path, nullptr); | ||
| romLoaded = emulator->loadROM(pathStr); | ||
| env->ReleaseStringUTFChars(path, pathStr); | ||
| } | ||
|
|
||
| AlberFunction(void, TouchScreenDown)(JNIEnv* env, jobject obj, jint x, jint y) { hidService->setTouchScreenPress((u16)x, (u16)y); } | ||
| AlberFunction(void, TouchScreenUp)(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); } | ||
| AlberFunction(void, KeyUp)(JNIEnv* env, jobject obj, jint keyCode) { hidService->releaseKey((u32)keyCode); } | ||
| AlberFunction(void, KeyDown)(JNIEnv* env, jobject obj, jint keyCode) { hidService->pressKey((u32)keyCode); } | ||
|
|
||
| AlberFunction(void, SetCirclepadAxis)(JNIEnv* env, jobject obj, jint x, jint y) { | ||
| hidService->setCirclepadX((s16)x); | ||
| hidService->setCirclepadY((s16)y); | ||
| } | ||
| } | ||
|
|
||
| #undef AlberFunction |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| *.iml | ||
| .gradle | ||
| /local.properties | ||
| /.idea/caches | ||
| /.idea/libraries | ||
| /.idea/modules.xml | ||
| /.idea/workspace.xml | ||
| /.idea/navEditor.xml | ||
| /.idea/assetWizardSettings.xml | ||
| .DS_Store | ||
| /build | ||
| /captures | ||
| .externalNativeBuild | ||
| .cxx | ||
| local.properties |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| plugins { | ||
| id("com.android.application") | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.panda3ds.pandroid" | ||
| compileSdk = 33 | ||
|
|
||
| defaultConfig { | ||
| applicationId = "com.panda3ds.pandroid" | ||
| minSdk = 24 | ||
| targetSdk = 33 | ||
| versionCode = 1 | ||
| versionName = "1.0" | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
|
|
||
| ndk { | ||
| abiFilters += listOf("x86_64", "arm64-v8a") | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = false | ||
| proguardFiles( | ||
| getDefaultProguardFile("proguard-android-optimize.txt"), | ||
| "proguard-rules.pro" | ||
| ) | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("androidx.appcompat:appcompat:1.6.1") | ||
| implementation("com.google.android.material:material:1.8.0") | ||
| implementation("androidx.constraintlayout:constraintlayout:2.1.4") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Add project specific ProGuard rules here. | ||
| # You can control the set of applied configuration files using the | ||
| # proguardFiles setting in build.gradle. | ||
| # | ||
| # For more details, see | ||
| # http://developer.android.com/guide/developing/tools/proguard.html | ||
|
|
||
| # If your project uses WebView with JS, uncomment the following | ||
| # and specify the fully qualified class name to the JavaScript interface | ||
| # class: | ||
| #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
| # public *; | ||
| #} | ||
|
|
||
| # Uncomment this to preserve the line number information for | ||
| # debugging stack traces. | ||
| #-keepattributes SourceFile,LineNumberTable | ||
|
|
||
| # If you keep the line number information, uncomment this to | ||
| # hide the original source file name. | ||
| #-renamesourcefileattribute SourceFile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools"> | ||
|
|
||
| <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" /> | ||
| <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/> | ||
|
|
||
| <uses-feature | ||
| android:required="true" | ||
| android:glEsVersion="0x0030001"/> | ||
|
|
||
| <application | ||
| android:requestLegacyExternalStorage="true" | ||
| android:allowBackup="true" | ||
| android:dataExtractionRules="@xml/data_extraction_rules" | ||
| android:fullBackupContent="@xml/backup_rules" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@mipmap/ic_launcher_round" | ||
| android:supportsRtl="true" | ||
| android:theme="@style/Theme.Pandroid" | ||
| tools:targetApi="31"> | ||
| <activity | ||
| android:name=".app.MainActivity" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <activity | ||
| android:name=".app.GameActivity" | ||
| android:configChanges="screenSize|screenLayout|orientation|density|uiMode"> | ||
| </activity> | ||
| </application> | ||
| </manifest> |
Oops, something went wrong.