mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-08 01:39:36 +00:00
add source-sdk-2013
This commit is contained in:
@@ -470,6 +470,7 @@ void CBaseAnimating::StudioFrameAdvanceManual( float flInterval )
|
||||
if ( !pStudioHdr )
|
||||
return;
|
||||
|
||||
UpdateModelScale();
|
||||
m_flAnimTime = gpGlobals->curtime;
|
||||
m_flPrevAnimTime = m_flAnimTime - flInterval;
|
||||
float flCycleRate = GetSequenceCycleRate( pStudioHdr, GetSequence() ) * m_flPlaybackRate;
|
||||
@@ -489,6 +490,8 @@ void CBaseAnimating::StudioFrameAdvance()
|
||||
return;
|
||||
}
|
||||
|
||||
UpdateModelScale();
|
||||
|
||||
if ( !m_flPrevAnimTime )
|
||||
{
|
||||
m_flPrevAnimTime = m_flAnimTime;
|
||||
@@ -628,7 +631,7 @@ void CBaseAnimating::InputSetModelScale( inputdata_t &inputdata )
|
||||
int CBaseAnimating::SelectWeightedSequence ( Activity activity )
|
||||
{
|
||||
Assert( activity != ACT_INVALID );
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::SelectWeightedSequence( GetModelPtr(), activity, GetSequence() );
|
||||
}
|
||||
|
||||
@@ -636,23 +639,16 @@ int CBaseAnimating::SelectWeightedSequence ( Activity activity )
|
||||
int CBaseAnimating::SelectWeightedSequence ( Activity activity, int curSequence )
|
||||
{
|
||||
Assert( activity != ACT_INVALID );
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::SelectWeightedSequence( GetModelPtr(), activity, curSequence );
|
||||
}
|
||||
|
||||
int CBaseAnimating::SelectWeightedSequenceFromModifiers( Activity activity, CUtlSymbol *pActivityModifiers, int iModifierCount )
|
||||
{
|
||||
Assert( activity != ACT_INVALID );
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
return GetModelPtr()->SelectWeightedSequenceFromModifiers( activity, pActivityModifiers, iModifierCount );
|
||||
}
|
||||
|
||||
//=========================================================
|
||||
// ResetActivityIndexes
|
||||
//=========================================================
|
||||
void CBaseAnimating::ResetActivityIndexes ( void )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
::ResetActivityIndexes( GetModelPtr() );
|
||||
}
|
||||
|
||||
@@ -661,7 +657,7 @@ void CBaseAnimating::ResetActivityIndexes ( void )
|
||||
//=========================================================
|
||||
void CBaseAnimating::ResetEventIndexes ( void )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
::ResetEventIndexes( GetModelPtr() );
|
||||
}
|
||||
|
||||
@@ -673,7 +669,7 @@ void CBaseAnimating::ResetEventIndexes ( void )
|
||||
//=========================================================
|
||||
int CBaseAnimating::SelectHeaviestSequence ( Activity activity )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::SelectHeaviestSequence( GetModelPtr(), activity );
|
||||
}
|
||||
|
||||
@@ -685,7 +681,7 @@ int CBaseAnimating::SelectHeaviestSequence ( Activity activity )
|
||||
//-----------------------------------------------------------------------------
|
||||
int CBaseAnimating::LookupActivity( const char *label )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::LookupActivity( GetModelPtr(), label );
|
||||
}
|
||||
|
||||
@@ -693,7 +689,7 @@ int CBaseAnimating::LookupActivity( const char *label )
|
||||
//=========================================================
|
||||
int CBaseAnimating::LookupSequence( const char *label )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::LookupSequence( GetModelPtr(), label );
|
||||
}
|
||||
|
||||
@@ -733,7 +729,7 @@ float CBaseAnimating::GetSequenceMoveYaw( int iSequence )
|
||||
{
|
||||
Vector vecReturn;
|
||||
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
::GetSequenceLinearMotion( GetModelPtr(), iSequence, GetPoseParameterArray(), &vecReturn );
|
||||
|
||||
if (vecReturn.Length() > 0)
|
||||
@@ -769,7 +765,7 @@ float CBaseAnimating::GetSequenceMoveDist( CStudioHdr *pStudioHdr, int iSequence
|
||||
//-----------------------------------------------------------------------------
|
||||
void CBaseAnimating::GetSequenceLinearMotion( int iSequence, Vector *pVec )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
::GetSequenceLinearMotion( GetModelPtr(), iSequence, GetPoseParameterArray(), pVec );
|
||||
}
|
||||
|
||||
@@ -916,7 +912,7 @@ void CBaseAnimating::ResetSequenceInfo ( )
|
||||
//=========================================================
|
||||
bool CBaseAnimating::IsValidSequence( int iSequence )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
CStudioHdr* pstudiohdr = GetModelPtr( );
|
||||
if (iSequence < 0 || iSequence >= pstudiohdr->GetNumSeq())
|
||||
{
|
||||
@@ -959,11 +955,14 @@ float CBaseAnimating::GetSequenceCycleRate( CStudioHdr *pStudioHdr, int iSequenc
|
||||
{
|
||||
float t = SequenceDuration( pStudioHdr, iSequence );
|
||||
|
||||
if ( t != 0.0f )
|
||||
if (t > 0.0f)
|
||||
{
|
||||
return 1.0f / t;
|
||||
}
|
||||
return t;
|
||||
else
|
||||
{
|
||||
return 1.0f / 0.1f;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1633,12 +1632,9 @@ void CBaseAnimating::CalculateIKLocks( float currentTime )
|
||||
enginetrace->TraceRay( ray, MASK_SOLID, &traceFilter, &trace );
|
||||
|
||||
/*
|
||||
if ( debugoverlay )
|
||||
{
|
||||
debugoverlay->AddBoxOverlay( p1, Vector(-r,-r,0), Vector(r,r,1), QAngle( 0, 0, 0 ), 255, 0, 0, 0, 1.0f );
|
||||
debugoverlay->AddBoxOverlay( trace.endpos, Vector(-r,-r,0), Vector(r,r,1), QAngle( 0, 0, 0 ), 255, 0, 0, 0, 1.0f );
|
||||
debugoverlay->AddLineOverlay( p1, trace.endpos, 255, 0, 0, 0, 1.0f );
|
||||
}
|
||||
debugoverlay->AddBoxOverlay( p1, Vector(-r,-r,0), Vector(r,r,1), QAngle( 0, 0, 0 ), 255, 0, 0, 0, 1.0f );
|
||||
debugoverlay->AddBoxOverlay( trace.endpos, Vector(-r,-r,0), Vector(r,r,1), QAngle( 0, 0, 0 ), 255, 0, 0, 0, 1.0f );
|
||||
debugoverlay->AddLineOverlay( p1, trace.endpos, 255, 0, 0, 0, 1.0f );
|
||||
*/
|
||||
|
||||
if (trace.startsolid)
|
||||
@@ -1783,7 +1779,7 @@ void CBaseAnimating::SetupBones( matrix3x4_t *pBoneToWorld, int boneMask )
|
||||
|
||||
MDLCACHE_CRITICAL_SECTION();
|
||||
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
|
||||
CStudioHdr *pStudioHdr = GetModelPtr( );
|
||||
|
||||
@@ -2091,7 +2087,7 @@ void CBaseAnimating::GetEyeballs( Vector &origin, QAngle &angles )
|
||||
//=========================================================
|
||||
int CBaseAnimating::FindTransitionSequence( int iCurrentSequence, int iGoalSequence, int *piDir )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
|
||||
if (piDir == NULL)
|
||||
{
|
||||
@@ -2140,7 +2136,7 @@ void CBaseAnimating::SetBodygroup( int iGroup, int iValue )
|
||||
{
|
||||
// SetBodygroup is not supported on pending dynamic models. Wait for it to load!
|
||||
// XXX TODO we could buffer up the group and value if we really needed to. -henryg
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
int newBody = m_nBody;
|
||||
::SetBodygroup( GetModelPtr( ), newBody, iGroup, iValue );
|
||||
m_nBody = newBody;
|
||||
@@ -2739,7 +2735,7 @@ void CBaseAnimating::InitBoneControllers ( void ) // FIXME: rename
|
||||
//=========================================================
|
||||
float CBaseAnimating::SetBoneController ( int iController, float flValue )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
|
||||
CStudioHdr *pmodel = (CStudioHdr*)GetModelPtr();
|
||||
|
||||
@@ -2756,7 +2752,7 @@ float CBaseAnimating::SetBoneController ( int iController, float flValue )
|
||||
//=========================================================
|
||||
float CBaseAnimating::GetBoneController ( int iController )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
|
||||
CStudioHdr *pmodel = (CStudioHdr*)GetModelPtr();
|
||||
|
||||
@@ -2947,7 +2943,7 @@ void CBaseAnimating::SetHitboxSet( int setnum )
|
||||
//-----------------------------------------------------------------------------
|
||||
void CBaseAnimating::SetHitboxSetByName( const char *setname )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
m_nHitboxSet = FindHitboxSetByName( GetModelPtr(), setname );
|
||||
}
|
||||
|
||||
@@ -2966,7 +2962,7 @@ int CBaseAnimating::GetHitboxSet( void )
|
||||
//-----------------------------------------------------------------------------
|
||||
const char *CBaseAnimating::GetHitboxSetName( void )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::GetHitboxSetName( GetModelPtr(), m_nHitboxSet );
|
||||
}
|
||||
|
||||
@@ -2976,7 +2972,7 @@ const char *CBaseAnimating::GetHitboxSetName( void )
|
||||
//-----------------------------------------------------------------------------
|
||||
int CBaseAnimating::GetHitboxSetCount( void )
|
||||
{
|
||||
AssertMsg( GetModelPtr(), "GetModelPtr NULL. %s", STRING(GetEntityName()) ? STRING(GetEntityName()) : "" );
|
||||
Assert( GetModelPtr() );
|
||||
return ::GetHitboxSetCount( GetModelPtr() );
|
||||
}
|
||||
|
||||
@@ -3307,7 +3303,6 @@ void CBaseAnimating::SetModelScale( float scale, float change_duration /*= 0.0f*
|
||||
mvs->m_flModelScaleGoal = scale;
|
||||
mvs->m_flModelScaleStartTime = gpGlobals->curtime;
|
||||
mvs->m_flModelScaleFinishTime = mvs->m_flModelScaleStartTime + change_duration;
|
||||
SetContextThink( &CBaseAnimating::UpdateModelScale, gpGlobals->curtime, "UpdateModelScaleThink" );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3346,11 +3341,6 @@ void CBaseAnimating::UpdateModelScale()
|
||||
}
|
||||
|
||||
RefreshCollisionBounds();
|
||||
|
||||
if ( frac < 1.f )
|
||||
{
|
||||
SetContextThink( &CBaseAnimating::UpdateModelScale, gpGlobals->curtime, "UpdateModelScaleThink" );
|
||||
}
|
||||
}
|
||||
|
||||
void CBaseAnimating::RefreshCollisionBounds( void )
|
||||
|
||||
Reference in New Issue
Block a user