mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point

Browse Source 
This was SVN commit r13529.
This commit is contained in:
stwf
2013-07-02 11:44:46 +00:00
parent 377cae15f8
commit 485bd75abe
8 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/UnitAnimation.cpp
+16 -1
View File
@@ -67,6 +67,7 @@ void CUnitAnimation::AddModel(CModel* model, const CObjectEntry* object)
state.time = 0.f;
state.pastLoadPos = false;
state.pastActionPos = false;
state.pastSoundPos = false;
m_AnimStates.push_back(state);
@@ -157,8 +158,10 @@ void CUnitAnimation::Update(float time)
float actionPos = it->anims[it->animIdx]->m_ActionPos;
float loadPos = it->anims[it->animIdx]->m_ActionPos2;
float soundPos = it->anims[it->animIdx]->m_SoundPos;
bool hasActionPos = (actionPos != -1.f);
bool hasLoadPos = (loadPos != -1.f);
bool hasSoundPos = (soundPos != -1.f);
// Find the current animation speed
float speed;
@@ -183,7 +186,7 @@ void CUnitAnimation::Update(float time)
if (hasLoadPos)
it->model->HideAmmoProp();
if (!m_ActionSound.empty())
if ( !hasSoundPos && !m_ActionSound.empty() )
{
CmpPtr<ICmpSoundManager> cmpSoundManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
if (cmpSoundManager)
@@ -192,6 +195,17 @@ void CUnitAnimation::Update(float time)
it->pastActionPos = true;
}
if (hasSoundPos && !it->pastSoundPos && it->time + advance >= soundPos)
{
if (!m_ActionSound.empty() )
{
CmpPtr<ICmpSoundManager> cmpSoundManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
if (cmpSoundManager)
cmpSoundManager->PlaySoundGroup(m_ActionSound, m_Entity);
}
it->pastSoundPos = true;
}
if (it->time + advance < duration)
{
@@ -219,6 +233,7 @@ void CUnitAnimation::Update(float time)
it->pastActionPos = false;
it->pastLoadPos = false;
it->pastSoundPos = false;
it->model->UpdateTo(it->time);
}