Merge remote-tracking branch 'origin/master' into EditorUsefulness

# Conflicts:
#	include/Engine/Collision/CollidableOctreeSystem.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Systems/PlayerSystem.h
#	resources/Schema/Components/Physics.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/HealthSystem.cpp
#	src/Game/Systems/PlayerSystem.cpp
#	src/Tests/OctTreeTestGameClass.cpp

src/Engine/Rendering/Renderer.cpp

@@ -90,8 +90,7 @@ void Renderer::Draw(RenderFrame& frame)
         if (scene->ClearDepth) {
             glClear(GL_DEPTH_BUFFER_BIT);
         }
-    
-        FillDepth(*scene);
+        SortRenderJobsByDepth(*scene);
         m_PickingPass->Draw(*scene);
         m_LightCullingPass->GenerateNewFrustum(*scene);
         m_LightCullingPass->FillLightList(*scene);
@@ -138,6 +137,13 @@ void Renderer::InitializeTextures()
     m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
 }
 
+
+void Renderer::SortRenderJobsByDepth(RenderScene &scene)
+{
+    //Sort all forward jobs so transparency is good.
+    scene.ForwardJobs.sort(Renderer::DepthSort);
+}
+
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
 {
     glGenTextures(1, texture);
@@ -156,21 +162,3 @@ void Renderer::InitializeRenderPasses()
     m_LightCullingPass = new LightCullingPass(this);
     m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass);
 }
-
-//Temp func
-void Renderer::FillDepth(RenderScene& scene)
-{
-    // HACK: FIX ME TOBIAS
-    /*for (auto job : scene.ForwardJobs) {
-        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
-        if(! modelJob) {
-            return;
-        }
-
-
-        glm::vec3 abspos = Transform::AbsolutePosition(modelJob->World, modelJob->Entity);
-        glm::vec3 worldpos = glm::vec3(scene.Camera->ViewMatrix() * glm::vec4(abspos, 1));
-        modelJob->Depth = worldpos.z;
-    }
-    scene.ForwardJobs.sort(Renderer::DepthSort);*/
-}