teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-21 19:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes to weapon selector

Browse source 
- Better angle selection for weapons (make use of 3/9/6 o'clock points)
- Smaller radius for the controller wheel, easier to select items
This commit is contained in:
Simon 2022-03-12 20:02:21 +00:00
parent e16f625db0
commit 123691503c
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest" package="com.drbeef.ioq3quest"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="31" android:versionCode="33"
android:versionName="0.21.2"> android:versionName="0.22.1">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" /> <uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>--> <!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->

29
android/app/src/main/cpp/code/cgame/cg_weapons.c
View file

@ -2058,19 +2058,17 @@ void CG_DrawWeaponSelector( void )
const int selectorMode = (int)trap_Cvar_VariableValue("vr_weaponSelectorMode"); const int selectorMode = (int)trap_Cvar_VariableValue("vr_weaponSelectorMode");
float DEPTH = 5.0f; float DEPTH = 5.0f;
float RAD = 5.0f; float RAD = 4.0f;
float SCALE = 0.05f;
if (selectorMode == WS_HMD) // HMD locked if (selectorMode == WS_HMD) // HMD locked
{ {
VectorCopy(vr->hmdorientation, cg.weaponSelectorAngles); VectorCopy(vr->hmdorientation, cg.weaponSelectorAngles);
VectorCopy(vr->hmdposition, cg.weaponSelectorOrigin); VectorCopy(vr->hmdposition, cg.weaponSelectorOrigin);
VectorClear(cg.weaponSelectorOffset); VectorClear(cg.weaponSelectorOffset);
DEPTH = 7.0f; DEPTH = 7.5f; // push a bit further away from the HMD origin
RAD = 4.0f;
} }
float SCALE = 0.05f;
const float SEP = 360.0f / (WP_NUM_WEAPONS - 2); // Exclude grappling hook
float frac = (cg.time - cg.weaponSelectorTime) / (20 * DEPTH); float frac = (cg.time - cg.weaponSelectorTime) / (20 * DEPTH);
if (frac > 1.0f) frac = 1.0f; if (frac > 1.0f) frac = 1.0f;
@ -2089,7 +2087,7 @@ void CG_DrawWeaponSelector( void )
} }
else else
{ {
VectorMA(holsterOrigin, -2.0f, holsterUp, holsterOrigin); VectorMA(holsterOrigin, -3.0f, holsterUp, holsterOrigin);
} }
VectorCopy(holsterOrigin, beamOrigin); VectorCopy(holsterOrigin, beamOrigin);
@ -2146,10 +2144,17 @@ void CG_DrawWeaponSelector( void )
} }
} }
#define IGNORE_ANGLE -999.0f
#ifdef MISSIONPACK
float rollAngles[WP_NUM_WEAPONS] = {IGNORE_ANGLE, 30.0f, 60.0f, 90.0f, 120.0f, 150.0f, 180.0f, 210.0f, 240.0f, 270.0f, IGNORE_ANGLE, 300.0f, 330.0f, 0.0f};
#else
float rollAngles[WP_NUM_WEAPONS] = {IGNORE_ANGLE, 18.0f, 54.0f, 90.0f, 135.0f, 180.0f, 225.0f, 270.0f, 306.0f, 342.0f, IGNORE_ANGLE};
#endif
qboolean selected = qfalse; qboolean selected = qfalse;
int w = 1; for (int c = 0; c < WP_NUM_WEAPONS-1; ++c)
for (int c = 0; c < WP_NUM_WEAPONS-2; ++c, ++w)
{ {
int w = c+1;
if (w == WP_GRAPPLING_HOOK) if (w == WP_GRAPPLING_HOOK)
{ {
continue; continue;
@ -2165,19 +2170,19 @@ void CG_DrawWeaponSelector( void )
VectorClear(angles); VectorClear(angles);
angles[YAW] = holsterAngles[YAW]; angles[YAW] = holsterAngles[YAW];
angles[PITCH] = holsterAngles[PITCH]; angles[PITCH] = holsterAngles[PITCH];
angles[ROLL] = AngleNormalize360((w * SEP)); angles[ROLL] = rollAngles[w];
vec3_t forward, up; vec3_t forward, up;
AngleVectors(angles, forward, NULL, up); AngleVectors(angles, forward, NULL, up);
VectorMA(holsterOrigin, (RAD*frac), up, iconOrigin); VectorMA(holsterOrigin, (RAD*frac), up, iconOrigin);
VectorMA(iconOrigin, 0.1f, forward, iconBackground); VectorMA(iconOrigin, 0.2f, forward, iconBackground);
VectorMA(iconOrigin, -0.1f, forward, iconForeground); VectorMA(iconOrigin, -0.2f, forward, iconForeground);
//Float sprite above selected weapon //Float sprite above selected weapon
vec3_t diff; vec3_t diff;
VectorSubtract(selectorOrigin, iconOrigin, diff); VectorSubtract(selectorOrigin, iconOrigin, diff);
float length = VectorLength(diff); float length = VectorLength(diff);
if (length <= 1.5f && if (length <= 1.2f &&
frac == 1.0f && frac == 1.0f &&
selectable) selectable)
{ {