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

Escape-the-Dawn/Components/Bounds.h

@@ -4,15 +4,14 @@
 #include "Component.h"
 #include <glm/common.hpp>
 
-
 namespace Components
 {
 
 struct Bounds : Component
 {
-		//Axis Aligned Bounding Box
-		glm::vec3 origin;
-		glm::vec3 volumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
+	//Axis Aligned Bounding Box
+	glm::vec3 Origin;
+	glm::vec3 VolumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
 };
 
 }

Escape-the-Dawn/Components/SoundEmitter.h

@@ -10,7 +10,6 @@ namespace Components
 
 struct SoundEmitter : Component
 {
-	std::string SoundFile;
 	float Volume;
 	float MaxRange;
 };