Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

# Conflicts:
#	include/Engine/Collision/Collision.h
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RawModelAssimp.cpp

src/Engine/Rendering/Camera.cpp

@@ -50,6 +50,18 @@ void Camera::SetOrientation(glm::quat val)
 	UpdateViewMatrix();
 }
 
+
+void Camera::SetProjectionMatrix(glm::mat4 val)
+{
+    m_ProjectionMatrix = val;
+}
+
+
+void Camera::SetViewMatrix(glm::mat4 val)
+{
+    m_ViewMatrix = val;
+}
+
 //void Camera::Pitch(float val)
 //{
 //	m_Pitch = val;
@@ -64,15 +76,6 @@ void Camera::SetOrientation(glm::quat val)
 
 void Camera::UpdateProjectionMatrix()
 {
-//	m_ProjectionMatrix = glm::ortho(
-//		-16.f,
-//		16.f,
-//		-9.f,
-//		9.f,
-//		m_NearClip,
-//		m_FarClip
-//		);
-
 	m_ProjectionMatrix = glm::perspective(m_FOV, m_AspectRatio, m_NearClip, m_FarClip);
 }
 

src/Engine/Rendering/DrawFinalPass.cpp

@@ -0,0 +1,66 @@
+#include "Rendering/DrawFinalPass.h"
+
+DrawFinalPass::DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass)
+{
+    m_Renderer = renderer;
+    m_LightCullingPass = lightCullingPass;
+    InitializeTextures();
+    InitializeShaderPrograms();
+}
+
+void DrawFinalPass::InitializeTextures()
+{
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+}
+
+void DrawFinalPass::InitializeShaderPrograms()
+{
+    m_ForwardPlusProgram = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram");
+    m_ForwardPlusProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ForwardPlus.vert.glsl")));
+    m_ForwardPlusProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/ForwardPlus.frag.glsl")));
+    m_ForwardPlusProgram->Compile();
+    m_ForwardPlusProgram->Link();
+}
+
+void DrawFinalPass::Draw(RenderScene& scene)
+{
+    GLERROR("DrawFinalPass::Draw: Pre");
+
+    DrawFinalPassState state;
+    m_ForwardPlusProgram->Bind();
+    GLuint shaderHandle = m_ForwardPlusProgram->GetHandle();
+
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightCullingPass->LightSSBO());
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO());
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO());
+
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ViewMatrix()));
+    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ProjectionMatrix()));
+    glUniform2f(glGetUniformLocation(shaderHandle, "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+
+    //TODO: Render: Add code for more jobs than modeljobs.
+    for (auto &job : scene.ForwardJobs) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+        if(modelJob) {
+            //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
+            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
+
+            if(modelJob->DiffuseTexture != nullptr) {
+                glActiveTexture(GL_TEXTURE0);
+                glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture->m_Texture);
+            } else {
+                glActiveTexture(GL_TEXTURE0);
+                glBindTexture(GL_TEXTURE_2D, m_WhiteTexture->m_Texture);
+            }
+
+            glBindVertexArray(modelJob->Model->VAO);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, 0, modelJob->StartIndex);
+
+            continue;
+        }
+    }
+    GLERROR("DrawFinalPass::Draw: END");
+
+}

src/Engine/Rendering/DrawFinalPassState.cpp

@@ -0,0 +1,18 @@
+#include "Rendering/DrawFinalPassState.h"
+
+
+DrawFinalPassState::DrawFinalPassState()
+{
+    BindFramebuffer(0);
+    Enable(GL_BLEND);
+    BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    Enable(GL_DEPTH_TEST);
+    Enable(GL_CULL_FACE);
+    ClearColor(glm::vec4(200.f / 255, 0.f / 255, 200.f / 255, 0.f));
+    Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
+
+DrawFinalPassState::~DrawFinalPassState()
+{
+
+}

src/Engine/Rendering/DrawScenePass.cpp

@@ -14,36 +14,31 @@ void DrawScenePass::InitializeTextures()
 
 void DrawScenePass::InitializeShaderPrograms()
 {
-    //Gör så att shaders är en resource, tex som texture classen. Konstruktorn måste vara privat.
     m_BasicForwardProgram = ResourceManager::Load<ShaderProgram>("#BasicForwardProgram");
 
     m_BasicForwardProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/BasicForward.vert.glsl")));
     m_BasicForwardProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/BasicForward.frag.glsl")));
     m_BasicForwardProgram->Compile();
     m_BasicForwardProgram->Link();
-
-
 }
 
-void DrawScenePass::Draw(RenderQueueCollection& rq)
+void DrawScenePass::Draw(RenderScene& scene)
 {
     //glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    GLERROR("Renderer::Draw PickingPass");
+    GLERROR("DrawScenePass::Draw: Pre");
 
-    DrawScenePassState state;
+    DrawScenePassState state = DrawScenePassState();
+    m_BasicForwardProgram->Bind();
 
-
-    //TODO: Render: Add code for more jobs than modeljobs.
-    for (auto &job : rq.Forward) {
+    for (auto &job : scene.ForwardJobs) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
         if (modelJob) {
             GLuint ShaderHandle = m_BasicForwardProgram->GetHandle();
 
-            m_BasicForwardProgram->Bind();
             //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->ModelMatrix));
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ProjectionMatrix()));
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));            
             glUniform4fv(glGetUniformLocation(ShaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
 
             //TODO: Renderer: bättre textur felhantering samt fler texturer stöd
@@ -59,8 +54,9 @@ void DrawScenePass::Draw(RenderQueueCollection& rq)
             glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
             glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, 0, modelJob->StartIndex);
 
-            continue;
+            //continue;
         }
+    
     }
-    GLERROR("DrawScene Error");
+    GLERROR("DrawScenePass::Draw: End");
 }

src/Engine/Rendering/DrawScenePassState.cpp

@@ -8,8 +8,10 @@ DrawScenePassState::DrawScenePassState()
     GLERROR("---");
     Enable(GL_DEPTH_TEST);
     Enable(GL_CULL_FACE);
-    ClearColor(glm::vec4(255.f / 255, 163.f / 255, 176.f / 255, 0.f));
-    Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    Enable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+   // ClearColor(glm::vec4(255.f / 255, 163.f / 255, 176.f / 255, 0.f));
+   // Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 }
 
 DrawScenePassState::~DrawScenePassState()

src/Engine/Rendering/DummyRenderer.cpp

@@ -39,17 +39,10 @@ void DummyRenderer::Initialize()
 		exit(EXIT_FAILURE);
 	}
 
-	// Create default camera
-	m_DefaultCamera = new ::Camera((float)m_Resolution.Width / m_Resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
-	m_DefaultCamera->SetPosition(glm::vec3(0, 0, 0));
-	if (m_Camera == nullptr) {
-		m_Camera = m_DefaultCamera;
-	}
-
 	glfwSwapInterval(m_VSYNC);
 }
 
-void DummyRenderer::Draw(RenderQueueCollection& rq)
+void DummyRenderer::Draw(RenderFrame& rq)
 {
 	glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 0.f);
 	glClear(GL_COLOR_BUFFER_BIT);

src/Engine/Rendering/LightCullingPass.cpp

@@ -0,0 +1,151 @@
+#include "Rendering/LightCullingPass.h"
+
+LightCullingPass::LightCullingPass(IRenderer* renderer)
+{
+    m_Renderer = renderer;
+    SetSSBOSizes();
+    InitializeSSBOs();
+    InitializeShaderPrograms();
+    //GenerateNewFrustum(TODO);
+}
+
+LightCullingPass::~LightCullingPass()
+{
+
+}
+
+void LightCullingPass::GenerateNewFrustum(RenderScene& scene)
+{
+    if (scene.PointLightJobs.size() == 0)
+        return;
+
+    GLERROR("CalculateFrustum Error: Pre");
+
+    m_CalculateFrustumProgram->Bind();
+
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
+    glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "P"), 1, false, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+    glDispatchCompute((int)(m_Renderer->Resolution().Width/(TILE_SIZE*TILE_SIZE) + 1), (int)(m_Renderer->Resolution().Height/(TILE_SIZE*TILE_SIZE) + 1), 1);
+
+    GLERROR("CalculateFrustum Error: End");
+}
+
+
+void LightCullingPass::OnResolutionChange()
+{
+    SetSSBOSizes();
+}
+
+
+void LightCullingPass::SetSSBOSizes()
+{
+    m_NumberOfTiles = (int)(m_Renderer->Resolution().Width*m_Renderer->Resolution().Height)/TILE_SIZE;
+
+    //m_Frustums = new Frustum[s];
+    //m_LightGrid = new LightGrid[s];
+    //m_LightIndex = new float[s*200];
+
+    m_Frustums = new Frustum[m_NumberOfTiles];
+    m_LightGrid = new LightGrid[m_NumberOfTiles];
+    m_LightIndex = new float[m_NumberOfTiles*MAX_LIGHTS_PER_TILE];
+}
+
+void LightCullingPass::CullLights(RenderScene& scene)
+{
+    GLERROR("CullLights Error: Pre");
+    m_LightOffset = 0;
+
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightOffsetSSBO);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightOffset), &m_LightOffset, GL_DYNAMIC_COPY);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightSSBO);
+    if (m_PointLights.size() > 0) {
+        glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(PointLight) * m_PointLights.size(), &(m_PointLights[0]), GL_DYNAMIC_COPY);
+    } else {
+        GLfloat zero = 0.f;
+        glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(GLfloat), &zero , GL_DYNAMIC_COPY);
+    }
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+
+    m_LightCullProgram->Bind();
+    glUniform2f(glGetUniformLocation(m_LightCullProgram->GetHandle(), "ScreenDimensions"), m_Renderer->Resolution().Width, m_Renderer->Resolution().Height);
+    glUniformMatrix4fv(glGetUniformLocation(m_LightCullProgram->GetHandle(), "V"), 1, false, glm::value_ptr(scene.Camera->ViewMatrix()));
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightSSBO);
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightGridSSBO);
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, m_LightOffsetSSBO);
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightIndexSSBO);
+    glDispatchCompute(m_Renderer->Resolution().Width / TILE_SIZE, m_Renderer->Resolution().Height / TILE_SIZE, 1);
+
+    GLERROR("CullLights Error: End");
+}
+
+void LightCullingPass::FillLightList(RenderScene& scene)
+{
+    m_PointLights.clear();
+
+    for(auto &job : scene.PointLightJobs) {
+        auto pointLightjob = std::dynamic_pointer_cast<PointLightJob>(job);
+        if (pointLightjob) {
+            PointLight p;
+            p.Color = pointLightjob->Color;
+            p.Falloff = pointLightjob->Falloff;
+            p.Intensity = pointLightjob->Intensity;
+            p.Position = glm::vec4(glm::vec3(pointLightjob->Position), 1.f);
+            p.Radius = pointLightjob->Radius;
+            p.Padding = 123.f;
+            m_PointLights.push_back(p);
+            continue;
+        }
+    }
+}
+
+void LightCullingPass::InitializeSSBOs()
+{
+    glGenBuffers(1, &m_FrustumSSBO);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_FrustumSSBO);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(Frustum)*m_NumberOfTiles, m_Frustums, GL_DYNAMIC_COPY);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    GLERROR("m_FrustumSSBO");
+
+    glGenBuffers(1, &m_LightSSBO);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightSSBO);
+    if(m_PointLights.size() > 0) {
+        glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(PointLight) * m_PointLights.size(), &(m_PointLights[0]), GL_DYNAMIC_COPY);
+    }
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    GLERROR("m_LightSSBO");
+
+    glGenBuffers(1, &m_LightGridSSBO);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightGridSSBO);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(LightGrid)*m_NumberOfTiles, m_LightGrid, GL_DYNAMIC_COPY);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    GLERROR("m_LightGridSSBO");
+
+
+    glGenBuffers(1, &m_LightOffsetSSBO);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightOffsetSSBO);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightOffset), &m_LightOffset, GL_DYNAMIC_COPY);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    GLERROR("m_LightOffsetSSBO");
+
+    glGenBuffers(1, &m_LightIndexSSBO);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightIndexSSBO);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(float)*m_NumberOfTiles*MAX_LIGHTS_PER_TILE, m_LightIndex, GL_DYNAMIC_COPY);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    GLERROR("m_LightIndexSSBO");
+}
+
+void LightCullingPass::InitializeShaderPrograms()
+{
+    m_CalculateFrustumProgram = ResourceManager::Load<ShaderProgram>("#CalculateFrustumProgram");
+    m_CalculateFrustumProgram->AddShader(std::shared_ptr<Shader>(new ComputeShader("Shaders/GridFrustum.comp.glsl")));
+    m_CalculateFrustumProgram->Compile();
+    m_CalculateFrustumProgram->Link();
+
+    m_LightCullProgram = ResourceManager::Load<ShaderProgram>("#LightCullProgram");
+    m_LightCullProgram->AddShader(std::shared_ptr<Shader>(new ComputeShader("Shaders/CullLights.comp.glsl")));
+    m_LightCullProgram->Compile();
+    m_LightCullProgram->Link();
+}
+

src/Engine/Rendering/Model.cpp

@@ -1,52 +1,66 @@
 #include "Rendering/Model.h"
 
 Model::Model(std::string fileName)
-	: RawModel(fileName)
 {
-	// Generate GL buffers
-	GLuint buffer;
-	glGenBuffers(1, &buffer);
-	glBindBuffer(GL_ARRAY_BUFFER, buffer);
-	glBufferData(GL_ARRAY_BUFFER, m_Vertices.size() * sizeof(Vertex), &m_Vertices[0], GL_STATIC_DRAW);
+    //Try loading the model asyncronously, if it throws any exceptions then let it propagate back to caller.
+    m_RawModel = ResourceManager::Load<RawModel, true>(fileName);
 
-	glGenBuffers(1, &ElementBuffer);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ElementBuffer);
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_Indices.size() * sizeof(unsigned int), &m_Indices[0], GL_STATIC_DRAW);
+    for (auto& group : m_RawModel->MaterialGroups) {
+        if (!group.TexturePath.empty()) {
+            group.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(group.TexturePath));
+        }
+        if (!group.NormalMapPath.empty()) {
+            group.NormalMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(group.NormalMapPath));
+        }
+        if (!group.SpecularMapPath.empty()) {
+            group.SpecularMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(group.SpecularMapPath));
+        }
+    }
 
-	glGenVertexArrays(1, &VAO);
-	glBindVertexArray(VAO);
-	GLERROR("GLEW: BufferFail4");
+    // Generate GL buffers
+    GLuint buffer;
+    glGenBuffers(1, &buffer);
+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
+    glBufferData(GL_ARRAY_BUFFER, m_RawModel->m_Vertices.size() * sizeof(RawModel::Vertex), &m_RawModel->m_Vertices[0], GL_STATIC_DRAW);
 
-	glBindBuffer(GL_ARRAY_BUFFER, buffer);
+    glGenBuffers(1, &ElementBuffer);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ElementBuffer);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_RawModel->m_Indices.size() * sizeof(unsigned int), &m_RawModel->m_Indices[0], GL_STATIC_DRAW);
+
+    glGenVertexArrays(1, &VAO);
+    glBindVertexArray(VAO);
+    GLERROR("GLEW: BufferFail4");
+
+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
 	std::vector<int> structSizes = { 3, 3, 3, 3, 2, 4, 4 };
-	int stride = 0;
-	for (int size : structSizes) {
-		stride += size;
-	}
-	stride *= sizeof(GLfloat);
-	int offset = 0;
-	{
-		int element = 0;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * offset)); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-		glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
-	}
-	GLERROR("GLEW: BufferFail5");
+    int stride = 0;
+    for (int size : structSizes) {
+        stride += size;
+    }
+    stride *= sizeof(GLfloat);
+    int offset = 0;
+    {
+        int element = 0;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * offset)); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+        glVertexAttribPointer(element, structSizes[element], GL_FLOAT, GL_FALSE, stride, (GLvoid*)(sizeof(GLfloat) * (offset += structSizes[element - 1]))); element++;
+    }
+    GLERROR("GLEW: BufferFail5");
 
-	glEnableVertexAttribArray(0);
-	glEnableVertexAttribArray(1);
-	glEnableVertexAttribArray(2);
-	glEnableVertexAttribArray(3);
-	glEnableVertexAttribArray(4);
-	glEnableVertexAttribArray(5);
-	glEnableVertexAttribArray(6);
-	GLERROR("GLEW: BufferFail5");
+    glEnableVertexAttribArray(0);
+    glEnableVertexAttribArray(1);
+    glEnableVertexAttribArray(2);
+    glEnableVertexAttribArray(3);
+    glEnableVertexAttribArray(4);
+    glEnableVertexAttribArray(5);
+    glEnableVertexAttribArray(6);
+    GLERROR("GLEW: BufferFail5");
 
-	//CreateBuffers();
+    //CreateBuffers();
 }
 
 Model::~Model()

src/Engine/Rendering/PickingPass.cpp

@@ -43,70 +43,109 @@ void PickingPass::InitializeShaderPrograms()
     m_PickingProgram->Link();
 }
 
-void PickingPass::Draw(RenderQueueCollection& rq)
+void PickingPass::Draw(RenderScene& scene)
 {
-    m_PickingColorsToEntity.clear();
     PickingPassState* state = new PickingPassState(m_PickingBuffer.GetHandle());
 
-    int r = 0;
-    int g = 0;
+    
     //TODO: Render: Add code for more jobs than modeljobs.
 
     GLuint ShaderHandle = m_PickingProgram->GetHandle();
     m_PickingProgram->Bind();
 
-    std::map<EntityID, glm::vec2> entityColors;
+    
 
-    for (auto &job : rq.Forward) {
-        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+        m_Camera = scene.Camera;
 
-        if (modelJob) {
-            int pickColor[2] = { r, g };
-            auto color = entityColors.find(modelJob->Entity);
-            if (color != entityColors.end()) {
-                pickColor[0] = color->second[0];
-                pickColor[1] = color->second[1];
-            } else {
-                entityColors[modelJob->Entity] = glm::vec2(pickColor[0], pickColor[1]);
-                if (r + 10 > 255) {
-                    r = 0;
-                    g += 1;
+        for (auto &job : scene.ForwardJobs) {
+            auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+
+            if (modelJob) {
+                int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
+
+                PickingInfo pickInfo;
+                pickInfo.Entity = modelJob->Entity;
+                pickInfo.World = modelJob->World;
+                pickInfo.Camera = scene.Camera;
+
+                auto color = m_EntityColors.find(std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera));
+                if (color != m_EntityColors.end()) {
+                    pickColor[0] = color->second[0];
+                    pickColor[1] = color->second[1];
                 } else {
-                    r += 1;
+                    m_EntityColors[std::make_tuple(pickInfo.Entity, pickInfo.World, pickInfo.Camera)] = glm::ivec2(pickColor[0], pickColor[1]);
+                    if (m_ColorCounter[0] > 255) {
+                        m_ColorCounter[0] = 0;
+                        m_ColorCounter[1]++;;
+                    } else {
+                        m_ColorCounter[0]++;;
+                    }
                 }
-            }
-            m_PickingColorsToEntity[glm::vec2(pickColor[0], pickColor[1])] = modelJob->Entity;
-            
-            //Render picking stuff
-            //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->ModelMatrix));
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ViewMatrix()));
-            glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ProjectionMatrix()));
-            glUniform2fv(glGetUniformLocation(ShaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-            glBindVertexArray(modelJob->Model->VAO);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
-            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex);
+                m_PickingColorsToEntity[glm::ivec2(pickColor[0], pickColor[1])] = pickInfo;
+
+                glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
+                glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
+                glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
+                glUniform2fv(glGetUniformLocation(ShaderHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
+
+                glBindVertexArray(modelJob->Model->VAO);
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
+                glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex);
+            }
         }
-    }
+    
+    
     m_PickingBuffer.Unbind();
     GLERROR("PickingPass Error");
 
-    //Publish pick event every frame with the pick data that can be picked by the event
+
+    delete state;
+}
+
+
+
+void PickingPass::ClearPicking()
+{
+    m_PickingColorsToEntity.clear();
+    m_EntityColors.clear();
+    m_ColorCounter[0] = 1;
+    m_ColorCounter[1] = 0;
+
+    m_PickingBuffer.Bind();
+    glClearColor(0.f, 0.f, 0.f, 0.f);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    m_PickingBuffer.Unbind();
+}
+
+PickData PickingPass::Pick(glm::vec2 screenCoord)
+{
     int fbWidth;
     int fbHeight;
     glfwGetFramebufferSize(m_Renderer->Window(), &fbWidth, &fbHeight);
-    Events::Picking pickEvent = Events::Picking(
-        &m_PickingBuffer,
-        &m_DepthBuffer,
-        m_Renderer->Camera()->ProjectionMatrix(),
-        m_Renderer->Camera()->ViewMatrix(),
-        Rectangle(fbWidth, fbHeight),
-        &m_PickingColorsToEntity);
 
-    m_EventBroker->Publish(pickEvent);
+    Rectangle resolution = Rectangle(fbWidth, fbHeight);
+    PickData pickData;
+    // Invert screen y coordinate
+    screenCoord.y = resolution.Height - screenCoord.y;
+    ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, &m_PickingBuffer, m_DepthBuffer);
+    pickData.Depth = data.Depth;
 
-    delete state;
+    PickingInfo pickInfo;
+
+    auto it = m_PickingColorsToEntity.find(glm::ivec2(data.Color[0], data.Color[1]));
+    if (it != m_PickingColorsToEntity.end()) {
+        pickInfo = it->second;
+    } else {
+        pickData.Entity = EntityID_Invalid;
+        return pickData;
+    }
+
+    pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, resolution, pickInfo.Camera->ProjectionMatrix(), pickInfo.Camera->ViewMatrix());
+    pickData.Entity = pickInfo.Entity;
+    pickData.Camera = pickInfo.Camera;
+    pickData.World = pickInfo.World;
+    return pickData;
 }
 
 void PickingPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const

src/Engine/Rendering/PickingPassState.cpp

@@ -10,8 +10,8 @@ PickingPassState::PickingPassState(GLuint frameBuffer)
     Enable(GL_CULL_FACE);
 
     glm::vec4 clearColor = glm::vec4(0.f);
-    ClearColor(clearColor);
-    Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    //ClearColor(clearColor);
+    //Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 }
 
 PickingPassState::~PickingPassState()

src/Engine/Rendering/RawModelAssimp.cpp

@@ -75,6 +75,9 @@ RawModel::RawModel(std::string fileName)
 				desc.TextureCoords = glm::vec2(uv.x, uv.y);
 			}
 
+
+			desc.DiffuseVertexColor = glm::vec4(diffuse.r, diffuse.g, diffuse.b, opacity);
+            
 			m_Vertices.push_back(desc);
 		}
 
@@ -123,6 +126,7 @@ RawModel::RawModel(std::string fileName)
 		matGroup.EndIndex = m_Indices.size() - 1;
 		// Material shininess
 		material->Get(AI_MATKEY_SHININESS, matGroup.Shininess);
+        material->Get(AI_MATKEY_OPACITY, matGroup.Transparency);
 		//LOG_DEBUG("Shininess: %f", matGroup.Shininess);
 		// Diffuse texture
 		//LOG_DEBUG("%i diffuse textures found", material->GetTextureCount(aiTextureType_DIFFUSE));
@@ -130,9 +134,7 @@ RawModel::RawModel(std::string fileName)
 			aiString path;
 			aiTextureMapping mapping;
 			material->GetTexture(aiTextureType_DIFFUSE, 0, &path, &mapping);
-			std::string absolutePath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
-			//LOG_DEBUG("Diffuse texture: %s", absolutePath.c_str());
-			matGroup.Texture = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(absolutePath));
+			matGroup.TexturePath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
 		}
 		// Normal map
 		//LOG_DEBUG("%i normal maps found", material->GetTextureCount(aiTextureType_HEIGHT));
@@ -140,9 +142,7 @@ RawModel::RawModel(std::string fileName)
 			aiString path;
 			aiTextureMapping mapping;
 			material->GetTexture(aiTextureType_HEIGHT, 0, &path, &mapping);
-			std::string absolutePath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
-			//LOG_DEBUG("Normal map: %s", absolutePath.c_str());
-			matGroup.NormalMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(absolutePath));
+            matGroup.NormalMapPath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
 		}
 		// Specular map
 		//LOG_DEBUG("%i specular maps found", material->GetTextureCount(aiTextureType_SPECULAR));
@@ -150,11 +150,9 @@ RawModel::RawModel(std::string fileName)
 			aiString path;
 			aiTextureMapping mapping;
 			material->GetTexture(aiTextureType_SPECULAR, 0, &path, &mapping);
-			std::string absolutePath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
-			//LOG_DEBUG("Specular map: %s", absolutePath.c_str());
-			matGroup.SpecularMap = std::shared_ptr<Texture>(ResourceManager::Load<Texture>(absolutePath));
+            matGroup.SpecularMapPath = (boost::filesystem::path(fileName).branch_path() / path.C_Str()).string();
 		}
-		TextureGroups.push_back(matGroup);
+		MaterialGroups.push_back(matGroup);
 
 		// Bones
 		std::map<int, std::vector<std::tuple<int, float>>> vertexWeights;

src/Engine/Rendering/RenderQueueFactory.cpp

@@ -1,116 +0,0 @@
-#include "Rendering/RenderQueueFactory.h"
-
-
-RenderQueueFactory::RenderQueueFactory()
-{
-    m_RenderQueues = RenderQueueCollection();
-}
-
-void RenderQueueFactory::Update(World* world)
-{
-    m_RenderQueues.Clear();
-    FillModels(world, &m_RenderQueues.Forward);
-    FillLights(world, &m_RenderQueues.Lights);
-}
-
-glm::mat4 RenderQueueFactory::ModelMatrix(World* world, EntityID entity)
-{
-    glm::vec3 position = AbsolutePosition(world, entity);
-    glm::quat orientation = AbsoluteOrientation(world, entity);
-    glm::vec3 scale = AbsoluteScale(world, entity);
-
-    glm::mat4 modelMatrix = glm::translate(glm::mat4(), position) * glm::toMat4(orientation) * glm::scale(scale);
-    return modelMatrix;
-}
-
-glm::vec3 RenderQueueFactory::AbsolutePosition(World* world, EntityID entity)
-{
-    glm::vec3 position;
-
-    while (entity != EntityID_Invalid) {
-        ComponentWrapper transform = world->GetComponent(entity, "Transform");
-        EntityID parent = world->GetParent(entity);
-        //if (parent != EntityID_Invalid) {
-            position += AbsoluteOrientation(world, parent) * (glm::vec3)transform["Position"];
-        //} else {
-        //    position += (glm::vec3)transform["Position"];
-        //}
-        entity = parent;
-    }
-   
-    return position;
-}
-
-glm::quat RenderQueueFactory::AbsoluteOrientation(World* world, EntityID entity)
-{
-    glm::quat orientation;
-
-    while (entity != EntityID_Invalid) {
-        ComponentWrapper transform = world->GetComponent(entity, "Transform");
-        orientation = glm::quat((glm::vec3)transform["Orientation"]) * orientation;
-        entity = world->GetParent(entity);
-    }
-    
-    return orientation;
-}
-
-glm::vec3 RenderQueueFactory::AbsoluteScale(World* world, EntityID entity)
-{
-    glm::vec3 scale(1.f);
-
-    while (entity != EntityID_Invalid) {
-        ComponentWrapper transform = world->GetComponent(entity, "Transform");
-        scale *= (glm::vec3)transform["Scale"];
-        entity = world->GetParent(entity);
-    }
-
-    return scale;
-}
-
-void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue)
-{
-    auto models = world->GetComponents("Model");
-    if (models == nullptr) {
-        return;
-    }
-
-    for (auto& modelC : *models) {
-        bool visible = modelC["Visible"];
-        if (!visible) {
-            continue;
-        }
-        std::string resource = modelC["Resource"];
-        if (resource.empty()) {
-            continue;
-        }
-        glm::vec4 color = modelC["Color"];
-        Model* model = ResourceManager::Load<Model>(resource);
-        if (model == nullptr) {
-            model = ResourceManager::Load<Model>("Models/Core/Error.obj");
-        }
-
-        for (auto texGroup : model->TextureGroups) {
-            ModelJob job;
-            job.TextureID = (texGroup.Texture) ? texGroup.Texture->ResourceID : 0;
-            job.DiffuseTexture = texGroup.Texture.get();
-            job.NormalTexture = texGroup.NormalMap.get();
-            job.SpecularTexture = texGroup.SpecularMap.get();
-            job.Model = model;
-            job.StartIndex = texGroup.StartIndex;
-            job.EndIndex = texGroup.EndIndex;
-            job.ModelMatrix = model->m_Matrix * ModelMatrix(world, modelC.EntityID);
-            job.Color = color;
-
-            //TODO: RENDERER: Not sure if the best solution for pickingColor to entity link is this
-            job.Entity = modelC.EntityID;
-
-            renderQueue->Add(job);
-        }
-    }
-}
-
-void RenderQueueFactory::FillLights(World* world, RenderQueue* renderQueue)
-{
-
-}
-

src/Engine/Rendering/RenderState.cpp

@@ -3,6 +3,7 @@
 bool RenderState::Enable(GLenum cap)
 {
     if (glIsEnabled(cap)) {
+        //LOG_WARNING("Trying to enable somthing that is already enabled.");
         return false;
     }
     m_ResetFunctions.push_back(std::bind(glDisable, cap));

src/Engine/Rendering/RenderSystem.cpp

@@ -0,0 +1,231 @@
+#include "Rendering/RenderSystem.h"
+
+RenderSystem::RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame) :ImpureSystem(eventBrokerer)
+{
+    m_Renderer = renderer;
+    m_RenderFrame = renderFrame;
+    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
+    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
+
+    m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_DebugCameraInputController = new DebugCameraInputController<RenderSystem>(eventBrokerer, -1);
+}
+
+RenderSystem::~RenderSystem()
+{
+    delete m_Camera;
+    delete m_DebugCameraInputController;
+}
+
+bool RenderSystem::OnSetCamera(const Events::SetCamera &event)
+{
+    auto cameras = m_World->GetComponents("Camera");
+
+    if (cameras != nullptr) {
+        for (auto it = cameras->begin(); it != cameras->end(); it++) {
+            if ((std::string)(*it)["Name"] == event.Name) {
+                switchCamera((*it).EntityID);
+            }
+        }
+    }
+    return true;
+}
+
+void RenderSystem::switchCamera(EntityID entity)
+{
+    if(m_World->HasComponent(entity, "Camera")) {
+
+        if (m_CurrentCamera != EntityID_Invalid) {
+            if (m_World->HasComponent(m_CurrentCamera, "Model")) {
+                m_World->GetComponent(m_CurrentCamera, "Model")["Visible"] = true;
+            }
+            if (m_World->HasComponent(m_CurrentCamera, "Listener")) {
+                m_World->DeleteComponent(m_CurrentCamera, "Listener");
+            }
+        }
+
+        if (m_World->HasComponent(entity, "Model")) {
+            m_World->GetComponent(entity, "Model")["Visible"] = false;
+        }
+        if (!m_World->HasComponent(entity, "Listener")) {
+            m_World->AttachComponent(entity, "Listener");
+        }
+        m_CurrentCamera = entity;
+        m_SwitchCamera = false;
+
+    } else {
+        LOG_ERROR("Entity %i does not have a CameraComponent", entity);
+        m_SwitchCamera = false;
+    }
+}
+
+void RenderSystem::updateProjectionMatrix(ComponentWrapper& cameraComponent)
+{
+    double fov = cameraComponent["FOV"];
+    double aspectRatio = (float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height;
+    double nearClip = cameraComponent["NearClip"];
+    double farClip = cameraComponent["FarClip"];
+
+    m_Camera->SetFOV(glm::radians(fov));
+    m_Camera->SetAspectRatio(aspectRatio);
+    m_Camera->SetNearClip(nearClip);
+    m_Camera->SetFarClip(farClip);
+    m_Camera->UpdateProjectionMatrix();
+}
+
+void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
+{
+    auto models = world->GetComponents("Model");
+    if (models == nullptr) {
+        return;
+    }
+
+    for (auto& modelComponent : *models) {
+        bool visible = modelComponent["Visible"];
+        if (!visible) {
+            continue;
+        }
+        std::string resource = modelComponent["Resource"];
+        if (resource.empty()) {
+            continue;
+        }
+
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(resource);
+        } catch (const Resource::StillLoadingException&) {
+            //continue;
+            model = ResourceManager::Load<::Model>("Models/Core/UnitRaptor.obj");
+        } catch (const std::exception&) {
+            try {
+                model = ResourceManager::Load<::Model>("Models/Core/Error.obj");
+            } catch (const std::exception&) {
+                continue;
+            }
+        }
+
+        glm::mat4 modelMatrix = Transform::ModelMatrix(modelComponent.EntityID, world);
+        for (auto matGroup : model->MaterialGroups()) {
+            std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(model, m_Camera, modelMatrix, matGroup, modelComponent, world));
+            jobs.push_back(modelJob);
+        }
+    }
+}
+
+
+void RenderSystem::fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
+{
+    auto pointLights = world->GetComponents("PointLight");
+    if (pointLights == nullptr) {
+        return;
+    }
+
+    for (auto& pointlightC : *pointLights) {
+        bool visible = pointlightC["Visible"];
+        if (!visible) {
+            continue;
+        }
+        auto transformC = world->GetComponent(pointlightC.EntityID, "Transform");
+        if (&transformC == nullptr) {
+            return;
+        }
+
+        std::shared_ptr<PointLightJob> pointLightJob = std::shared_ptr<PointLightJob>(new PointLightJob(transformC, pointlightC, m_World));
+        jobs.push_back(pointLightJob);
+    }
+}
+
+bool RenderSystem::OnInputCommand(const Events::InputCommand& e)
+{
+    if (e.Command == "SwitchCamera" && e.Value > 0) {
+        m_SwitchCamera = true;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void RenderSystem::Update(World* world, double dt)
+{
+    m_World = world;
+    m_EventBroker->Process<RenderSystem>();
+
+    updateCamera(world, dt);
+
+    //Only supports opaque geometry atm
+    m_RenderFrame->Clear();
+
+    RenderScene scene;
+    scene.Camera = m_Camera;
+    scene.Viewport = Rectangle(1280, 720);
+    fillModels(scene.ForwardJobs, world);
+    fillLight(scene.PointLightJobs, world);
+    m_RenderFrame->Add(scene);
+   
+}
+
+void RenderSystem::updateCamera(World* world, double dt)
+{
+    if (m_SwitchCamera) {
+        auto cameras = world->GetComponents("Camera");
+        if (cameras == nullptr) {
+            return;
+        }
+        for (auto it = cameras->begin(); it != cameras->end(); it++) {
+            if ((*it).EntityID == m_CurrentCamera) {
+                it++;
+                if (it != cameras->end()) {
+                    switchCamera((*it).EntityID);
+                } else {
+                    switchCamera((*cameras->begin()).EntityID);
+                }
+                break;
+            }
+        }
+        if (m_World->HasComponent(m_CurrentCamera, "Camera")) {
+            ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera");
+            ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform");
+
+            m_DebugCameraInputController->SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"]));
+            m_DebugCameraInputController->SetPosition(cameraTransform["Position"]);
+        }
+    }
+
+    if (m_World->ValidEntity(m_CurrentCamera)) {
+        if (world->HasComponent(m_CurrentCamera, "Camera") && world->HasComponent(m_CurrentCamera, "Transform")) {
+            ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera");
+            ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform");
+
+            m_DebugCameraInputController->Update(dt);
+            (glm::vec3&)cameraTransform["Orientation"] = glm::eulerAngles(m_DebugCameraInputController->Orientation());
+            (glm::vec3&)cameraTransform["Position"] = m_DebugCameraInputController->Position();
+
+            glm::vec3 position = Transform::AbsolutePosition(world, m_CurrentCamera);
+            glm::quat orientation = Transform::AbsoluteOrientation(world, m_CurrentCamera);
+
+            m_Camera->SetPosition(position);
+            m_Camera->SetOrientation(orientation);
+
+            updateProjectionMatrix(cameraComponent);
+
+        }
+    } else {
+        m_Camera = m_Camera;
+
+        auto cameras = world->GetComponents("Camera");
+        if (cameras != nullptr) {
+            if (cameras->begin() != cameras->end()) {
+                ComponentWrapper& cameraC = *cameras->begin();
+                switchCamera(cameraC.EntityID);
+
+                ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera");
+                ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform");
+
+                m_DebugCameraInputController->SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"]));
+                m_DebugCameraInputController->SetPosition(cameraTransform["Position"]);
+            }
+        }
+    }
+
+    m_Camera->UpdateViewMatrix();
+}

src/Engine/Rendering/Renderer.cpp

@@ -3,27 +3,27 @@
 void Renderer::Initialize()
 {
 	InitializeWindow();
-	// Create default camera
-	m_DefaultCamera = new ::Camera((float)m_Resolution.Width / m_Resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
-	m_DefaultCamera->SetPosition(glm::vec3(0, 0, 10));
-	if (m_Camera == nullptr) {
-		m_Camera = m_DefaultCamera;
-	}
-    m_DebugCameraInputController = std::make_shared<DebugCameraInputController<Renderer>>(m_EventBroker, -1);
-    TEMPCreateLights();
+    
     InitializeRenderPasses();
 
 	glfwSwapInterval(m_VSYNC);
 	InitializeShaders();
     InitializeTextures();
-    InitializeSSBOs();
-    //CalculateFrustum();
 
     m_ScreenQuad = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj");
     m_UnitQuad = ResourceManager::Load<Model>("Models/Core/UnitQuad.obj");
     m_UnitSphere = ResourceManager::Load<Model>("Models/Core/UnitSphere.obj");
 
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
+
+
+    // Create default camera
+    m_DefaultCamera = new ::Camera((float)m_Resolution.Width / m_Resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_DefaultCamera->SetPosition(glm::vec3(0, 0, 10));
+    if (m_Camera == nullptr) {
+        m_Camera = m_DefaultCamera;
+    }
+
 }
 
 void Renderer::InitializeWindow()
@@ -75,52 +75,11 @@ void Renderer::InitializeShaders()
     m_DrawScreenQuadProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/DrawScreenQuad.frag.glsl")));
     m_DrawScreenQuadProgram->Compile();
     m_DrawScreenQuadProgram->Link();
-
-    //m_CalculateFrustumProgram = ResourceManager::Load<ShaderProgram>("#CalculateFrustumProgram");
-    //m_CalculateFrustumProgram.AddShader(std::shared_ptr<Shader>(new ComputeShader("Shaders/GridFrustum.comp.glsl")));
-    //m_CalculateFrustumProgram.Compile();
-    //m_CalculateFrustumProgram.Link();
-
-    //m_LightCullProgram = ResourceManager::Load<ShaderProgram>("#LightCullProgram");
-    //m_LightCullProgram.AddShader(std::shared_ptr<Shader>(new ComputeShader("Shaders/cullLights.comp.glsl")));
-    //m_LightCullProgram.Compile();
-    //m_LightCullProgram.Link();
 }
 
 void Renderer::InputUpdate(double dt)
 {
-	glm::vec3 m_Position = m_Camera->Position();
-	if (glfwGetKey(m_Window, GLFW_KEY_O) == GLFW_PRESS)
-	{
-		m_Position = glm::vec3(0.f, 0.f, 5.f);
-	}
-	if (glfwGetKey(m_Window, GLFW_KEY_W) == GLFW_PRESS)
-	{
-		m_Position += m_Camera->Forward() * m_CameraMoveSpeed * (float)dt;
-	}
-	if (glfwGetKey(m_Window, GLFW_KEY_S) == GLFW_PRESS)
-	{
-		m_Position -= m_Camera->Forward() * m_CameraMoveSpeed * (float)dt;
-	}
-	if (glfwGetKey(m_Window, GLFW_KEY_D) == GLFW_PRESS)
-	{
-		m_Position += m_Camera->Right() * m_CameraMoveSpeed * (float)dt;
-	}
-	if (glfwGetKey(m_Window, GLFW_KEY_A) == GLFW_PRESS)
-	{
-		m_Position -= m_Camera->Right() * m_CameraMoveSpeed * (float)dt;
-	}
-	if (glfwGetKey(m_Window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS)
-	{
-		m_CameraMoveSpeed = 5.f;
-	}
-	else {
-		m_CameraMoveSpeed = 0.5f;
-	}
-
-    m_DebugCameraInputController->Update(dt);
-    m_Camera->SetOrientation(m_DebugCameraInputController->Orientation());
-	m_Camera->SetPosition(m_DebugCameraInputController->Position());
+   
 }
 
 void Renderer::Update(double dt)
@@ -130,20 +89,37 @@ void Renderer::Update(double dt)
     m_ImGuiRenderPass->Update(dt);
 }
 
-void Renderer::Draw(RenderQueueCollection& rq)
+void Renderer::Draw(RenderFrame& frame)
 {
-    m_PickingPass->Draw(rq);
-    //DrawScreenQuad(m_PickingPass->PickingTexture());
-    //CullLights();
+    glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 0.f);
+    
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     
-    glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f);
 
-    m_DrawScenePass->Draw(rq);
-    GLERROR("Renderer::Draw m_DrawScenePass->Draw");
+    m_PickingPass->ClearPicking();
+    for (auto scene : frame.RenderScenes){
+    
+        m_Camera = scene->Camera; // remove renderer camera when Editor uses the render scene cameras.
+        FillDepth(*scene);
+        m_PickingPass->Draw(*scene);
+        m_LightCullingPass->GenerateNewFrustum(*scene);
+        m_LightCullingPass->FillLightList(*scene);
+        m_LightCullingPass->CullLights(*scene);
+        m_DrawFinalPass->Draw(*scene);
+        //m_DrawScenePass->Draw(rq);
+
+        GLERROR("Renderer::Draw m_DrawScenePass->Draw");
+    }
+
     m_ImGuiRenderPass->Draw();
 	glfwSwapBuffers(m_Window);
 }
 
+PickData Renderer::Pick(glm::vec2 screenCoord)
+{
+    return m_PickingPass->Pick(screenCoord);
+}
+
 void Renderer::DrawScreenQuad(GLuint textureToDraw)
 {
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -161,14 +137,14 @@ void Renderer::DrawScreenQuad(GLuint textureToDraw)
 
     glBindVertexArray(m_ScreenQuad->VAO);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ScreenQuad->ElementBuffer);
-    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->TextureGroups[0].EndIndex - m_ScreenQuad->TextureGroups[0].StartIndex +1
-        , GL_UNSIGNED_INT, 0, m_ScreenQuad->TextureGroups[0].StartIndex);
+    glDrawElementsBaseVertex(GL_TRIANGLES, m_ScreenQuad->MaterialGroups()[0].EndIndex - m_ScreenQuad->MaterialGroups()[0].StartIndex +1
+        , GL_UNSIGNED_INT, 0, m_ScreenQuad->MaterialGroups()[0].StartIndex);
 }
 
 void Renderer::InitializeTextures()
 {
-    m_ErrorTexture=ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
-    m_WhiteTexture=ResourceManager::Load<Texture>("Textures/Core/Blank.png");
+    m_ErrorTexture = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
+    m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/Blank.png");
 }
 
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
@@ -179,99 +155,31 @@ void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filterin
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapping);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, dimensions.x, dimensions.y, 0, format, type, NULL);//TODO: Renderer: Fix the precision and Resolution
+    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, dimensions.x, dimensions.y, 0, format, type, nullptr);//TODO: Renderer: Fix the precision and Resolution
     GLERROR("Texture initialization failed");
 }
 
-void Renderer::InitializeSSBOs()
-{
-    printf("Size: %i\n", sizeof(m_Frustums));
-    glGenBuffers(1, &m_FrustumSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_FrustumSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_Frustums), &m_Frustums, GL_DYNAMIC_COPY);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    GLERROR("m_FrustumSSBO");
-
-    glGenBuffers(1, &m_LightSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_PointLights), &m_PointLights, GL_DYNAMIC_COPY);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    GLERROR("m_LightSSBO");
-
-
-    glGenBuffers(1, &m_LightGridSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightGridSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightGrid), &m_LightGrid, GL_DYNAMIC_COPY);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightGridSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    GLERROR("m_LightGridSSBO");
-
-
-    glGenBuffers(1, &m_LightOffsetSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightOffsetSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightOffset), &m_LightOffset, GL_DYNAMIC_COPY);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, m_LightOffsetSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    GLERROR("m_LightOffsetSSBO");
-
-
-    glGenBuffers(1, &m_LightIndexSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_LightIndexSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(m_LightIndex), &m_LightIndex, GL_DYNAMIC_COPY);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightIndexSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    GLERROR("m_LightIndexSSBO");
-
-}
-
 void Renderer::InitializeRenderPasses()
 {
     m_DrawScenePass = new DrawScenePass(this);
     m_PickingPass = new PickingPass(this, m_EventBroker);
+    m_LightCullingPass = new LightCullingPass(this);
+    m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass);
 }
 
-void Renderer::CalculateFrustum()
+//Temp func
+void Renderer::FillDepth(RenderScene& scene)
 {
-    GLERROR("CalculateFrustum Error-1");
-    m_CalculateFrustumProgram->Bind();
-    
-    GLERROR("CalculateFrustum Error1");
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
-    GLERROR("CalculateFrustum Error2");
-    glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "P"), 1, false, glm::value_ptr(m_Camera->ProjectionMatrix()));
-    GLERROR("CalculateFrustum Error3");
-    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "ScreenDimensions"), m_Resolution.Width, m_Resolution.Height);
-    GLERROR("CalculateFrustum Error4");
-    glDispatchCompute(5, 3, 1);
-    GLERROR("CalculateFrustum Error5");
+    for (auto job : scene.ForwardJobs) {
+        auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
+        if(! modelJob) {
+            return;
+        }
 
-}
 
-void Renderer::TEMPCreateLights()
-{
-    for (int i = 0; i < NUM_LIGHTS; i++) {
-        m_PointLights[i].Position = glm::vec4(i, 0.f, 0.f, 0.f);
-        m_PointLights[i].Color = glm::vec4(1.f, 0.5f, 0.f + i*0.1f, 1.f);
+        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;
     }
-}
-
-void Renderer::CullLights()
-{
-    m_LightCullProgram->Bind();
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightSSBO);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightGridSSBO);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, m_LightOffsetSSBO);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightIndexSSBO);
-    glDispatchCompute(m_Resolution.Width / TILE_SIZE, m_Resolution.Height / TILE_SIZE, 1);
-    GLERROR("CullLights Error");
-
-}
-
+    scene.ForwardJobs.sort(Renderer::DepthSort);
+}

src/Engine/Rendering/Texture.cpp

@@ -2,48 +2,48 @@
 
 Texture::Texture(std::string path)
 {
-	PNG image(path);
+    PNG image(path);
 
-	if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
-		image = PNG("Textures/Core/ErrorTexture.png");
-		if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
-			LOG_ERROR("Couldn't even load the error texture. This is a dark day indeed.");
-			return;
-		}
-	}
+    if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
+        image = PNG("Textures/Core/ErrorTexture.png");
+        if (image.Width == 0 && image.Height == 0 || image.Format == Image::ImageFormat::Unknown) {
+            LOG_ERROR("Couldn't even load the error texture. This is a dark day indeed.");
+            return;
+        }
+    }
 
-	this->Width = image.Width;
-	this->Height = image.Height;
+    this->Width = image.Width;
+    this->Height = image.Height;
 
-	GLint format;
-	switch (image.Format) {
-	case Image::ImageFormat::RGB:
-		format = GL_RGB;
-		break;
-	case Image::ImageFormat::RGBA:
-		format = GL_RGBA;
-		break;
-	}
+    GLint format;
+    switch (image.Format) {
+    case Image::ImageFormat::RGB:
+        format = GL_RGB;
+        break;
+    case Image::ImageFormat::RGBA:
+        format = GL_RGBA;
+        break;
+    }
 
-	// Construct the OpenGL texture
-	glGenTextures(1, &m_Texture);
-	glBindTexture(GL_TEXTURE_2D, m_Texture);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	glTexImage2D(GL_TEXTURE_2D, 0, format, image.Width, image.Height, 0, format, GL_UNSIGNED_BYTE, image.Data);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	GLERROR("Texture load");
+    // Construct the OpenGL texture
+    glGenTextures(1, &m_Texture);
+    glBindTexture(GL_TEXTURE_2D, m_Texture);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glTexImage2D(GL_TEXTURE_2D, 0, format, image.Width, image.Height, 0, format, GL_UNSIGNED_BYTE, image.Data);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    GLERROR("Texture load");
 }
 
 Texture::~Texture()
 {
-	glDeleteTextures(1, &m_Texture);
+    glDeleteTextures(1, &m_Texture);
 }
 
 void Texture::Bind(GLenum textureUnit /* = GL_TEXTURE0 */)
 {
-	glActiveTexture(textureUnit);
-	glBindTexture(GL_TEXTURE_2D, m_Texture);
+    glActiveTexture(textureUnit);
+    glBindTexture(GL_TEXTURE_2D, m_Texture);
 }