teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-22 20:11:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menu update

Browse source
This commit is contained in:
Petr Bartos 2022-04-09 16:30:30 +02:00
parent bef1e32a2c
commit aa7108be8c
8 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/app/src/main/cpp/code/q3_ui/ui_comfort.c
View file

@ -62,7 +62,7 @@ typedef struct {
menuslider_s heightadjust;
menuradiobutton_s rollhit;
menuslider_s hapticintensity;
menulist_s huddepth;
menuslider_s huddepth;
menuslider_s hudyoffset;
menubitmap_s back;
@ -104,7 +104,7 @@ static void Comfort_MenuEvent( void* ptr, int notification ) {
break;
case ID_HUDDEPTH:
trap_Cvar_SetValue( "vr_hudDepth", s_comfort.huddepth.curvalue );
trap_Cvar_SetValue( "vr_hudDepth", ((int)s_comfort.huddepth.curvalue % NUM_HUDDEPTH));
break;
case ID_HUDYOFFSET:
@ -120,17 +120,6 @@ static void Comfort_MenuEvent( void* ptr, int notification ) {
static void Comfort_MenuInit( void ) {
int y;
static const char *s_hud_depths[] =
{
"Very Close",
"Close",
"Middle",
"Further",
"Far",
"Distant",
NULL
};
memset( &s_comfort, 0 ,sizeof(comfort_t) );
Comfort_Cache();
@ -204,22 +193,22 @@ static void Comfort_MenuInit( void ) {
s_comfort.hapticintensity.maxvalue = 1.0;
y += BIGCHAR_HEIGHT+2;
s_comfort.huddepth.generic.type = MTYPE_SPINCONTROL;
s_comfort.huddepth.generic.type = MTYPE_SLIDER;
s_comfort.huddepth.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_comfort.huddepth.generic.x = VR_X_POS;
s_comfort.huddepth.generic.y = y;
s_comfort.huddepth.generic.name = "HUD Depth:";
s_comfort.huddepth.generic.callback = Comfort_MenuEvent;
s_comfort.huddepth.generic.id = ID_HUDDEPTH;
s_comfort.huddepth.itemnames = s_hud_depths;
s_comfort.huddepth.numitems = NUM_HUDDEPTH;
s_comfort.huddepth.minvalue = 0;
s_comfort.huddepth.maxvalue = 5;
y += BIGCHAR_HEIGHT+2;
s_comfort.hudyoffset.generic.type = MTYPE_SLIDER;
s_comfort.hudyoffset.generic.x = VR_X_POS;
s_comfort.hudyoffset.generic.y = y;
s_comfort.hudyoffset.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_comfort.hudyoffset.generic.name = "HUD Y Offset:";
s_comfort.hudyoffset.generic.name = "HUD Vertical Position:";
s_comfort.hudyoffset.generic.id = ID_HUDYOFFSET;
s_comfort.hudyoffset.generic.callback = Comfort_MenuEvent;
s_comfort.hudyoffset.minvalue = 0;

4
android/app/src/main/cpp/code/q3_ui/ui_controls3.c
View file

@ -240,8 +240,8 @@ static void Controls3_MenuInit( void ) {
static const char *s_weaponselectormode[] =
{
"Controller Based",
"HMD/Thumbstick Based",
"VR Style / Pointing",
"Classic / Thumbstick",
NULL
};

2
android/app/src/main/cpp/code/q3_ui/ui_preferences.c
View file

@ -91,7 +91,7 @@ static const char *hud_names[] =
{
"Off",
"Floating",
"Simple",
"Fixed to View",
NULL
};

7
android/app/src/main/pakQ3Q/ui/comfort.menu
View file

@ -99,10 +99,9 @@ itemDef {
itemDef {
name comfort
group grpComfort
type ITEM_TYPE_MULTI
type ITEM_TYPE_SLIDER
text "HUD Depth:"
cvar "vr_hudDepth"
cvarFloatList { "Very Close" 0 "Close" 1 "Middle" 2 "Further" 3 "Far" 4 "Distant" 5 }
cvarfloat "vr_hudDepth" 1 0 5
rect 99 250 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
@ -116,7 +115,7 @@ itemDef {
name comfort
group grpComfort
type ITEM_TYPE_SLIDER
text "HUD Y Offset:"
text "HUD Vertical Position:"
cvarfloat "vr_hudYOffset" 20 -200 200
rect 99 275 256 20
textalign ITEM_ALIGN_RIGHT

2
android/app/src/main/pakQ3Q/ui/controls3.menu
View file

@ -180,7 +180,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "Weapon Wheel Mode:"
cvar "vr_weaponSelectorMode"
cvarFloatList { "Controller Based" 0 "HMD/Thumbstick Based" 1 }
cvarFloatList { "VR Style / Pointing" 0 "Classic / Thumbstick" 1 }
rect 99 300 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128

9
android/app/src/main/pakQ3Q/ui/ingame_controls.menu
View file

@ -302,7 +302,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "Weapon Wheel Mode:"
cvar "vr_weaponSelectorMode"
cvarFloatList { "Controller Based" 0 "HMD/Thumbstick Based" 1 }
cvarFloatList { "VR Style / Pointing" 0 "Classic / Thumbstick" 1 }
rect 30 182 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
@ -402,10 +402,9 @@ itemDef {
itemDef {
name controls
group grpControls
type ITEM_TYPE_MULTI
type ITEM_TYPE_SLIDER
text "HUD Depth:"
cvar "vr_hudDepth"
cvarFloatList { "Very Close" 0 "Close" 1 "Middle" 2 "Further" 3 "Far" 4 "Distant" 5 }
cvarfloat "vr_hudDepth" 1 0 5
rect 30 331 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
@ -418,7 +417,7 @@ itemDef {
name controls
group grpControls
type ITEM_TYPE_SLIDER
text "HUD Y Offset:"
text "HUD Vertical Position:"
cvarfloat "vr_hudYOffset" 20 -200 200
rect 30 351 200 20
textalign ITEM_ALIGN_RIGHT

2
android/app/src/main/pakQ3Q/ui/ingame_options.menu
View file

@ -385,7 +385,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "HUD Mode:"
cvar "vr_hudDrawStatus"
cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 }
cvarFloatList { "Off" 0 "Floating" 1 "Fixed to View" 2 }
rect 50 275 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143

2
android/app/src/main/pakQ3Q/ui/options.menu
View file

@ -266,7 +266,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "HUD Mode:"
cvar "vr_hudDrawStatus"
cvarFloatList { "Off" 0 "Floating" 1 "Simple" 2 }
cvarFloatList { "Off" 0 "Floating" 1 "Fixed to View" 2 }
rect 99 315 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128