WIP. Improving player walk logic.

include/Engine/Sound/SoundManager.h

@@ -69,12 +69,11 @@ protected:
     void stopSound(Source* source);
     void playerJumps();
     void playerStep(double dt);
-    EntityID createChildEmitter();
+    EntityID createChildEmitter(EntityWrapper localPlayer);
 
     // Logic
     World* m_World = nullptr;
     EventBroker* m_EventBroker = nullptr;
-    std::unordered_map<EntityID, Source*> m_Sources;
 
 private:
     // Help functions for working with OpenaAL
@@ -98,7 +97,8 @@ private:
     void setGain(Source* source, float gain);
     void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
 
-   
+    std::unordered_map<EntityID, Source*> m_Sources;
+
 
     // OpenAL system variables
     ALCdevice* m_ALCdevice = nullptr;
@@ -109,7 +109,7 @@ private:
     float m_BGMVolumeChannel = 1.0f;
     float m_SFXVolumeChannel = 1.0f;
     bool m_EditorEnabled = false;
-    EntityID m_LocalPlayer = EntityID_Invalid;
+    EntityWrapper m_LocalPlayer = EntityWrapper();
     std::default_random_engine generator;
 
     // Events

include/Game/Systems/LifetimeSystem.h

@@ -9,7 +9,9 @@ public:
     LifetimeSystem(World* world, EventBroker* eventBroker)
         : System(world, eventBroker)
         , PureSystem("Lifetime")
-    { }
+    {
+        LOG_INFO("ASDASDASSA");
+    }
 
     virtual void Update(double dt) override;
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cLifetime, double dt) override;

include/Game/Systems/SoundSystem.h

@@ -20,8 +20,9 @@ private:
     EventBroker* m_EventBroker = nullptr;
 
     // TODO: WIP Update this
-    double m_TimeSinceLastFootstep = 0.0;
+    double m_DistanceMoved = 0.0;
-    const double  m_PlayerFootstepInterval = 1.0;
+    const float m_PlayerStepLength = 1.0;
+    glm::vec3 m_LastPosition = glm::vec3();
     bool m_LeftFoot = false;
 
     EventRelay<SoundSystem, Events::PlayerSpawned> m_EPlayerSpawned;

src/Engine/Sound/SoundManager.cpp

@@ -184,14 +184,13 @@ void SoundManager::stopSound(Source* source)
 
 void SoundManager::playerJumps()
 {
-    glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer, "Physics")["Velocity"];
+    glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"];
     if (vel.y == 0) {
         Source* source = createSource("Audio/jump/jump1.wav");
         source->Type = SoundType::SFX;
-        m_Sources[createChildEmitter()] = source;
+        m_Sources[createChildEmitter(m_LocalPlayer)] = source;
         playSound(source);
     }
-
 }
 
 void SoundManager::playerStep(double dt)
@@ -199,9 +198,9 @@ void SoundManager::playerStep(double dt)
    
 }
 
-EntityID SoundManager::createChildEmitter()
+EntityID SoundManager::createChildEmitter(EntityWrapper localPlayer)
 { 
-    EntityID child = m_World->CreateEntity(m_LocalPlayer);
+    EntityID child = m_World->CreateEntity(localPlayer.ID);
     m_World->AttachComponent(child, "Transform");
     m_World->AttachComponent(child, "SoundEmitter");
     return child;
@@ -290,7 +289,7 @@ bool SoundManager::OnShoot(const Events::Shoot & e)
     //m_World->AttachComponent(emitterID, "Transform");
     //auto emitter = m_World->AttachComponent(emitterID, "SoundEmitter");
     source->Type = SoundType::SFX;
-    m_Sources[createChildEmitter()] = source;
+    m_Sources[createChildEmitter(m_LocalPlayer)] = source;
     playSound(source);
     return true;
 }
@@ -299,7 +298,7 @@ bool SoundManager::OnPlayerSpawned(const Events::PlayerSpawned & e)
 {
     if (e.PlayerID == -1) { // Local player
         m_World->AttachComponent(e.Player.ID, "Listener");
-        m_LocalPlayer = e.Player.ID;
+        m_LocalPlayer.ID = e.Player.ID;
     }
     return true;
 }
@@ -328,14 +327,14 @@ bool SoundManager::OnInputCommand(const Events::InputCommand & e)
 bool SoundManager::OnCaptured(const Events::Captured & e)
 {
     int homeTeam = (int)m_World->GetComponent(e.CapturePointID, "Team")["Team"];
-    int team = (int)m_World->GetComponent(m_LocalPlayer, "Team")["Team"];
+    int team = (int)m_World->GetComponent(m_LocalPlayer.ID, "Team")["Team"];
     Events::PlaySoundOnEntity ev;
     if (team == homeTeam) {
         ev.FilePath = "Audio/announcer/objective_achieved.wav";
     } else {
         ev.FilePath = "Audio/announcer/objective_failed.wav"; // have not been tested
     }
-    ev.EmitterID = createChildEmitter();
+    ev.EmitterID = createChildEmitter(m_LocalPlayer);
     m_EventBroker->Publish(ev);
     return false;
 }
@@ -348,7 +347,7 @@ bool SoundManager::OnPlayerDamage(const Events::PlayerDamage & e)
     int rand = dist(generator);
     Source* source = createSource("Audio/hurt/hurt" + std::to_string(rand) + ".wav");
     source->Type = SoundType::SFX;
-    m_Sources[createChildEmitter()] = source;
+    m_Sources[createChildEmitter(m_LocalPlayer)] = source;
 
     // Breathe
     std::vector<ALuint> buffers;
@@ -364,9 +363,9 @@ bool SoundManager::OnPlayerDamage(const Events::PlayerDamage & e)
 
 bool SoundManager::OnPlayerDeath(const Events::PlayerDeath & e)
 {
-    if (e.PlayerID == m_LocalPlayer) {
+    if (e.PlayerID == m_LocalPlayer.ID) {
         Events::PlaySoundOnEntity ev;
-        ev.EmitterID = createChildEmitter();
+        ev.EmitterID = createChildEmitter(m_LocalPlayer);
         ev.FilePath = "Audio/die/die2.wav"; // should random between a bunch
         m_EventBroker->Publish(ev);
     }
@@ -375,9 +374,9 @@ bool SoundManager::OnPlayerDeath(const Events::PlayerDeath & e)
 
 bool SoundManager::OnPlayerHealthPickup(const Events::PlayerHealthPickup & e)
 {
-    if (e.PlayerHealedID == m_LocalPlayer) {
+    if (e.PlayerHealedID == m_LocalPlayer.ID) {
         Events::PlaySoundOnEntity ev;
-        ev.EmitterID = createChildEmitter();
+        ev.EmitterID = createChildEmitter(m_LocalPlayer);
         ev.FilePath = "Audio/pickup/pickup2.wav";
         m_EventBroker->Publish(ev);
     }
@@ -423,7 +422,7 @@ bool SoundManager::OnResume(const Events::Resume &e)
 bool SoundManager::OnDoubleJump(const Events::DoubleJump & e)
 {
     Events::PlaySoundOnEntity ev;
-    ev.EmitterID = createChildEmitter();
+    ev.EmitterID = createChildEmitter(m_LocalPlayer);
     ev.FilePath = "Audio/jump/jump2.wav";
     m_EventBroker->Publish(ev);
     return false;
@@ -432,7 +431,7 @@ bool SoundManager::OnDoubleJump(const Events::DoubleJump & e)
 bool SoundManager::OnDashAbility(const Events::DashAbility &e)
 {
     Events::PlaySoundOnEntity ev;
-    ev.EmitterID = createChildEmitter();
+    ev.EmitterID = createChildEmitter(m_LocalPlayer);
     ev.FilePath = "Audio/jump/dash1.wav";
     m_EventBroker->Publish(ev);
     return false;

src/Game/Systems/SoundSystem.cpp

@@ -18,39 +18,32 @@ void SoundSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComp
 
 void SoundSystem::Update(double dt)
 {
-    SoundManager::Update(dt);
     playerStep(dt);
+    SoundManager::Update(dt);
 }
 
 void SoundSystem::playerStep(double dt)
 {
-    if (!m_LocalPlayer.Valid()) {
+    //if (!m_LocalPlayer.Valid()) {
-        return;
+    //    return;
-    }
+    //}
-    if (m_LocalPlayer.ID == EntityID_Invalid) {
+    //glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"];
-        return;
+    //glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"];
-    }
+    //glm::vec3 difference = pos - m_LastPosition;
-
+    //m_DistanceMoved += glm::length(difference);
-    m_TimeSinceLastFootstep += dt;
+    //bool isAirborne = vel.y != 0;
-    glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"];
+    //if (m_DistanceMoved > m_PlayerStepLength && !isAirborne) {
-    float playerSpeed = glm::length(vel);
+    //    // Player is walking
-    bool isAirborne = vel.y != 0;
+    //    if (m_TimeSinceLastFootstep * std::min<float>(playerSpeed, 2) > m_PlayerFootstepInterval) {
-    if (playerSpeed > 1 && !isAirborne) {
+    //        // Create footstep sound
-        // Player is walking
+    //        Events::PlaySoundOnEntity e;
-        if (m_TimeSinceLastFootstep * std::min<float>(playerSpeed, 2) > m_PlayerFootstepInterval) {
+    //        e.EmitterID = createChildEmitter(m_LocalPlayer);
-            // Create footstep sound
+    //        e.FilePath = m_LeftFoot ? "Audio/footstep/footstep2.wav" : "Audio/footstep/footstep3.wav";
-            Events::PlaySoundOnEntity e;
+    //        m_LeftFoot = !m_LeftFoot;
-            e.EmitterID = createChildEmitter();
+    //        m_EventBroker->Publish(e);
-            if (m_LeftFoot) {
+    //        m_TimeSinceLastFootstep = 0;
-                e.FilePath = "Audio/footstep/footstep2.wav";
+    //    }
-            } else {
+    //}
-                e.FilePath = "Audio/footstep/footstep3.wav";
-            }
-            m_LeftFoot = !m_LeftFoot;
-            m_EventBroker->Publish(e);
-            m_TimeSinceLastFootstep = 0;
-        }
-    }
 }
 
 bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
@@ -59,7 +52,7 @@ bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
         m_World->AttachComponent(e.Player.ID, "Listener");
         m_LocalPlayer = e.Player;
         Events::PlaySoundOnEntity event;
-        event.EmitterID = createChildEmitter();
+        event.EmitterID = createChildEmitter(m_LocalPlayer);
         event.FilePath = "Audio/announcer/go.wav";
         m_EventBroker->Publish(event);
         // TEMP: starts bgm