MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-06-05 02:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename singleplayer animstate to Mapbase player animstate

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2024-08-10 13:59:29 -05:00
parent 5d50335c02
commit 4a701c8bcc
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sp/src/game/client/client_mapbase.vpc
View File

@ -47,8 +47,8 @@ $Project
$File "$SRCDIR\game\shared\mapbase\MapEdit.h" $File "$SRCDIR\game\shared\mapbase\MapEdit.h"
$File "$SRCDIR\game\shared\mapbase\matchers.cpp" $File "$SRCDIR\game\shared\mapbase\matchers.cpp"
$File "$SRCDIR\game\shared\mapbase\matchers.h" $File "$SRCDIR\game\shared\mapbase\matchers.h"
$File "$SRCDIR\game\shared\mapbase\singleplayer_animstate.cpp" $File "$SRCDIR\game\shared\mapbase\mapbase_playeranimstate.cpp"
$File "$SRCDIR\game\shared\mapbase\singleplayer_animstate.h" $File "$SRCDIR\game\shared\mapbase\mapbase_playeranimstate.h"
$File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.cpp" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.cpp" [$MAPBASE_VSCRIPT]
$File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.h" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.h" [$MAPBASE_VSCRIPT]
$File "$SRCDIR\game\shared\mapbase\vscript_singletons.cpp" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_singletons.cpp" [$MAPBASE_VSCRIPT]

2
sp/src/game/client/hl2/c_basehlplayer.h
View File

@ -16,7 +16,7 @@
#include "c_hl2_playerlocaldata.h" #include "c_hl2_playerlocaldata.h"
#if !defined( HL2MP ) && defined ( MAPBASE ) #if !defined( HL2MP ) && defined ( MAPBASE )
#include "mapbase/singleplayer_animstate.h" #include "mapbase/mapbase_playeranimstate.h"
#endif #endif
class C_BaseHLPlayer : public C_BasePlayer class C_BaseHLPlayer : public C_BasePlayer

4
sp/src/game/server/hl2/hl2_player.h
View File

@ -19,7 +19,7 @@
#if defined ( HL2MP ) #if defined ( HL2MP )
#include "basemultiplayerplayer.h" #include "basemultiplayerplayer.h"
#elif defined ( MAPBASE ) #elif defined ( MAPBASE )
#include "mapbase/singleplayer_animstate.h" #include "mapbase/mapbase_playeranimstate.h"
#endif #endif
class CAI_Squad; class CAI_Squad;
@ -443,7 +443,7 @@ private:
friend class CHL2GameMovement; friend class CHL2GameMovement;
#ifdef SP_ANIM_STATE #ifdef SP_ANIM_STATE
CSinglePlayerAnimState* m_pPlayerAnimState; CMapbasePlayerAnimState* m_pPlayerAnimState;
// At the moment, we network the render angles since almost none of the player anim stuff is done on the client in SP. // At the moment, we network the render angles since almost none of the player anim stuff is done on the client in SP.
// If any of this is ever adapted for MP, this method should be replaced with replicating/moving the anim state to the client. // If any of this is ever adapted for MP, this method should be replaced with replicating/moving the anim state to the client.

4
sp/src/game/server/server_mapbase.vpc
View File

@ -46,8 +46,8 @@ $Project
$File "$SRCDIR\game\shared\mapbase\MapEdit.h" $File "$SRCDIR\game\shared\mapbase\MapEdit.h"
$File "$SRCDIR\game\shared\mapbase\matchers.cpp" $File "$SRCDIR\game\shared\mapbase\matchers.cpp"
$File "$SRCDIR\game\shared\mapbase\matchers.h" $File "$SRCDIR\game\shared\mapbase\matchers.h"
$File "$SRCDIR\game\shared\mapbase\singleplayer_animstate.cpp" $File "$SRCDIR\game\shared\mapbase\mapbase_playeranimstate.cpp"
$File "$SRCDIR\game\shared\mapbase\singleplayer_animstate.h" $File "$SRCDIR\game\shared\mapbase\mapbase_playeranimstate.h"
$File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.cpp" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.cpp" [$MAPBASE_VSCRIPT]
$File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.h" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_funcs_shared.h" [$MAPBASE_VSCRIPT]
$File "$SRCDIR\game\shared\mapbase\vscript_singletons.cpp" [$MAPBASE_VSCRIPT] $File "$SRCDIR\game\shared\mapbase\vscript_singletons.cpp" [$MAPBASE_VSCRIPT]

52
sp/src/game/shared/mapbase/singleplayer_animstate.cpp → sp/src/game/shared/mapbase/mapbase_playeranimstate.cpp
View File

@ -15,7 +15,7 @@
//=============================================================================// //=============================================================================//
#include "cbase.h" #include "cbase.h"
#include "singleplayer_animstate.h" #include "mapbase_playeranimstate.h"
#include "tier0/vprof.h" #include "tier0/vprof.h"
#include "animation.h" #include "animation.h"
#include "studio.h" #include "studio.h"
@ -27,9 +27,9 @@
extern ConVar mp_facefronttime, mp_feetyawrate, mp_ik; extern ConVar mp_facefronttime, mp_feetyawrate, mp_ik;
ConVar sv_playeranimstate_animtype( "sv_playeranimstate_animtype", "0", FCVAR_NONE, "The leg animation type used by the singleplayer animation state. 9way = 0, 8way = 1, GoldSrc = 2" ); ConVar sv_playeranimstate_animtype( "sv_playeranimstate_animtype", "0", FCVAR_NONE, "The leg animation type used by the Mapbase animation state. 9way = 0, 8way = 1, GoldSrc = 2" );
ConVar sv_playeranimstate_bodyyaw( "sv_playeranimstate_bodyyaw", "45.0", FCVAR_NONE, "The maximum body yaw used by the singleplayer animation state." ); ConVar sv_playeranimstate_bodyyaw( "sv_playeranimstate_bodyyaw", "45.0", FCVAR_NONE, "The maximum body yaw used by the Mapbase animation state." );
ConVar sv_playeranimstate_use_aim_sequences( "sv_playeranimstate_use_aim_sequences", "1", FCVAR_NONE, "Allows the singleplayer animation state to use aim sequences." ); ConVar sv_playeranimstate_use_aim_sequences( "sv_playeranimstate_use_aim_sequences", "1", FCVAR_NONE, "Allows the Mapbase animation state to use aim sequences." );
#define MIN_TURN_ANGLE_REQUIRING_TURN_ANIMATION 15.0f #define MIN_TURN_ANGLE_REQUIRING_TURN_ANIMATION 15.0f
@ -37,11 +37,11 @@ ConVar sv_playeranimstate_use_aim_sequences( "sv_playeranimstate_use_aim_sequenc
#define RELOADSEQUENCE_LAYER (FIRESEQUENCE_LAYER + 1) #define RELOADSEQUENCE_LAYER (FIRESEQUENCE_LAYER + 1)
#define NUM_LAYERS_WANTED (RELOADSEQUENCE_LAYER + 1) #define NUM_LAYERS_WANTED (RELOADSEQUENCE_LAYER + 1)
CSinglePlayerAnimState *CreatePlayerAnimationState( CBasePlayer *pPlayer ) CMapbasePlayerAnimState *CreatePlayerAnimationState( CBasePlayer *pPlayer )
{ {
MDLCACHE_CRITICAL_SECTION(); MDLCACHE_CRITICAL_SECTION();
CSinglePlayerAnimState *pState = new CSinglePlayerAnimState( pPlayer ); CMapbasePlayerAnimState *pState = new CMapbasePlayerAnimState( pPlayer );
// Setup the movement data. // Setup the movement data.
CModAnimConfig movementData; CModAnimConfig movementData;
@ -67,14 +67,14 @@ extern ConVar mp_feetyawrate;
extern ConVar mp_facefronttime; extern ConVar mp_facefronttime;
extern ConVar mp_ik; extern ConVar mp_ik;
CSinglePlayerAnimState::CSinglePlayerAnimState( CBasePlayer *pPlayer ): m_pPlayer( pPlayer ) CMapbasePlayerAnimState::CMapbasePlayerAnimState( CBasePlayer *pPlayer ): m_pPlayer( pPlayer )
{ {
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Activity CSinglePlayerAnimState::CalcMainActivity() Activity CMapbasePlayerAnimState::CalcMainActivity()
{ {
#ifdef CLIENT_DLL #ifdef CLIENT_DLL
return ACT_IDLE; return ACT_IDLE;
@ -138,7 +138,7 @@ Activity CSinglePlayerAnimState::CalcMainActivity()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim ) void CMapbasePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
{ {
if ( playerAnim == PLAYER_ATTACK1 ) if ( playerAnim == PLAYER_ATTACK1 )
{ {
@ -199,7 +199,7 @@ void CSinglePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Activity CSinglePlayerAnimState::TranslateActivity( Activity actDesired ) Activity CMapbasePlayerAnimState::TranslateActivity( Activity actDesired )
{ {
#ifdef CLIENT_DLL #ifdef CLIENT_DLL
return actDesired; return actDesired;
@ -211,7 +211,7 @@ Activity CSinglePlayerAnimState::TranslateActivity( Activity actDesired )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CSinglePlayerAnimState::HandleJumping() bool CMapbasePlayerAnimState::HandleJumping()
{ {
if ( m_bJumping ) if ( m_bJumping )
{ {
@ -242,7 +242,7 @@ bool CSinglePlayerAnimState::HandleJumping()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ComputeSequences( CStudioHdr *pStudioHdr ) void CMapbasePlayerAnimState::ComputeSequences( CStudioHdr *pStudioHdr )
{ {
CBasePlayerAnimState::ComputeSequences(pStudioHdr); CBasePlayerAnimState::ComputeSequences(pStudioHdr);
@ -255,7 +255,7 @@ void CSinglePlayerAnimState::ComputeSequences( CStudioHdr *pStudioHdr )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::AddMiscSequence( int iSequence, float flBlendIn, float flBlendOut, float flPlaybackRate, bool bHoldAtEnd, bool bOnlyWhenStill ) void CMapbasePlayerAnimState::AddMiscSequence( int iSequence, float flBlendIn, float flBlendOut, float flPlaybackRate, bool bHoldAtEnd, bool bOnlyWhenStill )
{ {
Assert( iSequence != -1 ); Assert( iSequence != -1 );
@ -275,7 +275,7 @@ void CSinglePlayerAnimState::AddMiscSequence( int iSequence, float flBlendIn, fl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ClearAnimationState() void CMapbasePlayerAnimState::ClearAnimationState()
{ {
m_bJumping = false; m_bJumping = false;
m_bFiring = false; m_bFiring = false;
@ -289,7 +289,7 @@ void CSinglePlayerAnimState::ClearAnimationState()
CBasePlayerAnimState::ClearAnimationState(); CBasePlayerAnimState::ClearAnimationState();
} }
void CSinglePlayerAnimState::ClearAnimationLayers() void CMapbasePlayerAnimState::ClearAnimationLayers()
{ {
VPROF( "CBasePlayerAnimState::ClearAnimationLayers" ); VPROF( "CBasePlayerAnimState::ClearAnimationLayers" );
if ( !m_pOuter ) if ( !m_pOuter )
@ -308,13 +308,13 @@ void CSinglePlayerAnimState::ClearAnimationLayers()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int CSinglePlayerAnimState::CalcAimLayerSequence( float *flCycle, float *flAimSequenceWeight, bool bForceIdle ) int CMapbasePlayerAnimState::CalcAimLayerSequence( float *flCycle, float *flAimSequenceWeight, bool bForceIdle )
{ {
// TODO? // TODO?
return m_pOuter->LookupSequence( "soldier_Aim_9_directions" ); return m_pOuter->LookupSequence( "soldier_Aim_9_directions" );
} }
void CSinglePlayerAnimState::UpdateLayerSequenceGeneric( int iLayer, bool &bEnabled, void CMapbasePlayerAnimState::UpdateLayerSequenceGeneric( int iLayer, bool &bEnabled,
float &flCurCycle, int &iSequence, bool bWaitAtEnd, float &flCurCycle, int &iSequence, bool bWaitAtEnd,
float fBlendIn, float fBlendOut, bool bMoveBlend, float fPlaybackRate, bool bUpdateCycle /* = true */ ) float fBlendIn, float fBlendOut, bool bMoveBlend, float fPlaybackRate, bool bUpdateCycle /* = true */ )
{ {
@ -418,23 +418,23 @@ void CSinglePlayerAnimState::UpdateLayerSequenceGeneric( int iLayer, bool &bEnab
pLayer->SetOrder( iLayer ); pLayer->SetOrder( iLayer );
} }
void CSinglePlayerAnimState::ComputeFireSequence() void CMapbasePlayerAnimState::ComputeFireSequence()
{ {
UpdateLayerSequenceGeneric( FIRESEQUENCE_LAYER, m_bFiring, m_flFireCycle, m_iFireSequence, false ); UpdateLayerSequenceGeneric( FIRESEQUENCE_LAYER, m_bFiring, m_flFireCycle, m_iFireSequence, false );
} }
void CSinglePlayerAnimState::ComputeReloadSequence() void CMapbasePlayerAnimState::ComputeReloadSequence()
{ {
UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bReloading, m_flReloadCycle, m_iReloadSequence, false, m_flReloadBlendIn, m_flReloadBlendOut, false, m_fReloadPlaybackRate ); UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bReloading, m_flReloadCycle, m_iReloadSequence, false, m_flReloadBlendIn, m_flReloadBlendOut, false, m_fReloadPlaybackRate );
} }
void CSinglePlayerAnimState::ComputeWeaponSwitchSequence() void CMapbasePlayerAnimState::ComputeWeaponSwitchSequence()
{ {
UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bWeaponSwitching, m_flWeaponSwitchCycle, m_iWeaponSwitchSequence, false, 0, 0.5f ); UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bWeaponSwitching, m_flWeaponSwitchCycle, m_iWeaponSwitchSequence, false, 0, 0.5f );
} }
// does misc gestures if we're not firing // does misc gestures if we're not firing
void CSinglePlayerAnimState::ComputeMiscSequence() void CMapbasePlayerAnimState::ComputeMiscSequence()
{ {
UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bPlayingMisc, m_flMiscCycle, m_iMiscSequence, m_bMiscHoldAtEnd, m_flMiscBlendIn, m_flMiscBlendOut, m_bMiscOnlyWhenStill, m_fMiscPlaybackRate ); UpdateLayerSequenceGeneric( RELOADSEQUENCE_LAYER, m_bPlayingMisc, m_flMiscCycle, m_iMiscSequence, m_bMiscHoldAtEnd, m_flMiscBlendIn, m_flMiscBlendOut, m_bMiscOnlyWhenStill, m_fMiscPlaybackRate );
} }
@ -444,7 +444,7 @@ void CSinglePlayerAnimState::ComputeMiscSequence()
// Input : - // Input : -
// Output : float // Output : float
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
float CSinglePlayerAnimState::GetCurrentMaxGroundSpeed() float CMapbasePlayerAnimState::GetCurrentMaxGroundSpeed()
{ {
CStudioHdr *pStudioHdr = GetOuter()->GetModelPtr(); CStudioHdr *pStudioHdr = GetOuter()->GetModelPtr();
@ -485,7 +485,7 @@ float CSinglePlayerAnimState::GetCurrentMaxGroundSpeed()
// Purpose: Override for backpeddling // Purpose: Override for backpeddling
// Input : dt - // Input : dt -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ComputePoseParam_BodyYaw( void ) void CMapbasePlayerAnimState::ComputePoseParam_BodyYaw( void )
{ {
CBasePlayerAnimState::ComputePoseParam_BodyYaw(); CBasePlayerAnimState::ComputePoseParam_BodyYaw();
@ -495,7 +495,7 @@ void CSinglePlayerAnimState::ComputePoseParam_BodyYaw( void )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ComputePoseParam_BodyLookYaw( void ) void CMapbasePlayerAnimState::ComputePoseParam_BodyLookYaw( void )
{ {
// See if we even have a blender for pitch // See if we even have a blender for pitch
int upper_body_yaw = GetOuter()->LookupPoseParameter( "aim_yaw" ); int upper_body_yaw = GetOuter()->LookupPoseParameter( "aim_yaw" );
@ -632,7 +632,7 @@ void CSinglePlayerAnimState::ComputePoseParam_BodyLookYaw( void )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ComputePoseParam_BodyPitch( CStudioHdr *pStudioHdr ) void CMapbasePlayerAnimState::ComputePoseParam_BodyPitch( CStudioHdr *pStudioHdr )
{ {
// Get pitch from v_angle // Get pitch from v_angle
float flPitch = m_flEyePitch; float flPitch = m_flEyePitch;
@ -652,7 +652,7 @@ void CSinglePlayerAnimState::ComputePoseParam_BodyPitch( CStudioHdr *pStudioHdr
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: // Purpose:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSinglePlayerAnimState::ComputePoseParam_HeadPitch( CStudioHdr *pStudioHdr ) void CMapbasePlayerAnimState::ComputePoseParam_HeadPitch( CStudioHdr *pStudioHdr )
{ {
// Get pitch from v_angle // Get pitch from v_angle
int iHeadPitch = GetOuter()->LookupPoseParameter("head_pitch"); int iHeadPitch = GetOuter()->LookupPoseParameter("head_pitch");

12
sp/src/game/shared/mapbase/singleplayer_animstate.h → sp/src/game/shared/mapbase/mapbase_playeranimstate.h
View File

@ -14,8 +14,8 @@
// //
//=============================================================================// //=============================================================================//
#ifndef SINGLEPLAYER_ANIMSTATE_H #ifndef MAPBASE_PLAYERANIMSTATE_H
#define SINGLEPLAYER_ANIMSTATE_H #define MAPBASE_PLAYERANIMSTATE_H
#ifdef _WIN32 #ifdef _WIN32
#pragma once #pragma once
#endif #endif
@ -34,10 +34,10 @@
#define SP_ANIM_STATE 1 #define SP_ANIM_STATE 1
#endif #endif
class CSinglePlayerAnimState : public CBasePlayerAnimState class CMapbasePlayerAnimState : public CBasePlayerAnimState
{ {
public: public:
CSinglePlayerAnimState( CBasePlayer *pPlayer ); CMapbasePlayerAnimState( CBasePlayer *pPlayer );
Activity CalcMainActivity(); Activity CalcMainActivity();
int CalcAimLayerSequence( float *flCycle, float *flAimSequenceWeight, bool bForceIdle ); int CalcAimLayerSequence( float *flCycle, float *flAimSequenceWeight, bool bForceIdle );
@ -105,6 +105,6 @@ private:
float m_flFireCycle; float m_flFireCycle;
}; };
CSinglePlayerAnimState *CreatePlayerAnimationState( CBasePlayer *pPlayer ); CMapbasePlayerAnimState *CreatePlayerAnimationState( CBasePlayer *pPlayer );
#endif // SINGLEPLAYER_ANIMSTATE_H #endif // MAPBASE_PLAYERANIMSTATE_H