Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

2015-09-21 13:27:54 +02:00
parent 460c7042bf 2a4c7c8b1a
commit dbb04c83af
25 changed files with 2844 additions and 6 deletions
@@ -112,6 +112,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;
 }