Ticket #1944: sound_attribute.patch

source/graphics/Model.cpp

@@ -251 +251 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // BuildAnimation: load raw animation frame animation from given file, and build a 
 // animation specific to this model
-CSkeletonAnim* CModel::BuildAnimation(const VfsPath& pathname, const CStr& name, float speed, float actionpos, float actionpos2)
+CSkeletonAnim* CModel::BuildAnimation(const VfsPath& pathname, const CStr& name, float speed, float actionpos, float actionpos2, float soundpos)
 {
     CSkeletonAnimDef* def = m_SkeletonAnimManager.GetAnimation(pathname);
     if (!def)
@@ -272 +272 @@
     else
         anim->m_ActionPos2 = actionpos2 * anim->m_AnimDef->GetDuration();
 
+    if (soundpos == -1.f)
+        anim->m_SoundPos = -1.f;
+    else
+        anim->m_SoundPos = soundpos * anim->m_AnimDef->GetDuration();
+
     anim->m_ObjectBounds.SetEmpty();
     InvalidateBounds();
 

source/graphics/Model.h

@@ -197 +197 @@
      * @param speed animation speed as a factor of the default animation speed
      * @param actionpos offset of 'action' event, in range [0, 1]
      * @param actionpos2 offset of 'action2' event, in range [0, 1]
+     * @param sound offset of 'sound' event, in range [0, 1]
      * @return new animation, or NULL on error
      */
-    CSkeletonAnim* BuildAnimation(const VfsPath& pathname, const CStr& name, float speed, float actionpos, float actionpos2);
+    CSkeletonAnim* BuildAnimation(const VfsPath& pathname, const CStr& name, float speed, float actionpos, float actionpos2, float soundpos);
 
     /**
      * Add a prop to the model on the given point.

source/graphics/ObjectBase.cpp

@@ -71 +71 @@
     AT(speed);
     AT(event);
     AT(load);
+    AT(sound);
     AT(attachpoint);
     AT(actor);
     AT(frequency);
@@ -222 +223 @@
                                     float pos = ae.Value.ToFloat();
                                     anim.m_ActionPos2 = clamp(pos, 0.f, 1.f);
                                 }
+                                else if (ae.Name == at_sound)
+                                {
+                                    float pos = ae.Value.ToFloat();
+                                    anim.m_SoundPos = clamp(pos, 0.f, 1.f);
+                                }
                             }
                             currentVariant->m_Anims.push_back(anim);
                         }

source/graphics/ObjectBase.h

@@ -39 +39 @@
     struct Anim
     {
         // constructor
-        Anim() : m_Speed(1.f), m_ActionPos(-1.f), m_ActionPos2(-1.f) {}
-
+        Anim() : m_Speed(1.f), m_ActionPos(-1.f), m_ActionPos2(-1.f), m_SoundPos(-1.f) {}
         // name of the animation - "Idle", "Run", etc
         CStr m_AnimName;
         // filename of the animation - manidle.psa, manrun.psa, etc
@@ -51 +50 @@
         // happens, or -1.0 if unspecified
         float m_ActionPos;
         float m_ActionPos2;
+        float m_SoundPos;
     };
 
     struct Prop

source/graphics/ObjectEntry.cpp

@@ -164 +164 @@
 
         if (! it->second.m_FileName.empty())
         {
-            CSkeletonAnim* anim = model->BuildAnimation(it->second.m_FileName, name, it->second.m_Speed, it->second.m_ActionPos, it->second.m_ActionPos2);
+            CSkeletonAnim* anim = model->BuildAnimation(it->second.m_FileName, name, it->second.m_Speed, it->second.m_ActionPos, it->second.m_ActionPos2, it->second.m_SoundPos);
             if (anim)
                 m_Animations.insert(std::make_pair(name, anim));
         }
@@ -179 +179 @@
         anim->m_Speed = 0.f;
         anim->m_ActionPos = 0.f;
         anim->m_ActionPos2 = 0.f;
+        anim->m_SoundPos = 0.f;
         m_Animations.insert(std::make_pair("idle", anim));
 
         // Ignore errors, since they're probably saying this is a non-animated model

source/graphics/SkeletonAnim.h

@@ -46 +46 @@
     // ActionPos2 is used for loading projectile ammunition.
     float m_ActionPos;
     float m_ActionPos2;
+    float m_SoundPos;
     // object space bounds of the model when this animation is applied to it
     CBoundingBoxAligned m_ObjectBounds;
 };

source/graphics/UnitAnimation.cpp

@@ -67 +67 @@
     state.time = 0.f;
     state.pastLoadPos = false;
     state.pastActionPos = false;
+    state.pastSoundPos = false;
 
     m_AnimStates.push_back(state);
 
@@ -157 +158 @@
 
         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 +186 @@
             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 +195 @@
 
             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)
         {
             // If we're still within the current animation, then simply update it
@@ -219 +233 @@
 
             it->pastActionPos = false;
             it->pastLoadPos = false;
+            it->pastSoundPos = false;
 
             it->model->UpdateTo(it->time);
         }

source/graphics/UnitAnimation.h

@@ -100 +100 @@
         float time;
         bool pastLoadPos;
         bool pastActionPos;
+        bool pastSoundPos;
     };
 
     std::vector<SModelAnimState> m_AnimStates;