Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts: Escape-the-Dawn/GameWorld.h
2014-03-11 09:20:18 +01:00
parent 0ec0022d6a 2c4d8fde99
commit 6fec459a55
9 changed files with 465 additions and 12 deletions
@@ -93,6 +93,9 @@ void GameWorld::Initialize()
 	transform->Position = glm::vec3(10.f, 0.f, 0.f);
 	model = AddComponent<Components::Model>(ent, "Model");
 	model->ModelFile = "ship.obj";
+	soundEmitter->MaxDistance = FLT_MAX;
+	soundEmitter->ReferenceDistance = 10;
+	soundEmitter->ReferenceDistance = 0.1;

 	ent = CreateEntity();
 	transform = AddComponent<Components::Transform>(ent, "Transform");