Skip to content

fix crash regarding model index #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccp-intern merged 1 commit into from
Aug 6, 2026
Merged

fix crash regarding model index #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions trinity/Tr2GrannyAnimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Tr2GrannyAnimation::Tr2GrannyAnimation( IRoot* lockobj ) :
m_debugRenderSkeleton( false ),
m_debugRenderJointNames( false ),
m_baseLayer( 1.f ),
m_modelIndex( 0 ),
m_modelIndex( -1 ),
m_animationEnabled( true ),
m_boneBoundsInitialized( false ),
m_additiveMode( false ),
Expand Down Expand Up @@ -591,7 +591,7 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )

if( cmfData->meshes.size() > 0 )
{
m_modelIndex = cmfData->meshes[0].skeleton;
m_modelIndex = cmfData->meshes[0].skeleton == 0xff ? -1 : cmfData->meshes[0].skeleton;
}
}
else if( !m_model.empty() )
Expand Down Expand Up @@ -654,6 +654,7 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )
}
else
{
m_modelIndex = -1;
m_pose.boneTransforms.clear();
m_pose.skeleton = nullptr;
m_tmpPose.boneTransforms.clear();
Expand Down Expand Up @@ -787,6 +788,7 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )
}
else
{
m_modelIndex = -1;
m_skeleton = nullptr;
m_worldPose = nullptr;
m_localPose = nullptr;
Expand Down Expand Up @@ -864,6 +866,11 @@ bool Tr2GrannyAnimation::InitializeBoundingInfo()
return false;
}

if( m_modelIndex == -1 )
{
return false;
}

auto& skeleton = cmfData->skeletons[m_modelIndex];

auto boneBindings = cmfData->meshes[0].boneBindings;
Expand Down Expand Up @@ -1002,7 +1009,7 @@ bool Tr2GrannyAnimation::GetDynamicBounds( Vector4& boundingSphere, Vector3& aab
}

const granny_file_info* fi = GetFileInfo();
if( fi )
if( fi && m_modelIndex != -1 )
{
aabbMin += *reinterpret_cast<Vector3*>( fi->Models[m_modelIndex]->InitialPlacement.Position );
aabbMax += *reinterpret_cast<Vector3*>( fi->Models[m_modelIndex]->InitialPlacement.Position );
Expand Down Expand Up @@ -1042,7 +1049,12 @@ void Tr2GrannyAnimation::RenderBones( const Matrix& modelTransform, const Tr2Ani
return;
}

auto& skeleton = GetCMFData()->skeletons[m_modelIndex];
const cmf::Skeleton* skeletonPtr = GetSkeleton();
if( !skeletonPtr )
{
return;
}
const cmf::Skeleton& skeleton = *skeletonPtr;

for( int boneIdx = 0; boneIdx < boneCount; boneIdx++ )
{
Expand Down Expand Up @@ -1080,7 +1092,7 @@ void Tr2GrannyAnimation::RenderBones( const Matrix& modelTransform, const Tr2Ani
Vector3 initialPlacement( 0, 0, 0 );
const granny_file_info* fi = GetFileInfo();
Matrix initialTranslation;
if( fi )
if( fi && m_modelIndex != -1 )
{
initialPlacement = *reinterpret_cast<Vector3*>( fi->Models[m_modelIndex]->InitialPlacement.Position );
}
Expand Down Expand Up @@ -1188,7 +1200,7 @@ void Tr2GrannyAnimation::RenderDynamicBounds( const Matrix& modelTransform )
Vector3 initialPlacement( 0, 0, 0 );
const granny_file_info* fi = GetFileInfo();
Matrix initialTranslation;
if( fi )
if( fi && m_modelIndex != -1 )
{
initialPlacement = *reinterpret_cast<Vector3*>( fi->Models[m_modelIndex]->InitialPlacement.Position );
}
Expand Down Expand Up @@ -1428,7 +1440,7 @@ const std::vector<Matrix>& Tr2GrannyAnimation::GetWorldTransforms() const
granny_model* Tr2GrannyAnimation::GetGrannyModel() const
{
granny_file_info* fi = GetFileInfo();
if( !fi )
if( !fi || m_modelIndex == -1 )
{
return nullptr;
}
Expand Down Expand Up @@ -1854,6 +1866,7 @@ void Tr2GrannyAnimation::Cleanup()
m_pose.skeleton = nullptr;
m_skeletonBoneIndices.clear();
m_worldTransforms.clear();
m_boneBounds.clear();

#if WITH_GRANNY
if( m_localPose )
Expand Down Expand Up @@ -1883,6 +1896,7 @@ void Tr2GrannyAnimation::Cleanup()
m_skeleton = nullptr;
#endif

m_modelIndex = -1;
m_boneList.clear();

if( m_meshBoneMatrixList )
Expand Down