Merge remote-tracking branch 'origin/Sound+Particles'

Conflicts: src/GameWorld.cpp
2014-06-04 04:24:10 +02:00
parent e11f656b3d 9f1d5206bd
commit 9813e9a058
10 changed files with 112 additions and 35 deletions
@@ -10,13 +10,14 @@ namespace Components
 	
 struct SoundEmitter : Component
 {
+
 	enum class SoundType
 	{
 		SOUND_3D,
 		SOUND_2D
 	};

-	SoundEmitter() : Gain(1.f), MaxDistance(1.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
+	SoundEmitter() : Gain(1.f), MaxDistance(10000.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
 	float Gain;
 	float MaxDistance;
 	float MinDistance;