Skip to content

fix division by zero when calculating animation duration #198

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+58 −14
Open

fix division by zero when calculating animation duration #198

Show file tree
Hide file tree
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
36 changes: 29 additions & 7 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,16 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
if (m_handle)
{
m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / m_handle->Get_Frame_Rate();
const Real frameRate = m_handle->Get_Frame_Rate();
if (frameRate > 0.0f)
{
m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / frameRate;
}
else
{
// prevent divide by zeros
m_naturalDurationInMsec = 0.0f;
}
}
}
// since we have it locally, must addref.
Expand All @@ -365,7 +374,16 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
if (handle != NULL && m_naturalDurationInMsec < 0)
{
m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / handle->Get_Frame_Rate();
const Real frameRate = handle->Get_Frame_Rate();
if (frameRate > 0.0f)
{
m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / frameRate;
}
else
{
// prevent divide by zeros
m_naturalDurationInMsec = 0.0f;
}
}
// since Get_HAnim() returns an addrefed handle, we must NOT addref here.
//if (handle)
Expand Down Expand Up @@ -2201,12 +2219,16 @@ Bool W3DModelDraw::setCurAnimDurationInMsec(Real desiredDurationInMsec)
HAnimClass* anim = hlod->Peek_Animation();
if (anim)
{
Real naturalDurationInMsec = anim->Get_Num_Frames() * 1000.0f / anim->Get_Frame_Rate();
if (naturalDurationInMsec > 0.0f && desiredDurationInMsec > 0.0f)
const Real frameRate = anim->Get_Frame_Rate();
if (frameRate > 0.0f)
{
Real multiplier = naturalDurationInMsec / desiredDurationInMsec;
hlod->Set_Animation_Frame_Rate_Multiplier(multiplier);
return true;
Real naturalDurationInMsec = anim->Get_Num_Frames() * 1000.0f / frameRate;
if (naturalDurationInMsec > 0.0f && desiredDurationInMsec > 0.0f)
{
Real multiplier = naturalDurationInMsec / desiredDurationInMsec;
hlod->Set_Animation_Frame_Rate_Multiplier(multiplier);
return true;
}
}
}
}
Expand Down
36 changes: 29 additions & 7 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,16 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
if (m_handle)
{
m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / m_handle->Get_Frame_Rate();
const Real frameRate = m_handle->Get_Frame_Rate();
if (frameRate > 0.0f)
{
m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / frameRate;
}
else
{
// prevent divide by zeros
m_naturalDurationInMsec = 0.0f;
}
}
}
// since we have it locally, must addref.
Expand All @@ -365,7 +374,16 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
if (handle != NULL && m_naturalDurationInMsec < 0)
{
m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / handle->Get_Frame_Rate();
const Real frameRate = handle->Get_Frame_Rate();
if (frameRate > 0.0f)
{
m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / frameRate;
}
else
{
// prevent divide by zeros
m_naturalDurationInMsec = 0.0f;
}
}
// since Get_HAnim() returns an addrefed handle, we must NOT addref here.
//if (handle)
Expand Down Expand Up @@ -2242,12 +2260,16 @@ Bool W3DModelDraw::setCurAnimDurationInMsec(Real desiredDurationInMsec)
HAnimClass* anim = hlod->Peek_Animation();
if (anim)
{
Real naturalDurationInMsec = anim->Get_Num_Frames() * 1000.0f / anim->Get_Frame_Rate();
if (naturalDurationInMsec > 0.0f && desiredDurationInMsec > 0.0f)
const Real frameRate = anim->Get_Frame_Rate();
if (frameRate > 0.0f)
{
Real multiplier = naturalDurationInMsec / desiredDurationInMsec;
hlod->Set_Animation_Frame_Rate_Multiplier(multiplier);
return true;
Real naturalDurationInMsec = anim->Get_Num_Frames() * 1000.0f / frameRate;
if (naturalDurationInMsec > 0.0f && desiredDurationInMsec > 0.0f)
{
Real multiplier = naturalDurationInMsec / desiredDurationInMsec;
hlod->Set_Animation_Frame_Rate_Multiplier(multiplier);
return true;
}
}
}
}
Expand Down
Loading