xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SIXENSE stuffs in ExtraMovementSample now.

Browse source
This commit is contained in:
Kamay Xutax 2024-09-16 01:47:53 +02:00
parent 278b7fd34c
commit ee294905f2
1 changed files with 12 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
game/client/in_main.cpp
View file

@ -1075,7 +1075,7 @@ void CInput::ExtraMovementSample( int number_of_ticks_this_frame, int current_co
engine->GetViewAngles( viewangles ); engine->GetViewAngles( viewangles );
// Set button and flag bits, don't blow away state // Set button and flag bits, don't blow away state
#ifdef SIXENSE #ifdef SIXENSE
if( g_pSixenseInput->IsEnabled() ) if( g_pSixenseInput->IsEnabled() )
{ {
// Some buttons were set in SixenseUpdateKeys, so or in any real keypresses // Some buttons were set in SixenseUpdateKeys, so or in any real keypresses
@ -1085,9 +1085,9 @@ void CInput::ExtraMovementSample( int number_of_ticks_this_frame, int current_co
{ {
cmd->buttons = GetButtonBits( 0 ); cmd->buttons = GetButtonBits( 0 );
} }
#else #else
cmd->buttons = GetButtonBits( 0 ); cmd->buttons = GetButtonBits( 0 );
#endif #endif
// Use new view angles if alive, otherwise user last angles we stored off. // Use new view angles if alive, otherwise user last angles we stored off.
if ( g_iAlive ) if ( g_iAlive )
@ -1104,7 +1104,16 @@ void CInput::ExtraMovementSample( int number_of_ticks_this_frame, int current_co
if ( g_pClientMode->CreateMove( frametime, cmd ) ) if ( g_pClientMode->CreateMove( frametime, cmd ) )
{ {
// Get current view angles after the client mode tweaks with it // Get current view angles after the client mode tweaks with it
#ifdef SIXENSE
// Only set the engine angles if sixense is not enabled. It is done in SixenseInput::SetView otherwise.
if ( !g_pSixenseInput->IsEnabled() )
{
engine->SetViewAngles( cmd->viewangles );
}
#else
engine->SetViewAngles( cmd->viewangles ); engine->SetViewAngles( cmd->viewangles );
#endif
prediction->SetLocalViewAngles( cmd->viewangles ); prediction->SetLocalViewAngles( cmd->viewangles );
} }
@ -1230,49 +1239,6 @@ void CInput::CreateMove ( int sequence_number, float input_sample_frametime, boo
} }
} }
// Let the move manager override anything it wants to.
if ( g_pClientMode->CreateMove( input_sample_frametime, cmd ) )
{
// Get current view angles after the client mode tweaks with it
#ifdef SIXENSE
// Only set the engine angles if sixense is not enabled. It is done in SixenseInput::SetView otherwise.
if( !g_pSixenseInput->IsEnabled() )
{
engine->SetViewAngles( cmd->viewangles );
}
#else
engine->SetViewAngles( cmd->viewangles );
#endif
if ( UseVR() )
{
C_BasePlayer *pPlayer = C_BasePlayer::GetLocalPlayer();
if( pPlayer && !pPlayer->GetVehicle() )
{
QAngle curViewangles, newViewangles;
Vector curMotion, newMotion;
engine->GetViewAngles( curViewangles );
curMotion.Init (
cmd->forwardmove,
cmd->sidemove,
cmd->upmove );
g_ClientVirtualReality.OverridePlayerMotion ( input_sample_frametime, viewangles, curViewangles, curMotion, &newViewangles, &newMotion );
engine->SetViewAngles( newViewangles );
cmd->forwardmove = newMotion[0];
cmd->sidemove = newMotion[1];
cmd->upmove = newMotion[2];
cmd->viewangles = newViewangles;
}
else
{
Vector vPos;
g_ClientVirtualReality.GetTorsoRelativeAim( &vPos, &cmd->viewangles );
engine->SetViewAngles( cmd->viewangles );
}
}
}
// Use new view angles if alive, otherwise user last angles we stored off. // Use new view angles if alive, otherwise user last angles we stored off.
if ( g_iAlive ) if ( g_iAlive )
{ {