Merge branch 'developer' into feature/Skybox

# Conflicts: # CrystalPoint.vcxproj.filters # World.h
2016-06-09 13:03:28 +02:00
parent af681b0223 0aad7262d6
commit 579e02728a
29 changed files with 2764 additions and 11 deletions
@@ -8,7 +8,8 @@
 #include <iostream>
 #include "WorldHandler.h"

-World::World(const std::string &fileName)
+World::World(const std::string &fileName):
+	music_id(-1)
 {
 	//Store player instance
 	player = Player::getInstance();
@@ -152,6 +153,15 @@ World::World(const std::string &fileName)

 		crystals.push_back(new Crystal(e["file"].asString(), position, rotation, scale));
 	}
+
+	if (!v["world"]["music"].isNull())
+	{
+		music_id = CrystalPoint::GetSoundSystem().LoadSound(v["world"]["music"].asString().c_str(), true);
+		Sound* music = CrystalPoint::GetSoundSystem().GetSound(music_id);
+		music->SetPos(Vec3f(), Vec3f());
+		music->Play();
+	}
+
 }