Merge branch 'FMOD'

Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Components/Listener.h

@@ -0,0 +1,19 @@
+#ifndef Components_Listener_h__
+#define Components_Listener_h__
+
+#include <string>
+#include <glm/common.hpp>
+#include "Component.h"
+
+namespace Components
+{
+
+	struct Listener : Component
+	{
+		Listener() {} 
+		
+		virtual Listener* Clone() const override { return new Listener(*this); }
+	};
+
+}
+#endif // !Components_Listener_h__

src/Components/SoundEmitter.h

@@ -7,16 +7,23 @@
 
 namespace Components
 {
-
+	
 struct SoundEmitter : Component
 {
-	SoundEmitter() : Gain(1.f), MaxDistance(1.f), ReferenceDistance(1.f), Pitch(1.f), Loop(false) {}
+	enum class SoundType
+	{
+		SOUND_3D,
+		SOUND_2D
+	};
+
+	SoundEmitter() : Gain(1.f), MaxDistance(1.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
 	float Gain;
 	float MaxDistance;
-	float ReferenceDistance;
+	float MinDistance;
 	float Pitch;
 	bool Loop;
 	std::string Path;
+	SoundType type;
 
 	virtual SoundEmitter* Clone() const override { return new SoundEmitter(*this); }
 };