teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DrBeef:master' into feature/turning-as-mappable-command

This commit is contained in:
petr666 2022-03-15 23:40:11 +01:00 committed by GitHub
parent a6b6046e74 b6896417cf
commit 4096dcd88c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 94 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2668,7 +2668,7 @@ Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
$(B)/$(BASEGAME)/ui$(SHLIBNAME): $(Q3UIOBJ)
$(echo_cmd) "LD $@"
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(CLIENT_LIBS)
$(B)/$(BASEGAME)/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
$(echo_cmd) "Q3ASM $@"

1
android/app/src/main/AndroidManifest.xml
View File

@ -5,6 +5,7 @@
android:versionCode="34"
android:versionName="0.23.0">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>
<uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->

72
android/app/src/main/cpp/code/cgame/cg_weapons.c
View File

@ -2097,9 +2097,9 @@ void CG_DrawWeaponSelector( void )
float thumbstickAxisX = 0.0f;
float thumbstickAxisY = 0.0f;
float a = atan2(vr->thumbstick_location[THUMB_RIGHT][0], vr->thumbstick_location[THUMB_RIGHT][1]);
if (length(vr->thumbstick_location[THUMB_RIGHT][0], vr->thumbstick_location[THUMB_RIGHT][1]) > 0.95f)
{
float a = atan2(vr->thumbstick_location[THUMB_RIGHT][0], vr->thumbstick_location[THUMB_RIGHT][1]);
thumbstickAxisX = sinf(a) * 0.95f;
thumbstickAxisY = cosf(a) * 0.95f;
}
@ -2150,22 +2150,24 @@ 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};
float iconAngles[WP_NUM_WEAPONS] = {0.0f, 30.0f, 60.0f, 90.0f, 120.0f, 150.0f, 180.0f, 210.0f, 240.0f, 270.0f, 300.0f, 330.0f, 360.0f, 390.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};
float iconAngles[WP_NUM_WEAPONS] = {0.0f, 30.0f, 60.0f, 90.0f, 135.0f, 180.0f, 225.0f, 270.0f, 315.0f, 360.0f, 390.0f};
#endif
qboolean selected = qfalse;
for (int c = 0; c < WP_NUM_WEAPONS-1; ++c)
int w = 0;
for (int index = 0; index < WP_NUM_WEAPONS-1; ++index)
{
int w = c+1;
if (w == WP_GRAPPLING_HOOK)
if ((index+1) == WP_GRAPPLING_HOOK)
{
continue;
}
//increment now we know we aren't looking at an invalid weapon id
++w;
CG_RegisterWeapon(w);
{
@ -2176,7 +2178,7 @@ void CG_DrawWeaponSelector( void )
VectorClear(angles);
angles[YAW] = holsterAngles[YAW];
angles[PITCH] = holsterAngles[PITCH];
angles[ROLL] = rollAngles[w];
angles[ROLL] = iconAngles[w];
vec3_t forward, up;
AngleVectors(angles, forward, NULL, up);
@ -2184,22 +2186,48 @@ void CG_DrawWeaponSelector( void )
VectorMA(iconOrigin, 0.2f, forward, iconBackground);
VectorMA(iconOrigin, -0.2f, forward, iconForeground);
//Float sprite above selected weapon
vec3_t diff;
VectorSubtract(selectorOrigin, iconOrigin, diff);
float length = VectorLength(diff);
if (length <= 1.2f &&
frac == 1.0f &&
selectable)
{
if (cg.weaponSelectorSelection != w)
if (selectorMode == WS_CONTROLLER)
{
vec3_t diff;
VectorSubtract(selectorOrigin, iconOrigin, diff);
float length = VectorLength(diff);
if (length <= 1.2f &&
frac == 1.0f &&
selectable)
{
cg.weaponSelectorSelection = w;
trap_HapticEvent("selector_icon", 0, 0, 100, 0, 0);
}
if (cg.weaponSelectorSelection != w)
{
cg.weaponSelectorSelection = w;
trap_HapticEvent("selector_icon", 0, 0, 100, 0, 0);
}
selected = qtrue;
}
selected = qtrue;
}
}
else
{
//For HMD selector, the weapon can be selected before the selector has finished
//its opening animation, use angles to identify the selected weapon, rather than
//the position of the selector pointer
float angle = AngleNormalize360(RAD2DEG(a));
float angle360 = angle + 360; // HACK - Account for the icon at the top
float low = ((iconAngles[w-1]+iconAngles[w])/2.0f);
float high = ((iconAngles[w]+iconAngles[w+1])/2.0f);
if (((angle > low && angle <= high) || (angle360 > low && angle360 <= high)) &&
(length(vr->thumbstick_location[THUMB_RIGHT][0], vr->thumbstick_location[THUMB_RIGHT][1]) > 0.5f) &&
selectable)
{
if (cg.weaponSelectorSelection != w)
{
cg.weaponSelectorSelection = w;
trap_HapticEvent("selector_icon", 0, 0, 100, 0, 0);
}
selected = qtrue;
}
}
if (cg.weaponSelectorSelection == w)
{

22
android/app/src/main/cpp/code/q3_ui/ui_players.c
View File

@ -591,6 +591,8 @@ static void UI_PlayerAngles( playerInfo_t *pi, vec3_t legs[3], vec3_t torso[3],
float dest;
float adjust;
pi->viewAngles[YAW] = AngleNormalize360(uis.realtime / 50.0f);
VectorCopy( pi->viewAngles, headAngles );
headAngles[YAW] = AngleMod( headAngles[YAW] );
VectorClear( legsAngles );
@ -705,6 +707,12 @@ float UI_MachinegunSpinAngle( playerInfo_t *pi ) {
return angle;
}
static void UI_ScaleModel(refEntity_t *ent)
{
VectorScale(ent->axis[1], 1.6f, ent->axis[1]);
VectorScale(ent->axis[2], 1.4f, ent->axis[2]);
ent->nonNormalizedAxes = qtrue;
}
/*
===============
@ -767,8 +775,8 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti
// calculate distance so the player nearly fills the box
len = 0.7 * ( maxs[2] - mins[2] );
origin[0] = len / tan( DEG2RAD(refdef.fov_x) * 0.5 );
origin[1] = 0.5 * ( mins[1] + maxs[1] );
origin[0] = len / tan( DEG2RAD(refdef.fov_x) * 0.5 ) - 15;
origin[1] = 0.5 * ( mins[1] + maxs[1] ) - 10;
origin[2] = -0.5 * ( mins[2] + maxs[2] );
refdef.time = dp_realtime;
@ -796,6 +804,10 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti
legs.renderfx = renderfx;
VectorCopy (legs.origin, legs.oldorigin);
UI_ScaleModel(&legs);
//UI_ScaleModel(&torso);
//UI_ScaleModel(&head);
trap_R_AddRefEntityToScene( &legs );
if (!legs.hModel) {
@ -852,7 +864,8 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti
VectorCopy( origin, gun.lightingOrigin );
UI_PositionEntityOnTag( &gun, &torso, pi->torsoModel, "tag_weapon");
gun.renderfx = renderfx;
trap_R_AddRefEntityToScene( &gun );
//UI_ScaleModel(&gun);
trap_R_AddRefEntityToScene( &gun );
}
//
@ -870,8 +883,9 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti
angles[PITCH] = 0;
angles[ROLL] = UI_MachinegunSpinAngle( pi );
AnglesToAxis( angles, barrel.axis );
//UI_ScaleModel(&barrel);
UI_PositionRotatedEntityOnTag( &barrel, &gun, pi->weaponModel, "tag_barrel");
UI_PositionRotatedEntityOnTag( &barrel, &gun, pi->weaponModel, "tag_barrel");
trap_R_AddRefEntityToScene( &barrel );
}

13
android/app/src/main/cpp/code/q3_ui/ui_qmenu.c
View File

@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Quake's menu framework system.
**********************************************************************/
#include "ui_local.h"
#include "SDL.h"
sfxHandle_t menu_in_sound;
sfxHandle_t menu_move_sound;
@ -1653,6 +1654,18 @@ sfxHandle_t Menu_DefaultKey( menuframework_s *m, int key )
case MTYPE_FIELD:
sound = MenuField_Key( (menufield_s*)item, &key );
#if __ANDROID__
//show virtual keyboard
menufield_s* m = (menufield_s*)item;
if ( key == 178 )
{
//delete value on click
sprintf( m->field.buffer, "" );
}
m->field.cursor = strlen( m->field.buffer );
SDL_StartTextInput();
#endif
break;
}

2
android/app/src/main/cpp/code/sdl/sdl_input.c
View File

@ -1246,8 +1246,6 @@ void IN_Init( void *windowData )
in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE|CVAR_LATCH );
in_joystickThreshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE );
SDL_StartTextInput( );
mouseAvailable = ( in_mouse->value != 0 );
IN_DeactivateMouse( Cvar_VariableIntegerValue( "r_fullscreen" ) != 0 );

6
android/app/src/main/cpp/code/vr/vr_input.c
View File

@ -452,7 +452,11 @@ static void IN_VRController( qboolean isRightController, ovrTracking remoteTrack
cl.snap.ps.pm_type == PM_INTERMISSION)
{
int mouse_multiplier = 10;
Com_QueueEvent(in_vrEventTime, SE_MOUSE, vr.weaponangles_delta[YAW] * mouse_multiplier, -vr.weaponangles_delta[PITCH] * mouse_multiplier, 0, NULL);
//ignore cursor jumping when e.g. showing keyboard
if ( ( fabs(vr.weaponangles_delta[ YAW ]) < 10 ) && ( fabs(vr.weaponangles_delta[ PITCH ]) < 10 ) )
{
Com_QueueEvent(in_vrEventTime, SE_MOUSE, vr.weaponangles_delta[YAW] * mouse_multiplier, -vr.weaponangles_delta[PITCH] * mouse_multiplier, 0, NULL);
}
}
} else {
vec3_t rotation = {0};

5
android/app/src/main/cpp/main.cpp
View File

@ -84,7 +84,8 @@ int main(int argc, char* argv[]) {
VR_EnterVR(engine, java);
while (1) {
SDL_Event event;
//Polling events here breaks sdl_input keyboard!
/*SDL_Event event;
while (SDL_PollEvent(&event)) {
LOGI("Received SDL Event: %d", event.type);
switch (event.type)
@ -97,7 +98,7 @@ int main(int argc, char* argv[]) {
VR_LeaveVR(engine);
break;
}
}
}*/
VR_DrawFrame(engine);
}

3
android/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -264,6 +264,9 @@ public class SDLActivity extends Activity {
if (SDLActivity.mBrokenLibraries) {
return;
}
if (mScreenKeyboardShown) {
return;
}
SDLActivity.mHasFocus = hasFocus;
if (hasFocus) {