teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-25 13:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Copy appropriate config file based on HMD type

Browse source 
this allows for a different r_gamma value on the Pico 4
This commit is contained in:
Simon 2022-12-14 19:28:37 +00:00
parent 9bda989514
commit f12753967c
4 changed files with 210 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

189
assets/openjo_sp_pico.cfg Normal file
View file

@ -0,0 +1,189 @@
// generated by OpenJK SP, do not modify
unbindall
bind "SHIFT" "+speed"
bind "CTRL" "+use"
bind "ALT" "+altattack"
bind "TAB" "datapad"
bind "ENTER" "invuse"
bind "KP_PGDN" "use_seeker"
bind "KP_LEFTARROW" "use_lightamp_goggles"
bind "KP_5" "use_sentry"
bind "F1" "force_throw"
bind "F2" "force_pull"
bind "F3" "force_speed"
bind "F4" "force_distract"
bind "SPACE" "+moveup"
bind "," "+moveleft"
bind "-" "weapon 0"
bind "." "+moveright"
bind "/" "+mlook"
bind "0" "weapon 10"
bind "1" "weapon 1"
bind "2" "weapon 2"
bind "3" "weapon 3"
bind "4" "weapon 4"
bind "5" "weapon 5"
bind "6" "weapon 6"
bind "7" "weapon 7"
bind "8" "weapon 8"
bind "9" "weapon 9"
bind "A" "+moveleft"
bind "B" "use_bacta"
bind "C" "+movedown"
bind "D" "+moveright"
bind "E" "+use"
bind "F" "+useforce"
bind "G" "zoom"
bind "L" "saberAttackCycle"
bind "M" "datapad"
bind "P" "cg_thirdperson !"
bind "Q" "weapprev"
bind "R" "weapnext"
bind "S" "+back"
bind "V" "+strafe"
bind "W" "+forward"
bind "X" "forcenext"
bind "Z" "forceprev"
bind "[" "invprev"
bind "\" "weapongrabbed"
bind "]" "invnext"
bind "`" "toggleconsole"
bind "~" "toggleconsole"
bind "F5" "force_heal"
bind "F6" "+force_grip"
bind "F7" "+force_lightning"
bind "MWHEELUP" "weapprev"
bind "MWHEELDOWN" "weapnext"
bind "MOUSE1" "+attack"
bind "MOUSE2" "+altattack"
bind "PGUP" "+lookup"
bind "F9" "load quik"
bind "F10" "uimenu ingameloadmenu"
bind "F11" "uimenu ingamesavemenu"
bind "F12" "save quik*"
bind "END" "centerview"
bind "PGDN" "+lookdown"
bind "MOUSE3" "zoom"
bind "UPARROW" "+forward"
bind "DOWNARROW" "+back"
bind "LEFTARROW" "+left"
bind "RIGHTARROW" "+right"
seta cg_autoswitch "1"
seta cg_bobpitch "0.002"
seta cg_bobroll "0.002"
seta cg_bobup "0.0"
seta cg_crosshairForceHint "1"
seta cg_crosshairIdentifyTarget "1"
seta cg_crosshairSize "18"
seta cg_crosshairX "0"
seta cg_crosshairY "0"
seta cg_draw2D "1"
seta cg_drawAmmoWarning "1"
seta cg_drawCrosshair "4"
seta cg_drawCrosshairForce "4"
seta cg_drawFPS "0"
seta cg_drawGun "1"
seta cg_drawSnapshot "0"
seta cg_drawStatus "1"
seta cg_drawTimer "0"
seta cg_dynamicCrosshair "1"
seta cg_forceSpeedFOVAdjust "1"
seta cg_fov "80"
seta cg_fovAspectAdjust "0"
seta cg_fovViewModel "0"
seta cg_fovViewmodelAdjust "1"
seta cg_gunAutoFirst "1"
seta cg_heightAdjust "0.0"
seta cg_hudFiles "ui/jk2hud.txt"
seta cg_marks "1"
seta cg_missionInfoCentered "1"
seta cg_reliableAnimSounds "1"
seta cg_runpitch "0.002"
seta cg_runroll "0.005"
seta cg_saberAutoThird "0"
seta cg_shadows "1"
seta cg_simpleItems "0"
seta cg_stereoSeparation "0.065"
seta cg_thirdPersonRange "80"
seta cg_worldScale "33.5"
seta cg_zProj "64"
seta cl_consoleKeys "~ ` 0x7e 0x60 0xb2"
seta cl_consoleUseScanCode "1"
seta cl_renderer "rd-gles-jo"
seta com_maxfps "125"
seta d_slowmodeath "4"
seta expanded_menu_enabled "0"
seta g_dismemberment "3"
seta g_dismemberprobabilities "100"
seta g_saberAnimSpeed "1.300000"
seta g_saberAutoAim "1"
seta g_saberAutoBlocking "1"
seta g_saberAutoDeflect1stPerson "0"
seta g_saberMoveSpeed "1"
seta g_saberRealisticCombat "1"
seta g_spskill "1"
seta g_subtitles "0"
seta r_centerWindow "0"
seta r_customheight "1024"
seta r_customwidth "1600"
seta r_dynamiclight "1"
seta r_fullscreen "0"
seta r_mode "4"
seta r_modelpoolmegs "20"
seta r_noborder "0"
seta r_picmip "0"
seta r_textureMode "GL_LINEAR_MIPMAP_LINEAR"
seta r_vertexLight "0"
seta r_gamma "1.3"
seta r_intensity "1.07"
seta r_ignorehwgamma "1"
seta s_initsound "1"
seta s_khz "44"
seta s_language "english"
seta s_mixPreStep "0.05"
seta s_mixahead "0.2"
seta s_mp3overhead "31776"
seta s_musicvolume "0.25"
seta s_separation "0.5"
seta s_soundpoolmegs "25"
seta s_volume "0.5"
seta s_volumeVoice "1.0"
seta se_language "english"
seta sensitivity "5"
seta sex "male"
seta sp_language "0"
seta ui_PrecacheModels "1"
seta ui_iscensored "0"
seta ui_menuFiles "ui/menus.txt"
seta ui_r_glCustom "4"
seta ui_screenshotType "jpg"
seta vr_control_scheme "0"
seta vr_immersive_cinematics "1"
seta vr_positional_factor "12"
seta vr_screen_dist "3.500000"
seta vr_switch_sticks "0"
seta vr_turn_angle "45"
seta vr_turn_mode "0"
seta vr_two_handed_weapons "1"
seta vr_virtual_stock "0"
seta vr_walkdirection "1"
seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
seta vr_weapon_adjustment_10 "1.624,-3.042,6.823,-9.175,24.600,0.000,-26.400"
seta vr_weapon_adjustment_11 "0.998,-5.711,9.158,-9.740,29.900,0.000,-15.200"
seta vr_weapon_adjustment_12 "1.424,-2.107,6.236,-8.006,29.900,0.000,-23.100"
seta vr_weapon_adjustment_13 "1.000,-6.500,9.240,-12.680,15.300,0.000,0.000"
seta vr_weapon_adjustment_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40"
seta vr_weapon_adjustment_18 "0.510,-8.235,10.706,-3.922,-5.600,0.400,0.000"
seta vr_weapon_adjustment_19 "0.43,-8.97,13.22,-21.68,-4.80,-4.50,-0.40"
seta vr_weapon_adjustment_2 "0.952,-3.908,4.874,-9.349,0.000,0.000,0.000"
seta vr_weapon_adjustment_20 "0.44,-13.55,12.79,-26.06,0.30,-1.40,-0.40"
seta vr_weapon_adjustment_22 "0.64,-12.59,12.94,-20.44,11.30,26.60,-3.40"
seta vr_weapon_adjustment_3 "0.884,-4.140,7.036,-10.204,-0.000,0.000,0.000"
seta vr_weapon_adjustment_4 "0.844,-3.555,9.526,-3.246,0.000,0.000,0.000"
seta vr_weapon_adjustment_5 "1.500,-2.747,5.707,-7.827,1.800,0.000,0.000"
seta vr_weapon_adjustment_6 "0.700,-4.029,10.714,-6.771,0.000,0.000,0.000"
seta vr_weapon_adjustment_7 "0.844,-4.787,9.526,-9.550,0.000,0.000,0.000"
seta vr_weapon_adjustment_8 "1.000,-4.780,8.240,-10.440,0.000,0.000,0.000"
seta vr_weapon_adjustment_9 "1.100,-4.036,7.309,-7.836,0.000,0.000,0.000"
seta vr_weapon_pitchadjust "-20.0"
seta vr_weapon_velocity_trigger "2"

0
assets/openjo_sp.cfg → assets/openjo_sp_quest.cfg
View file

BIN
assets/z_vr_assets.pk3
View file

Binary file not shown.

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

@ -211,7 +211,14 @@ import java.util.Vector;
copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true); copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true);
//Bummser's default configuration //Bummser's default configuration
copy_asset("/sdcard/JKQuest/JK2/base", "openjo_sp.cfg", false); String model = android.os.Build.MODEL;
if (model.contains("Quest")) {
//Meta Quest
copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
} else {
//Pico XR
copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
}
//Read these from a file and pass through //Read these from a file and pass through
commandLineParams = new String("jo"); commandLineParams = new String("jo");
@ -259,6 +266,18 @@ 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) {
File f = new File(path + "/" + name);
if (!f.exists() || force) {
//Ensure we have an appropriate folder
String fullname = path + "/" + name;
String directory = fullname.substring(0, fullname.lastIndexOf("/"));
new File(directory).mkdirs();
_copy_asset(name, path + "/" + name_out);
}
}
public void copy_asset(String path, String name, boolean force) { public void copy_asset(String path, String name, boolean force) {
File f = new File(path + "/" + name); File f = new File(path + "/" + name);
if (!f.exists() || force) { if (!f.exists() || force) {