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

Conflicts:
	Escape-the-Dawn/GameWorld.cpp

Escape-the-Dawn/Systems/PlayerSystem.cpp

@@ -5,11 +5,8 @@ Systems::PlayerSystem::PlayerSystem( World* world ) : System(world)
 {
 }
 
-
-
 void Systems::PlayerSystem::Update(double dt)
 {
-
 }
 
 void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
@@ -100,8 +97,6 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			else if(Euler.z > 0.f)
 				transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt,glm::vec3(0,0,-1));
 		}
-
-
 	}
 }
 

Escape-the-Dawn/Systems/RenderSystem.cpp

@@ -27,10 +27,19 @@ void Systems::RenderSystem::UpdateEntity( double dt, EntityID entity, EntityID p
 		auto model = m_CachedModels[modelComponent->ModelFile];
 		m_Renderer->AddModelToDraw(model, transformComponent->Position, transformComponent->Orientation);
 	}
+
+	// Debug draw bounds
+#ifdef DEBUG
+	auto bounds = m_World->GetComponent<Components::Bounds>(entity, "Bounds");
+	if (bounds != nullptr) {
+		glm::vec3 origin = transformComponent->Position + bounds->Origin;
+		m_Renderer->AddAABBToDraw(origin, bounds->VolumeVector);
+	}
+#endif
+
 	auto pointLightComponent = m_World->GetComponent<Components::PointLight>(entity, "PointLight");
 	if (pointLightComponent != nullptr)
 	{
-		
 		m_Renderer->AddPointLightToDraw(
 			transformComponent->Position, 
 			pointLightComponent->Specular,

Escape-the-Dawn/Systems/RenderSystem.h

@@ -9,6 +9,7 @@
 #include "Components/Model.h"
 #include "Components/Transform.h"
 #include "Components/Camera.h"
+#include "Components/Bounds.h"
 #include "Renderer.h"
 
 namespace Systems