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

# Conflicts:
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

include/Engine/Rendering/RenderQueue.h

@@ -8,81 +8,14 @@
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
 #include "../Core/Entity.h"
+#include "Camera.h"
+#include "RenderJob.h"
+#include "ModelJob.h"
+#include "PointLightJob.h"
+#include "ExplosionEffectJob.h"
 
-class Model;
-class Skeleton;
-class Texture;
-class RenderQueue;
-
-//TODO: Render: Remove obsolete RenderJobs and fix standard values on variables.
-
-struct RenderJob
-{
-	friend class RenderQueue;
-
-	float Depth;
-
-protected:
-	uint64_t Hash;
-
-	virtual void CalculateHash() = 0;
-
-	bool operator<(const RenderJob& rhs)
-	{
-		return this->Hash < rhs.Hash;
-	}
-};
-
-struct ModelJob : RenderJob
-{
-	unsigned int ShaderID = 0;
-	unsigned int TextureID = 0;
-
-    //TODO: RENDERER: Not sure if the best solution for pickingColor to entity link is this
-    EntityID Entity;
-
-	glm::mat4 ModelMatrix;
-	const Texture* DiffuseTexture;
-	const Texture* NormalTexture;
-	const Texture* SpecularTexture;
-	float Shininess = 0.f;
-	glm::vec4 Color;
-	const Model* Model = nullptr;
-	unsigned int StartIndex = 0;
-	unsigned int EndIndex = 0;
-
-	// Animation
-	Skeleton* Skeleton = nullptr;
-	bool NoRootMotion = true;
-	std::string AnimationName;
-	double AnimationTime = 0;
-
-	void CalculateHash() override
-	{
-		Hash = TextureID;
-	}
-};
-
-// Cool Death Animation
-struct ExplosionEffectJob : ModelJob
-{
-    glm::vec3 ExplosionOrigin;
-    double TimeSinceDeath = 0.f; //Seconds
-    double ExplosionDuration = 2.f;
-    //bool Gravity = true;
-    //double GravityForce = 1.f; // Speed
-    //double ObjectRadius = 2.f; // TODO: Change this for object radius when it's available
-    glm::vec4 EndColor;
-    bool Randomness = false;
-    std::array<float, 20> RandomNumbers;
-    float RandomnessScalar = 1.f;
-    glm::vec2 Velocity;
-    bool ColorByDistance = false;
-    //bool ReverseAnimation = false;
-    //bool Wireframe = false;
-    bool ExponentialAccelaration = false;
-};
 
+/*
 struct SpriteJob : RenderJob
 {
 	unsigned int ShaderID = 0;
@@ -102,73 +35,65 @@ struct SpriteJob : RenderJob
 
 struct PointLightJob : RenderJob
 {
-	glm::vec3 Position;
-	glm::vec3 SpecularColor = glm::vec3(1, 1, 1);
-	glm::vec3 DiffuseColor = glm::vec3(1, 1, 1);
-	float Radius = 1.f;
-    float Intensity = 0.8f;
+    glm::vec4 Position;
+	glm::vec4 Color;
+	float Radius;
+    float Intensity;
+    float Falloff;
+    float padding = 123;
 
 	void CalculateHash() override
 	{
 		Hash = 0;
 	}
 };
+*/
 
-class RenderQueue
+struct RenderScene
 {
-public:
-	template <typename T>
-	void Add(T &job)
-	{
-		job.CalculateHash();
-		Jobs.push_back(std::shared_ptr<T>(new T(job)));
-		m_Size++;
-	}
-
-	void Sort()
-	{
-		Jobs.sort();
-	}
+    ::Camera* Camera;
+    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
+    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
+    Rectangle Viewport;
 
 	void Clear()
 	{
-		Jobs.clear();
-		m_Size = 0;
+        ForwardJobs.clear();
+        PointLightJobs.clear();
 	}
-
-	int Size() const { return m_Size; }
-	std::list<std::shared_ptr<RenderJob>>::const_iterator begin()
-	{
-		return Jobs.begin();
-	}
-
-	std::list<std::shared_ptr<RenderJob>>::const_iterator end()
-	{
-		return Jobs.end();
-	}
-
-	std::list<std::shared_ptr<RenderJob>> Jobs;
-
-private:
-	int m_Size = 0;
 };
 
-struct RenderQueueCollection
+struct RenderFrame
 {
-	RenderQueue Forward;
-	RenderQueue Lights;
+public:
 
-	void Clear()
-	{
-		Forward.Clear();
-		Lights.Clear();
-	}
+    void Add(RenderScene &scene)
+    {
+        RenderScenes.push_back(std::shared_ptr<RenderScene>(new RenderScene(scene)));
+        m_Size++;
+    }
 
-	void Sort()
-	{
-		Forward.Sort();
-		Lights.Sort();
-	}
+    void Clear()
+    {
+        RenderScenes.clear();
+        m_Size = 0;
+    }
+
+    int Size() const { return m_Size; }
+    std::list<std::shared_ptr<RenderScene>>::const_iterator begin()
+    {
+        return RenderScenes.begin();
+    }
+
+    std::list<std::shared_ptr<RenderScene>>::const_iterator end()
+    {
+        return RenderScenes.end();
+    }
+
+    std::list<std::shared_ptr<RenderScene>> RenderScenes;
+    
+private:
+    int m_Size = 0;
 };
 
 #endif