teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-16 17:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix config overwrite issue

Browse source
This commit is contained in:
Simon 2022-12-17 19:44:14 +00:00
parent 48f75ba6a3
commit 14fe1a87d4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkquest" package="com.drbeef.jkquest"
android:versionCode="32" android:versionCode="33"
android:versionName="0.5.1" android:installLocation="auto" > android:versionName="0.5.2" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/> <uses-feature android:glEsVersion="0x00030002" android:required="true"/>

8
java/com/drbeef/jkquest/GLES3JNIActivity.java
View file

@ -212,10 +212,10 @@ import java.util.Vector;
String model = android.os.Build.MODEL; String model = android.os.Build.MODEL;
if (model.contains("Quest")) { if (model.contains("Quest")) {
//Meta Quest //Meta Quest
copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false); copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
} else { } else {
//Pico XR //Pico XR
copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false); copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
} }
//Bunch of cool mods and their credits - only copy if user wants them //Bunch of cool mods and their credits - only copy if user wants them
@ -274,8 +274,8 @@ import java.util.Vector;
mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams ); mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams );
} }
public void copy_asset_device_specific(String path, String name, String name_out, boolean force) { public void copy_asset_with_rename(String path, String name, String name_out, boolean force) {
File f = new File(path + "/" + name); File f = new File(path + "/" + name_out);
if (!f.exists() || force) { if (!f.exists() || force) {
//Ensure we have an appropriate folder //Ensure we have an appropriate folder