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

Revert "Move Speed selector on offhand radial quick menu"

Browse source 
This reverts commit bc964e2ee0.
This commit is contained in:
Simon 2023-11-02 21:48:19 +00:00
parent 4c3613c754
commit 25987a5fb7
4 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Projects/Android/jni/OpenJK/JKXR/VrInputDefault.cpp
View file

@ -471,6 +471,21 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
} }
} }
//Switch movement speed
{
static bool switched = false;
if (between(-0.2f, primaryJoystickX, 0.2f) &&
between(0.8f, pPrimaryJoystick->y, 1.0f)) {
if (!switched) {
vr.move_speed = (++vr.move_speed) % 3;
switched = true;
}
}
else {
switched = false;
}
}
/* /*
//Parameter Changer //Parameter Changer
static bool changed = false; static bool changed = false;

32
Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
View file

@ -2952,16 +2952,13 @@ void CG_ItemSelectorSelect_f( void )
cg.forcepowerSelectTime = cg.time; cg.forcepowerSelectTime = cg.time;
cg.forcepowerSelect = cg.itemSelectorSelection; cg.forcepowerSelect = cg.itemSelectorSelection;
} }
else if (cg.itemSelectorType == ST_QUICK_MENU) { else if (cg.itemSelectorType == ST_QUICK_SAVE) {
if (cg.itemSelectorSelection == 0) { if (cg.itemSelectorSelection == 0) {
cgi_SendConsoleCommand("save quick\n"); cgi_SendConsoleCommand("save quick\n");
CG_CenterPrint("Quick Saved", 240); CG_CenterPrint("Quick Saved", 240);
} else if (cg.itemSelectorSelection == 1) { } else {
cgi_SendConsoleCommand("load quick\n"); cgi_SendConsoleCommand("load quick\n");
} }
else {
vr->move_speed = (++vr->move_speed) % 3;
}
} }
//reset ready for next time //reset ready for next time
@ -2972,7 +2969,7 @@ void CG_ItemSelectorNext_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER;
return; return;
} }
@ -2989,7 +2986,7 @@ void CG_ItemSelectorPrev_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER;
return; return;
} }
@ -3123,8 +3120,8 @@ void CG_DrawItemSelector( void )
sRGB[1] = 0.0f; sRGB[1] = 0.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
count = 3; count = 2;
sRGB[0] = 1.0f; sRGB[0] = 1.0f;
sRGB[1] = 1.0f; sRGB[1] = 1.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
@ -3255,7 +3252,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
selectable = ForcePower_Valid(itemId); selectable = ForcePower_Valid(itemId);
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
selectable = true; selectable = true;
break; break;
} }
@ -3342,19 +3339,8 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
sprite.customShader = force_icons[showPowers[itemId]]; sprite.customShader = force_icons[showPowers[itemId]];
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
switch (itemId) sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad;
{
case 0:
sprite.customShader = cgs.media.iconSave;
break;
case 1:
sprite.customShader = cgs.media.iconLoad;
break;
case 2:
sprite.customShader = cgs.media.iconMoveSpeed[(vr->move_speed+1)%3];
break;
}
break; break;
} }

2
Projects/Android/jni/OpenJK/code/qcommon/q_shared.h
View file

@ -769,7 +769,7 @@ typedef enum
ST_GADGET, ST_GADGET,
ST_FIGHTING_STYLE, ST_FIGHTING_STYLE,
ST_FORCE_POWER, ST_FORCE_POWER,
ST_QUICK_MENU ST_QUICK_SAVE
} selectorType_t; } selectorType_t;
typedef enum typedef enum

32
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View file

@ -2775,16 +2775,13 @@ void CG_ItemSelectorSelect_f( void )
cg.forcepowerSelectTime = cg.time; cg.forcepowerSelectTime = cg.time;
cg.forcepowerSelect = cg.itemSelectorSelection; cg.forcepowerSelect = cg.itemSelectorSelection;
} }
else if (cg.itemSelectorType == ST_QUICK_MENU) { else if (cg.itemSelectorType == ST_QUICK_SAVE) {
if (cg.itemSelectorSelection == 0) { if (cg.itemSelectorSelection == 0) {
cgi_SendConsoleCommand("save quik*\n"); cgi_SendConsoleCommand("save quik*\n");
CG_CenterPrint("Quick Saved", 240); CG_CenterPrint("Quick Saved", 240);
} else if (cg.itemSelectorSelection == 1) { } else {
cgi_SendConsoleCommand("load quik\n"); cgi_SendConsoleCommand("load quik\n");
} }
else {
vr->move_speed = (++vr->move_speed) % 3;
}
} }
//reset ready for next time //reset ready for next time
@ -2795,7 +2792,7 @@ void CG_ItemSelectorNext_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER;
return; return;
} }
@ -2812,7 +2809,7 @@ void CG_ItemSelectorPrev_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER;
return; return;
} }
@ -2941,8 +2938,8 @@ void CG_DrawItemSelector( void )
sRGB[1] = 0.0f; sRGB[1] = 0.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
count = 3; count = 2;
sRGB[0] = 1.0f; sRGB[0] = 1.0f;
sRGB[1] = 1.0f; sRGB[1] = 1.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
@ -3071,7 +3068,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
selectable = ForcePower_Valid(itemId); selectable = ForcePower_Valid(itemId);
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
selectable = true; selectable = true;
break; break;
} }
@ -3158,19 +3155,8 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
sprite.customShader = force_icons[showPowers[itemId]]; sprite.customShader = force_icons[showPowers[itemId]];
break; break;
case ST_QUICK_MENU: case ST_QUICK_SAVE:
switch (itemId) sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad;
{
case 0:
sprite.customShader = cgs.media.iconSave;
break;
case 1:
sprite.customShader = cgs.media.iconLoad;
break;
case 2:
sprite.customShader = cgs.media.iconMoveSpeed[(vr->move_speed + 1) % 3];
break;
}
break; break;
} }