Added Component to bricks to emitt sound. Improved code for playing a sound

include/Core/Engine.h

@@ -18,6 +18,7 @@
 
 #include <string>
 #include <sstream>
+#include <Sound/CCollisionSound.h>
 
 #include "ResourceManager.h"
 #include "OBJ.h"
@@ -37,6 +38,7 @@
 #include "Rendering/CPointLight.h"
 #include "Transform/TransformSystem.h"
 #include "Sound/SoundSystem.h"
+#include "Sound/CCollisionSound.h"
 #include "Game/LevelSystem.h"
 #include "Game/PadSystem.h"
 #include "Game/CBall.h"
@@ -76,6 +78,7 @@ public:
 		m_World->ComponentFactory.Register<Components::Model>();
 		m_World->ComponentFactory.Register<Components::Template>();
 
+		m_World->ComponentFactory.Register<Components::CollisionSound>();
 		m_World->SystemFactory.Register<Systems::SoundSystem>([this]() { return new Systems::SoundSystem(m_World.get(), m_EventBroker); });
 		m_World->AddSystem<Systems::SoundSystem>();
 

include/Game/LevelSystem.h

@@ -23,6 +23,7 @@
 #include "Physics/CCircleShape.h"
 #include "Physics/ESetImpulse.h"
 #include "Physics/EContact.h"
+#include "Sound/CCollisionSound.h"
 #include <fstream>
 #include <iostream>
 #include <intrin.h>

include/Sound/CCollisionSound.h

@@ -0,0 +1,25 @@
+//
+// Created by Adam on 2015-09-17.
+//
+
+#ifndef COMPONENTS_CCOLLISIONSOUND_H__
+#define COMPONENTS_CCOLLISIONSOUND_H__
+
+#include "Core/Component.h"
+
+namespace dd
+{
+
+namespace Components
+{
+
+struct CollisionSound : public Component
+{
+    std::string filePath;
+};
+
+}
+
+}
+
+#endif

include/Sound/SoundSystem.h

@@ -28,9 +28,11 @@
 #include "Sound/EPlaySFX.h"
 #include "Physics/EContact.h"
 #include "Core/EventBroker.h"
-#include <Game/CBall.h>
+#include "Game/CBall.h"
-#include <Game/CBrick.h>
+#include "Game/CBrick.h"
-#include <Game/CPad.h>
+#include "Game/CPad.h"
+#include "Sound/CCollisionSound.h"
+
 
 namespace dd
 {

src/game/Game/LevelSystem.cpp

@@ -111,6 +111,11 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe
     transform->Scale = glm::vec3(1.6, 0.35, 0.5);
     transform->Position = glm::vec3(x - 7, y + 1, -10.f);
     cBrick->Score = 10 * num;
+
+    //sound
+    auto collisionSound = m_World->AddComponent<Components::CollisionSound>(brick);
+    collisionSound->filePath = "Sounds/Brick/shortbrickbreak.wav";
+
     m_World->CommitEntity(brick);
     return;
 }

src/game/Sound/SoundSystem.cpp

@@ -78,7 +78,21 @@ bool dd::Systems::SoundSystem::OnKeyDown(const dd::Events::KeyDown &event)
 
 bool dd::Systems::SoundSystem::OnContact(const dd::Events::Contact &event)
 {
-    int localBallEntID = 0;
+    auto collisionSound = m_World->GetComponent<Components::CollisionSound>(event.Entity1);
+    if (collisionSound == NULL) {
+        collisionSound = m_World->GetComponent<Components::CollisionSound>(event.Entity2);
+        if (collisionSound == NULL) {
+            return false;
+        }
+    }
+
+    dd::Events::PlaySFX e;
+    e.path = collisionSound->filePath;
+    EventBroker->Publish(e);
+    return true;
+
+
+    /*int localBallEntID = 0;
     //Make sure a ball is colliding
     auto ball = m_World->GetComponent<Components::Ball>(event.Entity1);
     if (ball == NULL) {
@@ -117,7 +131,7 @@ bool dd::Systems::SoundSystem::OnContact(const dd::Events::Contact &event)
         e.path = "Sounds/Metal/impact.wav";
         EventBroker->Publish(e);
         return true;
-    }
+    }*/
 }
 
 ALuint dd::Systems::SoundSystem::CreateSource()