RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: input: fix PS Vita gyro axis mapping and add gyro debug visualization

Browse Source
This commit is contained in:
Владислав Сухов
2026-05-21 18:03:16 +00:00
committed by a1batross
parent 074bd8b2b3
commit e4600b5fe0
3 changed files with 117 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/client/cl_view.c
View File

@@ -554,6 +554,7 @@ void V_PostRender( void )
SCR_DrawNetGraph();
SCR_DrawUserCmd();
Joy_DrawDebug();
IN_GyroDrawDebug();
SV_DrawOrthoTriangles();
CL_DrawDemoRecording();
CL_DrawHUD( CL_CHANGELEVEL );

1
engine/client/input.h
View File

@@ -43,6 +43,7 @@ void IN_GyroInit( void );
void IN_GyroCheckAvailability( void );
void IN_GyroEvent( vec3_t data );
void IN_GyroFinalizeMove( float *fw, float *side, float *dpitch, float *dyaw );
void IN_GyroDrawDebug( void );
uint IN_CollectInputDevices( void );
void IN_LockInputDevices( qboolean lock );

135
engine/client/input/in_gyro.c
View File

@@ -25,9 +25,11 @@ static CVAR_DEFINE_AUTO( gyro_roll, "0.0", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "bu
static CVAR_DEFINE_AUTO( gyro_pitch_deadzone, "0.5", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "built-in gyroscope pitch axis deadzone (deg/s)" );
static CVAR_DEFINE_AUTO( gyro_yaw_deadzone, "0.5", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "built-in gyroscope yaw axis deadzone (deg/s)" );
static CVAR_DEFINE_AUTO( gyro_roll_deadzone, "0.5", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "built-in gyroscope roll axis deadzone (deg/s)" );
static CVAR_DEFINE_AUTO( gyro_debug, "0", 0, "visualize built-in device gyroscope" );
// stores the latest instantaneous rotation rates from built-in gyroscope
static vec3_t gyro_speed;
static vec3_t gyro_speed_display;
/*
==============
@@ -45,6 +47,7 @@ void IN_GyroInit( void )
Cvar_RegisterVariable( &gyro_pitch_deadzone );
Cvar_RegisterVariable( &gyro_yaw_deadzone );
Cvar_RegisterVariable( &gyro_roll_deadzone );
Cvar_RegisterVariable( &gyro_debug );
}
/*
@@ -79,6 +82,28 @@ void IN_GyroEvent( vec3_t data )
VectorCopy( data, gyro_speed );
}
static void IN_GyroMap( const vec3_t src, vec3_t dst )
{
float orient_scale = 1.0f;
platform_orientation_t orient = Platform_GetDisplayOrientation();
if( orient == ORIENTATION_LANDSCAPE_FLIPPED )
orient_scale = -1.0f;
#if XASH_ANDROID || XASH_IOS
// In Landscape mode axes are swapped relative to natural (Portrait) orientation
// Y axis rotation becomes Pitch (up/down)
// X axis rotation becomes Yaw (left/right)
dst[0] = -orient_scale * src[1] * ( 180.0f / M_PI );
dst[1] = orient_scale * src[0] * ( 180.0f / M_PI );
dst[2] = orient_scale * src[2] * ( 180.0f / M_PI );
#else
dst[0] = orient_scale * src[0] * ( 180.0f / M_PI );
dst[1] = orient_scale * src[1] * ( 180.0f / M_PI );
dst[2] = orient_scale * src[2] * ( 180.0f / M_PI );
#endif
}
/*
=============
IN_GyroFinalizeMove
@@ -88,32 +113,102 @@ Apply gyro movement to view angles
*/
void IN_GyroFinalizeMove( float *fw, float *side, float *dpitch, float *dyaw )
{
float orient_scale = 1.0f;
vec3_t mapped_speed;
if( !gyro_enable.value || !gyro_available.value )
return;
platform_orientation_t orient = Platform_GetDisplayOrientation();
if( orient == ORIENTATION_LANDSCAPE_FLIPPED )
orient_scale = -1.0f;
IN_GyroMap( gyro_speed, mapped_speed );
VectorCopy( mapped_speed, gyro_speed_display );
// In Landscape mode axes are swapped relative to natural (Portrait) orientation
// Y axis rotation becomes Pitch (up/down)
// X axis rotation becomes Yaw (left/right)
float pitch_speed = -orient_scale * gyro_speed[1] * ( 180.0f / M_PI );
float yaw_speed = orient_scale * gyro_speed[0] * ( 180.0f / M_PI );
float roll_speed = orient_scale * gyro_speed[2] * ( 180.0f / M_PI );
if( fabs( mapped_speed[0] ) < gyro_pitch_deadzone.value )
mapped_speed[0] = 0.0f;
if( fabs( mapped_speed[1] ) < gyro_yaw_deadzone.value )
mapped_speed[1] = 0.0f;
if( fabs( mapped_speed[2] ) < gyro_roll_deadzone.value )
mapped_speed[2] = 0.0f;
if( fabs( pitch_speed ) < gyro_pitch_deadzone.value )
pitch_speed = 0.0f;
if( fabs( yaw_speed ) < gyro_yaw_deadzone.value )
yaw_speed = 0.0f;
if( fabs( roll_speed ) < gyro_roll_deadzone.value )
roll_speed = 0.0f;
*dpitch -= gyro_pitch.value * pitch_speed * host.realframetime;
*dyaw += gyro_yaw.value * yaw_speed * host.realframetime;
*dyaw += gyro_roll.value * roll_speed * host.realframetime;
*dpitch -= gyro_pitch.value * mapped_speed[0] * host.realframetime;
*dyaw += gyro_yaw.value * mapped_speed[1] * host.realframetime;
*dyaw += gyro_roll.value * mapped_speed[2] * host.realframetime;
VectorClear( gyro_speed );
}
void IN_GyroDrawDebug( void )
{
cl_font_t *font = Con_GetCurFont();
if( !gyro_debug.value || !gyro_available.value )
return;
float x = 8;
float y = 100;
const float bar_w = 100;
const float halfbar_w = bar_w * 0.5f;
const float bar_h = font->charHeight - 2;
const float center = x + halfbar_w;
platform_orientation_t orient = Platform_GetDisplayOrientation();
const char *orient_name = "UNKNOWN";
switch( orient )
{
case ORIENTATION_LANDSCAPE:
orient_name = "LANDSCAPE";
break;
case ORIENTATION_LANDSCAPE_FLIPPED:
orient_name = "LANDSCAPE FLIPPED";
break;
case ORIENTATION_PORTRAIT:
orient_name = "PORTRAIT";
break;
case ORIENTATION_PORTRAIT_FLIPPED:
orient_name = "PORTRAIT FLIPPED";
break;
default:
orient_name = "UNKNOWN";
break;
}
char orient_text[32];
Q_snprintf( orient_text, sizeof( orient_text ), "ORIENT: %s", orient_name );
const rgba_t bar_backcolor = { 40, 40, 40, 180 };
const rgba_t bar_fillcolor = { 100, 200, 100, 200 };
static const char *gyronames[3] = { "GYRO P", "GYRO Y", "GYRO R" };
static const convar_t *const gyro_deadzone[3] =
{
&gyro_pitch_deadzone,
&gyro_yaw_deadzone,
&gyro_roll_deadzone,
};
for( int i = 0; i < 3; i++ )
{
float fval = gyro_speed_display[i] / 180.0f;
fval = bound( -1.0f, fval, 1.0f );
CL_DrawString( x, y, gyronames[i], g_color_table[7], font, 0 );
y += font->charHeight;
ref.dllFuncs.FillRGBA( kRenderTransTexture, x, y, bar_w, bar_h, bar_backcolor[0], bar_backcolor[1], bar_backcolor[2], bar_backcolor[3] );
float filled = fval * halfbar_w;
ref.dllFuncs.FillRGBA( kRenderTransTexture, center + Q_min( 0, filled ), y, fabs( filled ), bar_h, bar_fillcolor[0], bar_fillcolor[1], bar_fillcolor[2], bar_fillcolor[3] );
float fthreshold = gyro_deadzone[i]->value / 180.0f;
fthreshold = bound( 0.0f, fthreshold, 1.0f );
if( fthreshold > 0.0f )
{
float thresh_x = fthreshold * halfbar_w;
ref.dllFuncs.FillRGBA( kRenderTransTexture, center - thresh_x, y, thresh_x * 2, bar_h, 180, 40, 40, 120 );
ref.dllFuncs.FillRGBA( kRenderTransTexture, center + thresh_x, y, 1, bar_h, 255, 200, 0, 220 );
ref.dllFuncs.FillRGBA( kRenderTransTexture, center - thresh_x, y, 1, bar_h, 255, 200, 0, 220 );
}
ref.dllFuncs.FillRGBA( kRenderTransTexture, center, y, 1, bar_h, 180, 180, 180, 220 );
y += bar_h + 2;
}
CL_DrawString( x, y, orient_text, g_color_table[1], font, 0 );
}