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

various BuildTransformations fixes

Browse source
This commit is contained in:
Kamay Xutax 2024-04-03 00:50:54 +02:00
parent bfbe067423
commit 051e8abd82
9 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
game/client/c_baseanimating.cpp
View file

@ -1458,7 +1458,7 @@ void C_BaseAnimating::GetCachedBoneMatrix( int boneIndex, matrix3x4_t &out )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: move position and rotation transforms into global matrices // Purpose: move position and rotation transforms into global matrices
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void C_BaseAnimating::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion *q, const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_BaseAnimating::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion *q, const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed, float flCurrentTime )
{ {
VPROF_BUDGET( "C_BaseAnimating::BuildTransformations", VPROF_BUDGETGROUP_CLIENT_ANIMATION ); VPROF_BUDGET( "C_BaseAnimating::BuildTransformations", VPROF_BUDGETGROUP_CLIENT_ANIMATION );
@ -1574,7 +1574,7 @@ void C_BaseAnimating::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quater
} }
// do jiggle physics // do jiggle physics
m_pJiggleBones->BuildJiggleTransformations( i, gpGlobals->realtime, jiggleInfo, goalMX, GetBoneForWrite( i ) ); m_pJiggleBones->BuildJiggleTransformations( i, flCurrentTime, jiggleInfo, goalMX, GetBoneForWrite( i ) );
} }
else if (hdr->boneParent(i) == -1) else if (hdr->boneParent(i) == -1)
@ -1982,9 +1982,16 @@ void C_BaseAnimating::StandardBlendingRules( CStudioHdr *hdr, Vector pos[], Quat
AccumulateLayers( boneSetup, pos, q, currentTime ); AccumulateLayers( boneSetup, pos, q, currentTime );
CIKContext auto_ik; if ( m_pIk )
auto_ik.Init( hdr, GetRenderAngles(), GetRenderOrigin(), currentTime, gpGlobals->framecount, boneMask ); {
boneSetup.CalcAutoplaySequences( pos, q, currentTime, &auto_ik ); CIKContext auto_ik;
auto_ik.Init( hdr, GetRenderAngles(), GetRenderOrigin(), currentTime, gpGlobals->framecount, boneMask );
boneSetup.CalcAutoplaySequences( pos, q, currentTime, &auto_ik );
}
else
{
boneSetup.CalcAutoplaySequences( pos, q, currentTime, NULL );
}
if ( hdr->numbonecontrollers() ) if ( hdr->numbonecontrollers() )
{ {
@ -3024,7 +3031,7 @@ bool C_BaseAnimating::SetupBones( matrix3x4_t *pBoneToWorldOut, int nMaxBones, i
m_pIk->SolveDependencies( pos, q, m_BoneAccessor.GetBoneArrayForWrite(), boneComputed ); m_pIk->SolveDependencies( pos, q, m_BoneAccessor.GetBoneArrayForWrite(), boneComputed );
} }
BuildTransformations( hdr, pos, q, parentTransform, bonesMaskNeedRecalc, boneComputed ); BuildTransformations( hdr, pos, q, parentTransform, bonesMaskNeedRecalc, boneComputed, currentTime );
RemoveFlag( EFL_SETTING_UP_BONES ); RemoveFlag( EFL_SETTING_UP_BONES );
ControlMouth( hdr ); ControlMouth( hdr );

2
game/client/c_baseanimating.h
View file

@ -139,7 +139,7 @@ public:
// base model functionality // base model functionality
float ClampCycle( float cycle, bool isLooping ); float ClampCycle( float cycle, bool isLooping );
virtual void GetPoseParameters( CStudioHdr *pStudioHdr, float poseParameter[MAXSTUDIOPOSEPARAM] ); virtual void GetPoseParameters( CStudioHdr *pStudioHdr, float poseParameter[MAXSTUDIOPOSEPARAM] );
virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ); virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime );
virtual void ApplyBoneMatrixTransform( matrix3x4_t& transform ); virtual void ApplyBoneMatrixTransform( matrix3x4_t& transform );
virtual int VPhysicsGetObjectList( IPhysicsObject **pList, int listMax ); virtual int VPhysicsGetObjectList( IPhysicsObject **pList, int listMax );

4
game/client/c_baseflex.cpp
View file

@ -1162,7 +1162,7 @@ void C_BaseFlex::SetupWeights( const matrix3x4_t *pBoneToWorld, int nFlexWeightC
// Purpose: Use the local bone positions to set flex control weights // Purpose: Use the local bone positions to set flex control weights
// via boneflexdrivers specified in the model // via boneflexdrivers specified in the model
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void C_BaseFlex::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_BaseFlex::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime )
{ {
const int nBoneFlexDriverCount = pStudioHdr->BoneFlexDriverCount(); const int nBoneFlexDriverCount = pStudioHdr->BoneFlexDriverCount();
@ -1181,7 +1181,7 @@ void C_BaseFlex::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quat
} }
} }
BaseClass::BuildTransformations( pStudioHdr, pos, q, cameraTransform, boneMask, boneComputed ); BaseClass::BuildTransformations( pStudioHdr, pos, q, cameraTransform, boneMask, boneComputed, currentTime );
} }

2
game/client/c_baseflex.h
View file

@ -147,7 +147,7 @@ public:
virtual void OnThreadedDrawSetup(); virtual void OnThreadedDrawSetup();
// model specific // model specific
virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ); virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime );
static void LinkToGlobalFlexControllers( CStudioHdr *hdr ); static void LinkToGlobalFlexControllers( CStudioHdr *hdr );
virtual void SetupWeights( const matrix3x4_t *pBoneToWorld, int nFlexWeightCount, float *pFlexWeights, float *pFlexDelayedWeights ); virtual void SetupWeights( const matrix3x4_t *pBoneToWorld, int nFlexWeightCount, float *pFlexWeights, float *pFlexDelayedWeights );
virtual bool SetupGlobalWeights( const matrix3x4_t *pBoneToWorld, int nFlexWeightCount, float *pFlexWeights, float *pFlexDelayedWeights ); virtual bool SetupGlobalWeights( const matrix3x4_t *pBoneToWorld, int nFlexWeightCount, float *pFlexWeights, float *pFlexDelayedWeights );

6
game/client/cstrike/c_cs_player.cpp
View file

@ -1956,10 +1956,10 @@ void GetCorrectionMatrices(
} }
void C_CSPlayer::BuildTransformations( CStudioHdr *pHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_CSPlayer::BuildTransformations( CStudioHdr *pHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime )
{ {
// First, setup our model's transformations like normal. // First, setup our model's transformations like normal.
BaseClass::BuildTransformations( pHdr, pos, q, cameraTransform, boneMask, boneComputed ); BaseClass::BuildTransformations( pHdr, pos, q, cameraTransform, boneMask, boneComputed, currentTime );
if ( IsLocalPlayer() && !C_BasePlayer::ShouldDrawLocalPlayer() ) if ( IsLocalPlayer() && !C_BasePlayer::ShouldDrawLocalPlayer() )
return; return;
@ -1975,7 +1975,7 @@ void C_CSPlayer::BuildTransformations( CStudioHdr *pHdr, Vector *pos, Quaternion
return; return;
// Have the weapon setup its bones. // Have the weapon setup its bones.
pWeapon->SetupBones( NULL, 0, BONE_USED_BY_ANYTHING, gpGlobals->curtime ); pWeapon->SetupBones( NULL, 0, BONE_USED_BY_ANYTHING, currentTime );
int iWeaponBone = 0; int iWeaponBone = 0;
if ( FindWeaponAttachmentBone( pWeapon, iWeaponBone ) ) if ( FindWeaponAttachmentBone( pWeapon, iWeaponBone ) )

2
game/client/cstrike/c_cs_player.h
View file

@ -110,7 +110,7 @@ public:
CUtlVector< C_BaseParticleEntity* > m_SmokeGrenades; CUtlVector< C_BaseParticleEntity* > m_SmokeGrenades;
virtual bool ShouldDraw( void ); virtual bool ShouldDraw( void );
virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ); virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime );
virtual C_BaseAnimating * BecomeRagdollOnClient(); virtual C_BaseAnimating * BecomeRagdollOnClient();
virtual IRagdoll* GetRepresentativeRagdoll() const; virtual IRagdoll* GetRepresentativeRagdoll() const;

4
game/client/episodic/c_npc_puppet.cpp
View file

@ -51,7 +51,7 @@ void C_NPC_Puppet::OnDataChanged( DataUpdateType_t updateType )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: We need to slam our position! // Purpose: We need to slam our position!
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void C_NPC_Puppet::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_NPC_Puppet::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime )
{ {
if ( m_hAnimationTarget && m_nTargetAttachment != -1 ) if ( m_hAnimationTarget && m_nTargetAttachment != -1 )
{ {
@ -68,7 +68,7 @@ void C_NPC_Puppet::BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Qu
} }
// Call the baseclass // Call the baseclass
BaseClass::BuildTransformations( pStudioHdr, pos, q, cameraTransform, boneMask, boneComputed ); BaseClass::BuildTransformations( pStudioHdr, pos, q, cameraTransform, boneMask, boneComputed, currentTime );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
game/client/hl2/c_basehlplayer.cpp
View file

@ -641,9 +641,9 @@ bool C_BaseHLPlayer::CreateMove( float flInputSampleTime, CUserCmd *pCmd )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: Input handling // Purpose: Input handling
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void C_BaseHLPlayer::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_BaseHLPlayer::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTIme )
{ {
BaseClass::BuildTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed ); BaseClass::BuildTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed, currentTIme );
BuildFirstPersonMeathookTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed, "ValveBiped.Bip01_Head1" ); BuildFirstPersonMeathookTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed, "ValveBiped.Bip01_Head1" );
} }

12
game/client/ragdoll.cpp
View file

@ -389,7 +389,7 @@ public:
void GetRenderBounds( Vector& theMins, Vector& theMaxs ); void GetRenderBounds( Vector& theMins, Vector& theMaxs );
virtual void AddEntity( void ); virtual void AddEntity( void );
virtual void AccumulateLayers( IBoneSetup &boneSetup, Vector pos[], Quaternion q[], float currentTime ); virtual void AccumulateLayers( IBoneSetup &boneSetup, Vector pos[], Quaternion q[], float currentTime );
virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed ); virtual void BuildTransformations( CStudioHdr *pStudioHdr, Vector *pos, Quaternion q[], const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime );
IPhysicsObject *GetElement( int elementNum ); IPhysicsObject *GetElement( int elementNum );
virtual void UpdateOnRemove(); virtual void UpdateOnRemove();
virtual float LastBoneChangedTime(); virtual float LastBoneChangedTime();
@ -565,7 +565,7 @@ void C_ServerRagdoll::AccumulateLayers( IBoneSetup &boneSetup, Vector pos[], Qua
} }
} }
void C_ServerRagdoll::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed ) void C_ServerRagdoll::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t &cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime )
{ {
if ( !hdr ) if ( !hdr )
return; return;
@ -714,14 +714,14 @@ public:
return BaseClass::SetupBones( pBoneToWorldOut, nMaxBones, boneMask, currentTime ); return BaseClass::SetupBones( pBoneToWorldOut, nMaxBones, boneMask, currentTime );
} }
virtual void BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed ) virtual void BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float currentTime )
{ {
VPROF_BUDGET( "C_ServerRagdollAttached::SetupBones", VPROF_BUDGETGROUP_CLIENT_ANIMATION ); VPROF_BUDGET( "C_ServerRagdollAttached::SetupBones", VPROF_BUDGETGROUP_CLIENT_ANIMATION );
if ( !hdr ) if ( !hdr )
return; return;
float frac = RemapVal( gpGlobals->curtime, m_parentTime, m_parentTime+ATTACH_INTERP_TIME, 0, 1 ); float frac = RemapVal( currentTime, m_parentTime, m_parentTime+ATTACH_INTERP_TIME, 0, 1 );
frac = clamp( frac, 0.f, 1.f ); frac = clamp( frac, 0.f, 1.f );
// interpolate offset over some time // interpolate offset over some time
Vector offset = m_vecOffset * (1-frac); Vector offset = m_vecOffset * (1-frac);
@ -734,13 +734,13 @@ public:
if ( parent ) if ( parent )
{ {
Assert( parent != this ); Assert( parent != this );
parent->SetupBones( NULL, -1, BONE_USED_BY_ANYTHING, gpGlobals->curtime ); parent->SetupBones( NULL, -1, BONE_USED_BY_ANYTHING, currentTime );
matrix3x4_t boneToWorld; matrix3x4_t boneToWorld;
parent->GetCachedBoneMatrix( m_boneIndexAttached, boneToWorld ); parent->GetCachedBoneMatrix( m_boneIndexAttached, boneToWorld );
VectorTransform( m_attachmentPointBoneSpace, boneToWorld, worldOrigin ); VectorTransform( m_attachmentPointBoneSpace, boneToWorld, worldOrigin );
} }
BaseClass::BuildTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed ); BaseClass::BuildTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed, currentTime );
if ( parent ) if ( parent )
{ {