BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #88 from teamfisk/Sound

Browse Source 
Sound
This commit is contained in:
verysecrethero
2016-02-10 14:14:47 +01:00
parent 645ee9013a c2128790af
commit 1ebe174b94
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/PlayerMovementSystem.cpp
+3 -4
View File
@@ -187,13 +187,12 @@ void PlayerMovementSystem::playerStep(double dt)
} }
// Position of the local player, used see how far a player has moved. // Position of the local player, used see how far a player has moved.
glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"]; glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"];
// Velocity of the local player, used to see if a player is airborne. // Used to see if a player is airborne.
glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"]; bool grounded = (bool)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["IsOnGround"];
m_DistanceMoved += glm::length(pos - m_LastPosition); m_DistanceMoved += glm::length(pos - m_LastPosition);
// Set the last position for next iteration // Set the last position for next iteration
m_LastPosition = pos; m_LastPosition = pos;
bool isAirborne = vel.y != 0; if (m_DistanceMoved > m_PlayerStepLength && grounded) {
if (m_DistanceMoved > m_PlayerStepLength && !isAirborne) {
// Player moved a step's distance // Player moved a step's distance
// Create footstep sound // Create footstep sound
Events::PlaySoundOnEntity e; Events::PlaySoundOnEntity e;
src/Game/Systems/SoundSystem.cpp
+2 -2
View File
@@ -69,8 +69,8 @@ bool SoundSystem::OnInputCommand(const Events::InputCommand & e)
void SoundSystem::playerJumps() void SoundSystem::playerJumps()
{ {
glm::vec3 vel = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["Velocity"]; bool grounded = (bool)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["IsOnGround"];
if (vel.y == 0) { if (grounded) {
Events::PlaySoundOnEntity e; Events::PlaySoundOnEntity e;
e.EmitterID = m_LocalPlayer.ID; e.EmitterID = m_LocalPlayer.ID;
e.FilePath = "Audio/jump/jump1.wav"; e.FilePath = "Audio/jump/jump1.wav";