From bb0f5b1bf820b35f3a9a11781053b5768d274342 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Sun, 3 Dec 2023 15:52:07 +0100 Subject: [PATCH 1/2] r_lodCurveError added to menu; updated defaults --- .../jni/OpenJK/code/rd-gles/tr_init.cpp | 2 +- .../jni/OpenJK/code/rd-vanilla/tr_init.cpp | 2 +- z_vr_assets_jka/strings/english/menus_vr.str | 6 +++ z_vr_assets_jka/strings/french/menus_vr.str | 8 ++++ z_vr_assets_jka/strings/german/menus_vr.str | 8 ++++ z_vr_assets_jka/strings/spanish/menus_vr.str | 8 ++++ z_vr_assets_jka/ui/ingamesetup.menu | 42 +++++++++++++++++-- z_vr_assets_jka/ui/setup.menu | 42 +++++++++++++++++-- z_vr_assets_jko/strip/menus_vr.sp | 12 +++++- z_vr_assets_jko/ui/ingamesetup.menu | 42 +++++++++++++++++-- z_vr_assets_jko/ui/setup.menu | 42 +++++++++++++++++-- 11 files changed, 199 insertions(+), 15 deletions(-) diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_init.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_init.cpp index a5b0588..adbc117 100644 --- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_init.cpp +++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_init.cpp @@ -1613,7 +1613,7 @@ void R_Register( void ) // // archived variables that can change at any time // - r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "1000", CVAR_ARCHIVE_ND ); + r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND ); r_lodbias = ri.Cvar_Get( "r_lodbias", "-2", CVAR_ARCHIVE_ND ); #ifndef JK2_MODE r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE_ND ); diff --git a/Projects/Android/jni/OpenJK/code/rd-vanilla/tr_init.cpp b/Projects/Android/jni/OpenJK/code/rd-vanilla/tr_init.cpp index b13a448..f393046 100644 --- a/Projects/Android/jni/OpenJK/code/rd-vanilla/tr_init.cpp +++ b/Projects/Android/jni/OpenJK/code/rd-vanilla/tr_init.cpp @@ -1553,7 +1553,7 @@ void R_Register( void ) // // archived variables that can change at any time // - r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "5000", CVAR_ARCHIVE_ND ); + r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "1000", CVAR_ARCHIVE_ND ); r_lodbias = ri.Cvar_Get( "r_lodbias", "-2", CVAR_ARCHIVE_ND ); r_flares = ri.Cvar_Get ("r_flares", "1", CVAR_ARCHIVE_ND ); r_lodscale = ri.Cvar_Get( "r_lodscale", "10", CVAR_ARCHIVE_ND ); diff --git a/z_vr_assets_jka/strings/english/menus_vr.str b/z_vr_assets_jka/strings/english/menus_vr.str index f58807c..5ee699e 100644 --- a/z_vr_assets_jka/strings/english/menus_vr.str +++ b/z_vr_assets_jka/strings/english/menus_vr.str @@ -577,4 +577,10 @@ LANG_ENGLISH "Always Run:" REFERENCE ALWAYS_RUN_DESC LANG_ENGLISH "Always use maximum movement speed." +REFERENCE CURVES_DETAIL_ITEM +LANG_ENGLISH "Distant Curves Detail:" + +REFERENCE CURVES_DETAIL_DESC +LANG_ENGLISH "Configures how far away are curves approximated by edges." + ENDMARKER diff --git a/z_vr_assets_jka/strings/french/menus_vr.str b/z_vr_assets_jka/strings/french/menus_vr.str index 820aa66..a354049 100644 --- a/z_vr_assets_jka/strings/french/menus_vr.str +++ b/z_vr_assets_jka/strings/french/menus_vr.str @@ -765,4 +765,12 @@ REFERENCE ALWAYS_RUN_DESC LANG_ENGLISH "Always use maximum movement speed." LANG_FRENCH "#same" +REFERENCE CURVES_DETAIL_ITEM +LANG_ENGLISH "Distant Curves Detail:" +LANG_FRENCH "#same" + +REFERENCE CURVES_DETAIL_DESC +LANG_ENGLISH "Configures how far away are curves approximated by edges." +LANG_FRENCH "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/german/menus_vr.str b/z_vr_assets_jka/strings/german/menus_vr.str index 1537db0..15e2dc2 100644 --- a/z_vr_assets_jka/strings/german/menus_vr.str +++ b/z_vr_assets_jka/strings/german/menus_vr.str @@ -765,4 +765,12 @@ REFERENCE ALWAYS_RUN_DESC LANG_ENGLISH "Always use maximum movement speed." LANG_GERMAN "#same" +REFERENCE CURVES_DETAIL_ITEM +LANG_ENGLISH "Distant Curves Detail:" +LANG_GERMAN "#same" + +REFERENCE CURVES_DETAIL_DESC +LANG_ENGLISH "Configures how far away are curves approximated by edges." +LANG_GERMAN "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/spanish/menus_vr.str b/z_vr_assets_jka/strings/spanish/menus_vr.str index 4b67b95..74b7d74 100644 --- a/z_vr_assets_jka/strings/spanish/menus_vr.str +++ b/z_vr_assets_jka/strings/spanish/menus_vr.str @@ -765,4 +765,12 @@ REFERENCE ALWAYS_RUN_DESC LANG_ENGLISH "Always use maximum movement speed." LANG_SPANISH "#same" +REFERENCE CURVES_DETAIL_ITEM +LANG_ENGLISH "Distant Curves Detail:" +LANG_SPANISH "#same" + +REFERENCE CURVES_DETAIL_DESC +LANG_ENGLISH "Configures how far away are curves approximated by edges." +LANG_SPANISH "#same" + ENDMARKER diff --git a/z_vr_assets_jka/ui/ingamesetup.menu b/z_vr_assets_jka/ui/ingamesetup.menu index 854f782..f1d57bb 100644 --- a/z_vr_assets_jka/ui/ingamesetup.menu +++ b/z_vr_assets_jka/ui/ingamesetup.menu @@ -1218,13 +1218,49 @@ } } + itemDef + { + name curves_detail + group video + type ITEM_TYPE_MULTI + text @MENUS_VR_CURVES_DETAIL_ITEM + rect 260 272 340 14 + textalign ITEM_ALIGN_RIGHT + textalignx 174 + textaligny 0 + font 4 + textscale 1 + forecolor .615 .615 .956 1 + cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 } + descText @MENUS_VR_CURVES_DETAIL_DESC + cvar "r_lodCurveError" + + visible 0 + + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play "sound/interface/button1.wav" ; + uiScript glCustom ; + setcvar ui_r_modified 1 ; + show applyChanges + } + } + itemDef { name compress_textures group video_obsolete type ITEM_TYPE_MULTI text @MENUS_COMPRESSED_TEXTURES - rect 260 272 340 14 + rect 260 286 340 14 textalign ITEM_ALIGN_RIGHT textalignx 174 textaligny 0 @@ -1239,11 +1275,11 @@ mouseenter { - show highlight7 + show highlight8 } mouseexit { - hide highlight7 + hide highlight8 } action { diff --git a/z_vr_assets_jka/ui/setup.menu b/z_vr_assets_jka/ui/setup.menu index 809154d..83ba8ca 100644 --- a/z_vr_assets_jka/ui/setup.menu +++ b/z_vr_assets_jka/ui/setup.menu @@ -1225,13 +1225,49 @@ } } + itemDef + { + name curves_detail + group video + type ITEM_TYPE_MULTI + text @MENUS_VR_CURVES_DETAIL_ITEM + rect 260 272 340 14 + textalign ITEM_ALIGN_RIGHT + textalignx 174 + textaligny 0 + font 4 + textscale 1 + forecolor .615 .615 .956 1 + cvarFloatList { @MENUS_LOW 250 @MENUS_MEDIUM 500 @MENUS_HIGH 1000 } + descText @MENUS_VR_CURVES_DETAIL_DESC + cvar "r_lodCurveError" + + visible 0 + + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play "sound/interface/button1.wav" ; + uiScript glCustom ; + setcvar ui_r_modified 1 ; + show applyChanges + } + } + itemDef { name compress_textures group video_obsolete type ITEM_TYPE_MULTI text @MENUS_COMPRESSED_TEXTURES - rect 260 272 340 14 + rect 260 286 340 14 textalign ITEM_ALIGN_RIGHT textalignx 174 textaligny 0 @@ -1246,11 +1282,11 @@ mouseenter { - show highlight7 + show highlight8 } mouseexit { - hide highlight7 + hide highlight8 } action { diff --git a/z_vr_assets_jko/strip/menus_vr.sp b/z_vr_assets_jko/strip/menus_vr.sp index d544e5d..f7057f4 100644 --- a/z_vr_assets_jko/strip/menus_vr.sp +++ b/z_vr_assets_jko/strip/menus_vr.sp @@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg ID 100 REFERENCE MENUS_VR DESCRIPTION "VR Menu Localizations" -COUNT 173 +COUNT 175 INDEX 0 { REFERENCE COMMON_CONTROLS_ITEM @@ -869,3 +869,13 @@ INDEX 172 REFERENCE ALWAYS_RUN_DESC TEXT_LANGUAGE1 "Always use maximum movement speed." } +INDEX 173 +{ + REFERENCE CURVES_DETAIL_ITEM + TEXT_LANGUAGE1 "Distant Curves Detail:" +} +INDEX 174 +{ + REFERENCE CURVES_DETAIL_DESC + TEXT_LANGUAGE1 "Configures how far away are curves approximated by edges." +} diff --git a/z_vr_assets_jko/ui/ingamesetup.menu b/z_vr_assets_jko/ui/ingamesetup.menu index 2ea01d2..ce2aa4a 100644 --- a/z_vr_assets_jko/ui/ingamesetup.menu +++ b/z_vr_assets_jko/ui/ingamesetup.menu @@ -1422,13 +1422,49 @@ } } + itemDef + { + name curves_detail + group video + type ITEM_TYPE_MULTI + text @MENUS_VR_CURVES_DETAIL_ITEM + rect 305 291 300 20 + textalign ITEM_ALIGN_RIGHT + textalignx 165 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 } + descText @MENUS_VR_CURVES_DETAIL_DESC + cvar "r_lodCurveError" + + visible 0 + + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play "sound/interface/button1.wav" ; + uiScript glCustom ; + setcvar ui_r_modified 1 ; + show applyChanges + } + } + itemDef { name compress_textures group video_obsolete type ITEM_TYPE_MULTI text @MENUS0_COMPRESSED_TEXTURES - rect 305 291 300 20 + rect 305 311 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 textaligny -2 @@ -1443,11 +1479,11 @@ mouseenter { - show highlight7 + show highlight8 } mouseexit { - hide highlight7 + hide highlight8 } action { diff --git a/z_vr_assets_jko/ui/setup.menu b/z_vr_assets_jko/ui/setup.menu index 02472a4..344caf2 100644 --- a/z_vr_assets_jko/ui/setup.menu +++ b/z_vr_assets_jko/ui/setup.menu @@ -1521,13 +1521,49 @@ } } + itemDef + { + name curves_detail + group video + type ITEM_TYPE_MULTI + text @MENUS_VR_CURVES_DETAIL_ITEM + rect 305 291 300 20 + textalign ITEM_ALIGN_RIGHT + textalignx 165 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + cvarFloatList { @MENUS0_LOW 250 @MENUS0_MEDIUM 500 @MENUS0_HIGH 1000 } + descText @MENUS_VR_CURVES_DETAIL_DESC + cvar "r_lodCurveError" + + visible 0 + + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play "sound/interface/button1.wav" ; + uiScript glCustom ; + setcvar ui_r_modified 1 ; + show applyChanges + } + } + itemDef { name compress_textures group video_obsolete type ITEM_TYPE_MULTI text @MENUS0_COMPRESSED_TEXTURES - rect 305 291 300 20 + rect 305 311 300 20 textalign ITEM_ALIGN_RIGHT textalignx 165 textaligny -2 @@ -1542,11 +1578,11 @@ mouseenter { - show highlight7 + show highlight8 } mouseexit { - hide highlight7 + hide highlight8 } action { From 98bc53c9a3840460c38e6ff60afdafb5caf3f173 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Tue, 5 Dec 2023 21:32:15 +0100 Subject: [PATCH 2/2] Fix typo in hand model path --- Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp index 116de46..3fecd30 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp @@ -1451,7 +1451,7 @@ static void CG_RegisterGraphics( void ) { cgs.media.handModel_hm_a_force = cgi_R_RegisterModel( "models/players/jedi_hm/lhand_f_skin_a.md3" ); cgs.media.handModel_hm_b_relaxed = cgi_R_RegisterModel( "models/players/jedi_hm/lhand_r_skin_b.md3" ); cgs.media.handModel_hm_b_fist = cgi_R_RegisterModel( "models/players/jedi_hm/lhand_force_fisting_skin_b.md3" ); - cgs.media.handModel_hm_b_force = cgi_R_RegisterModel( "models/players/jedi_hm/lhand_f_skin_f.md3" ); + cgs.media.handModel_hm_b_force = cgi_R_RegisterModel( "models/players/jedi_hm/lhand_f_skin_b.md3" ); cgs.media.handModel_kdm_relaxed = cgi_R_RegisterModel( "models/players/jedi_kdm/lhand_r.md3" ); cgs.media.handModel_kdm_fist = cgi_R_RegisterModel( "models/players/jedi_kdm/lhand_force_fisting.md3" ); cgs.media.handModel_kdm_force = cgi_R_RegisterModel( "models/players/jedi_kdm/lhand_f.md3" );