From 7cc87f9fe394e7b375c88324ddf052094cae42a2 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Mon, 14 Mar 2022 17:37:00 +0100 Subject: [PATCH] Weapon selector tweaks --- android/app/src/main/assets/pakQ3Q.pk3 | Bin 324969 -> 325043 bytes android/app/src/main/cpp/code/cgame/cg_draw.c | 19 ++-- .../app/src/main/cpp/code/cgame/cg_weapons.c | 3 +- .../src/main/cpp/code/q3_ui/ui_preferences.c | 21 ++++- android/app/src/main/cpp/code/vr/vr_base.c | 2 + .../src/main/pakQ3Q/ui/ingame_options.menu | 85 ++++++++++-------- android/app/src/main/pakQ3Q/ui/options.menu | 21 ++++- 7 files changed, 101 insertions(+), 50 deletions(-) diff --git a/android/app/src/main/assets/pakQ3Q.pk3 b/android/app/src/main/assets/pakQ3Q.pk3 index e5be0a80a47b8768dedfa99db59566f1713b0070..318acbcd89da01d3f8e12c5e09f0d96cbae99a40 100644 GIT binary patch delta 2653 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 LLIxn?1ONa4;{WO5 delta 2538 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 A_y7O^ diff --git a/android/app/src/main/cpp/code/cgame/cg_draw.c b/android/app/src/main/cpp/code/cgame/cg_draw.c index 276bf4bf..f12b5223 100644 --- a/android/app/src/main/cpp/code/cgame/cg_draw.c +++ b/android/app/src/main/cpp/code/cgame/cg_draw.c @@ -2618,9 +2618,9 @@ static void CG_DrawVignette( void ) if (currentComfortVignetteValue > 0.0f && currentComfortVignetteValue <= 1.0f && !(vr->weapon_zoomed)) { - int x = (int)(0 + currentComfortVignetteValue * cg.refdef.width / 3); + int x = (int)(0 + currentComfortVignetteValue * cg.refdef.width / 3.5f); int w = (int)(cg.refdef.width - 2 * x); - int y = (int)(0 + currentComfortVignetteValue * cg.refdef.height / 3); + int y = (int)(0 + currentComfortVignetteValue * cg.refdef.height / 3.5f); int h = (int)(cg.refdef.height - 2 * y); // sides @@ -2678,6 +2678,11 @@ static void CG_Draw2D(stereoFrame_t stereoFrame) CG_DrawVignette(); + // If weapon selector is active, check whether draw HUD + if (cg.weaponSelectorTime != 0 && trap_Cvar_VariableValue("vr_weaponSelectorWithHud") == 0) { + return; + } + #ifdef MISSIONPACK if ( cg_drawStatus.integer ) { Menu_PaintAll(); @@ -2841,13 +2846,9 @@ void CG_DrawActive( stereoFrame_t stereoView ) { VectorCopy( baseOrg, cg.refdef.vieworg ); - //Don't draw HUD whilst selecting the weapon with the holster (it gets in the way) - if (cg.weaponSelectorTime == 0) - { - // draw status bar and other floating elements - hudStereoView = stereoView; - CG_Draw2D(hudStereoView); - } + // draw status bar and other floating elements + hudStereoView = stereoView; + CG_Draw2D(hudStereoView); } diff --git a/android/app/src/main/cpp/code/cgame/cg_weapons.c b/android/app/src/main/cpp/code/cgame/cg_weapons.c index 529c8d0b..a6589243 100644 --- a/android/app/src/main/cpp/code/cgame/cg_weapons.c +++ b/android/app/src/main/cpp/code/cgame/cg_weapons.c @@ -2087,7 +2087,8 @@ void CG_DrawWeaponSelector( void ) } else { - VectorMA(holsterOrigin, -3.0f, holsterUp, holsterOrigin); + // Do not shift weapon wheel down in order to fit inside comfort vignette + //VectorMA(holsterOrigin, -3.0f, holsterUp, holsterOrigin); } VectorCopy(holsterOrigin, beamOrigin); diff --git a/android/app/src/main/cpp/code/q3_ui/ui_preferences.c b/android/app/src/main/cpp/code/q3_ui/ui_preferences.c index bdc9c8be..92e2c88a 100644 --- a/android/app/src/main/cpp/code/q3_ui/ui_preferences.c +++ b/android/app/src/main/cpp/code/q3_ui/ui_preferences.c @@ -55,7 +55,8 @@ GAME OPTIONS MENU #define ID_HOLSTER2D 140 #define ID_GORE 141 #define ID_SHOWINHAND 142 -#define ID_BACK 143 +#define ID_SELECTORWITHHUD 143 +#define ID_BACK 144 #define NUM_CROSSHAIRS 10 #define NUM_GORE 4 @@ -84,6 +85,7 @@ typedef struct { menuradiobutton_s holster2d; menulist_s gore; menuradiobutton_s showinhand; + menuradiobutton_s selectorwithhud; menubitmap_s back; qhandle_t crosshairShader[NUM_CROSSHAIRS]; @@ -133,6 +135,7 @@ static void Preferences_SetMenuItems( void ) { s_preferences.gore.curvalue = level % NUM_GORE; } s_preferences.showinhand.curvalue = trap_Cvar_VariableValue( "vr_showItemInHand" ) != 0; + s_preferences.selectorwithhud.curvalue = trap_Cvar_VariableValue( "vr_weaponSelectorWithHud" ) != 0; } @@ -232,6 +235,10 @@ static void Preferences_Event( void* ptr, int notification ) { trap_Cvar_SetValue( "vr_showItemInHand", s_preferences.showinhand.curvalue); break; + case ID_SELECTORWITHHUD: + trap_Cvar_SetValue( "vr_weaponSelectorWithHud", s_preferences.selectorwithhud.curvalue); + break; + case ID_BACK: UI_PopMenu(); break; @@ -321,7 +328,7 @@ static void Preferences_MenuInit( void ) { s_preferences.framer.width = 256; s_preferences.framer.height = 334; - y = 110; + y = 92; s_preferences.crosshair.generic.type = MTYPE_SPINCONTROL; s_preferences.crosshair.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT|QMF_NODEFAULTINIT|QMF_OWNERDRAW; s_preferences.crosshair.generic.x = PREFERENCES_X_POS; @@ -454,6 +461,15 @@ static void Preferences_MenuInit( void ) { s_preferences.drawhud.generic.x = PREFERENCES_X_POS; s_preferences.drawhud.generic.y = y; + y += BIGCHAR_HEIGHT+2; + s_preferences.selectorwithhud.generic.type = MTYPE_RADIOBUTTON; + s_preferences.selectorwithhud.generic.name = "Draw HUD On Weapon Selector:"; + s_preferences.selectorwithhud.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT; + s_preferences.selectorwithhud.generic.callback = Preferences_Event; + s_preferences.selectorwithhud.generic.id = ID_SELECTORWITHHUD; + s_preferences.selectorwithhud.generic.x = PREFERENCES_X_POS; + s_preferences.selectorwithhud.generic.y = y; + // y += BIGCHAR_HEIGHT+2; // s_preferences.allowdownload.generic.type = MTYPE_RADIOBUTTON; // s_preferences.allowdownload.generic.name = "Automatic Downloading:"; @@ -505,6 +521,7 @@ static void Preferences_MenuInit( void ) { // Menu_AddItem( &s_preferences.menu, &s_preferences.allowdownload ); Menu_AddItem( &s_preferences.menu, &s_preferences.gore ); Menu_AddItem( &s_preferences.menu, &s_preferences.showinhand ); + Menu_AddItem( &s_preferences.menu, &s_preferences.selectorwithhud ); Menu_AddItem( &s_preferences.menu, &s_preferences.back ); diff --git a/android/app/src/main/cpp/code/vr/vr_base.c b/android/app/src/main/cpp/code/vr/vr_base.c index 378a474e..2af8ab18 100644 --- a/android/app/src/main/cpp/code/vr/vr_base.c +++ b/android/app/src/main/cpp/code/vr/vr_base.c @@ -37,6 +37,7 @@ cvar_t *vr_lasersight = NULL; cvar_t *vr_hapticIntensity = NULL; cvar_t *vr_comfortVignette = NULL; cvar_t *vr_weaponSelectorMode = NULL; +cvar_t *vr_weaponSelectorWithHud = NULL; engine_t* VR_Init( ovrJava java ) { @@ -75,6 +76,7 @@ void VR_InitCvars( void ) vr_hapticIntensity = Cvar_Get ("vr_hapticIntensity", "1.0", CVAR_ARCHIVE); vr_comfortVignette = Cvar_Get ("vr_comfortVignette", "0.0", CVAR_ARCHIVE); vr_weaponSelectorMode = Cvar_Get ("vr_weaponSelectorMode", "0", CVAR_ARCHIVE); + vr_weaponSelectorWithHud = Cvar_Get ("vr_weaponSelectorWithHud", "0", CVAR_ARCHIVE); // Values are: scale,right,up,forward,pitch,yaw,roll // VALUES PROVIDED BY SkillFur - Thank-you! diff --git a/android/app/src/main/pakQ3Q/ui/ingame_options.menu b/android/app/src/main/pakQ3Q/ui/ingame_options.menu index 1c004c54..ca98c4fe 100755 --- a/android/app/src/main/pakQ3Q/ui/ingame_options.menu +++ b/android/app/src/main/pakQ3Q/ui/ingame_options.menu @@ -8,7 +8,7 @@ menuDef { visible 0 fullscreen 0 outOfBoundsClick // this closes the window if it gets a click out of the rectangle - rect 225 30 290 375 + rect 195 30 350 375 focusColor 1 .75 0 1 style 1 border 1 @@ -16,7 +16,7 @@ menuDef { itemDef { name window - rect 10 15 280 360 + rect 10 15 340 360 style 1 backcolor 0 .1 0 1 visible 1 @@ -36,7 +36,7 @@ itemDef { } itemDef { name window - rect 64 10 52 8 + rect 34 10 102 8 style 3 background "ui/assets/ingametop.tga" visible 1 @@ -44,7 +44,7 @@ itemDef { } itemDef { name window - rect 184 10 52 8 + rect 218 10 82 8 style 3 background "ui/assets/ingametop.tga" visible 1 @@ -53,7 +53,7 @@ itemDef { itemDef { name window - rect 237 10 64 64 + rect 297 10 64 64 style 3 background "ui/assets/ingamerightcorner.tga" visible 1 @@ -61,7 +61,7 @@ itemDef { } itemDef { name window - rect 114 0 73 16 + rect 144 0 73 16 style 3 background "ui/assets/ingameconnection.tga" visible 1 @@ -77,7 +77,7 @@ itemDef { } itemDef { name window - rect 237 314 64 64 + rect 297 314 64 64 style 3 background "ui/assets/ingamerightcornerb.tga" visible 1 @@ -114,7 +114,7 @@ itemDef { itemDef { name window - rect 285 64 16 84 + rect 345 64 16 84 style 3 background "ui/assets/ingameright.tga" visible 1 @@ -124,7 +124,7 @@ itemDef { itemDef { name window - rect 285 148 16 84 + rect 345 148 16 84 style 3 background "ui/assets/ingameright.tga" visible 1 @@ -132,7 +132,7 @@ itemDef { } itemDef { name window - rect 285 232 16 84 + rect 345 232 16 84 style 3 background "ui/assets/ingameright.tga" visible 1 @@ -142,7 +142,7 @@ itemDef { itemDef { name window - rect 64 370 104 8 + rect 34 370 134 8 style 3 background "ui/assets/ingamebottom.tga" visible 1 @@ -150,7 +150,7 @@ itemDef { } itemDef { name window - rect 168 370 104 8 + rect 198 370 134 8 style 3 background "ui/assets/ingamebottom.tga" visible 1 @@ -164,9 +164,9 @@ itemDef { group grpOptions text "Crosshair:" ownerdraw UI_CROSSHAIR - rect 173 20 20 17 + rect 193 20 20 17 textalign ITEM_ALIGN_RIGHT - textalignx 0 + textalignx 0 textaligny 17 textscale .25 forecolor 1 1 1 1 @@ -179,7 +179,7 @@ itemDef { type ITEM_TYPE_YESNO text "Laser Sight:" cvar "vr_lasersight" - rect 30 37 200 20 + rect 50 37 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -193,7 +193,7 @@ itemDef { type ITEM_TYPE_YESNO text "Simple Items (World):" cvar "cg_simpleItems" - rect 30 54 200 20 + rect 50 54 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -208,7 +208,7 @@ itemDef { type ITEM_TYPE_YESNO text "Simple Items (Holster):" cvar "cg_weaponSelectorSimple2DIcons" - rect 30 71 200 20 + rect 50 71 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -223,7 +223,7 @@ itemDef { type ITEM_TYPE_YESNO text "Show Item In Hand:" cvar "vr_showItemInHand" - rect 30 88 200 20 + rect 50 88 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -238,7 +238,7 @@ itemDef { type ITEM_TYPE_YESNO text "Marks On Walls:" cvar "cg_marks" - rect 30 105 200 20 + rect 50 105 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -253,7 +253,7 @@ itemDef { type ITEM_TYPE_YESNO text "Show Floating Scores:" cvar "cg_scorePlums" - rect 30 122 200 20 + rect 50 122 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -269,7 +269,7 @@ itemDef { type ITEM_TYPE_MULTI cvar "cg_brassTime" cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 } - rect 30 139 200 20 + rect 50 139 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -284,7 +284,7 @@ itemDef { type ITEM_TYPE_YESNO text "Identify Target:" cvar "cg_drawCrosshairNames" - rect 30 156 200 20 + rect 50 156 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -299,7 +299,7 @@ itemDef { type ITEM_TYPE_YESNO text "Low Quality Sky:" cvar "r_fastsky" - rect 30 173 200 20 + rect 50 173 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -314,7 +314,7 @@ itemDef { type ITEM_TYPE_YESNO text "Force Player Models:" cvar "cg_forceModel" - rect 30 190 200 20 + rect 50 190 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -328,7 +328,7 @@ itemDef { type ITEM_TYPE_YESNO text "Draw Team Overlay:" cvar "cg_drawTeamOverlay" - rect 30 207 200 20 + rect 50 207 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -342,7 +342,7 @@ itemDef { type ITEM_TYPE_YESNO text "Show Time:" cvar "cg_drawTimer" - rect 30 224 200 20 + rect 50 224 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -356,7 +356,7 @@ itemDef { type ITEM_TYPE_YESNO text "Taunts Off:" cvar "cg_noTaunt" - rect 30 241 200 20 + rect 50 241 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -370,7 +370,7 @@ itemDef { type ITEM_TYPE_YESNO text "In Game Video:" cvar "r_inGameVideo" - rect 30 258 200 20 + rect 50 258 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -385,22 +385,37 @@ itemDef { text "Statusbar:" cvar "cg_hudfiles" cvarStrList { Normal "ui/hud.txt" Small "ui/hud2.txt" } - rect 30 275 200 20 + rect 50 275 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 - textscale .25 + textscale .25 forecolor 1 1 1 1 - visible 1 + visible 1 } +itemDef { + name options + group grpOptions + type ITEM_TYPE_YESNO + text "Statusbar On Weapon Selector:" + cvar "vr_weaponSelectorWithHud" + rect 50 292 200 20 + textalign ITEM_ALIGN_RIGHT + textalignx 143 + textaligny 17 + textscale .25 + forecolor 1 1 1 1 + visible 1 + } + itemDef { name options group grpOptions type ITEM_TYPE_YESNO text "Blood:" cvar "com_blood" - rect 30 292 200 20 + rect 50 309 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -415,7 +430,7 @@ itemDef { type ITEM_TYPE_YESNO text "Gibs:" cvar "cg_gibs" - rect 30 309 200 20 + rect 50 326 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 @@ -429,9 +444,9 @@ itemDef { name options group grpOptions type ITEM_TYPE_YESNO - text "Extra Gibs (Perf. Hit):" + text "Extra Gibs (Performance Hit):" cvar "cg_megagibs" - rect 30 326 200 20 + rect 50 343 200 20 textalign ITEM_ALIGN_RIGHT textalignx 143 textaligny 17 diff --git a/android/app/src/main/pakQ3Q/ui/options.menu b/android/app/src/main/pakQ3Q/ui/options.menu index 2d62438b..4edd398a 100755 --- a/android/app/src/main/pakQ3Q/ui/options.menu +++ b/android/app/src/main/pakQ3Q/ui/options.menu @@ -275,13 +275,28 @@ itemDef { visible 1 } +itemDef { + name options + group grpOptions + type ITEM_TYPE_YESNO + text "Statusbar On Weapon Selector:" + cvar "vr_weaponSelectorWithHud" + rect 99 335 256 20 + textalign ITEM_ALIGN_RIGHT + textalignx 128 + textaligny 20 + textscale .3 + forecolor 1 1 1 1 + visible 1 + } + itemDef { name options group grpOptions type ITEM_TYPE_YESNO text "Blood:" cvar "com_blood" - rect 99 345 256 20 + rect 99 365 256 20 textalign ITEM_ALIGN_RIGHT textalignx 128 textaligny 20 @@ -296,7 +311,7 @@ itemDef { type ITEM_TYPE_YESNO text "Gibs:" cvar "cg_gibs" - rect 99 365 256 20 + rect 99 385 256 20 textalign ITEM_ALIGN_RIGHT textalignx 128 textaligny 20 @@ -311,7 +326,7 @@ itemDef { type ITEM_TYPE_YESNO text "Extra Gibs (Performance Hit):" cvar "cg_megagibs" - rect 99 385 256 20 + rect 99 405 256 20 textalign ITEM_ALIGN_RIGHT textalignx 128 textaligny 20