Functioning basic renderer for models

include/Engine/Rendering/IRenderer.h

@@ -6,6 +6,7 @@
 #include "../Core/Util/Rectangle.h"
 #include "Camera.h"
 #include "RenderQueue.h"
+#include "Model.h"
 
 class IRenderer
 {

include/Engine/Rendering/RenderQueue.h

@@ -13,6 +13,8 @@ class Skeleton;
 class Texture;
 class RenderQueue;
 
+//TODO: Render: Remove obsolete RenderJobs and fix standard values on variables.
+
 struct RenderJob
 {
 	friend class RenderQueue;

include/Engine/Rendering/Renderer.h

@@ -5,6 +5,8 @@
 
 #include "IRenderer.h"
 #include "ShaderProgram.h"
+//TODO: Temp resourceManager
+#include "../Core/ResourceManager.h"
 
 class Renderer : public IRenderer
 {
@@ -13,10 +15,18 @@ public:
 	virtual void Draw(RenderQueueCollection& rq) override;
 
 private:
+	//----------------------Variables----------------------//
+	RenderQueueCollection m_TempRQ;
+	Texture* m_ErrorTexture;
+
+	//----------------------Functions----------------------//
 	void InitializeWindow();
 	void InitializeShaders();
+	//TODO: Render: Remove ModelsToDraw from Renderer.
+	void ModelsToDraw();
+	void EnqueueModel(Model* model);
 
-
+	//--------------------ShaderPrograms-------------------//
 	ShaderProgram m_BasicForwardProgram;
 };
 

include/Engine/Rendering/ShaderProgram.h

@@ -1,17 +1,7 @@
 
-#include <string>
-
-#include "../Core/Util/Logging.h"
-// OpenGL
-#include <GL/glew.h>
-#define GLFW_INCLUDE_GLU
-#include <GLFW/glfw3.h>
-#include <glext.h>
-#include "Util/GLError.h"
-
+#include "../Common.h"
+#include "../OpenGL.h"
 #include <fstream>
-#include <vector>
-
 
 class Shader
 {