Commit in order to pull from Master.

resources/Shaders/ForwardPlus.frag.glsl

@@ -113,7 +113,7 @@ void main()
 		totalLighting.Specular += result.Specular;
 	}
 
-	//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * texel * Color;
+	fragmentColor += (totalLighting.Diffuse + totalLighting.Specular) * texel * Color;
 	//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse) * texel * Color;
 	//fragmentColor += vec4(0.0, LightGrids.Data[currentTile].Amount/3.0, 0, 1);
 	//fragmentColor = texel * Input.DiffuseColor * Color;
@@ -125,7 +125,6 @@ void main()
 
 
 	}
-	fragmentColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
 

src/Engine/Rendering/DrawFinalPassState.cpp

@@ -7,7 +7,7 @@ DrawFinalPassState::DrawFinalPassState()
     Enable(GL_BLEND);
     BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     Enable(GL_DEPTH_TEST);
-    Disable(GL_CULL_FACE); //Should be enabled, fix it johan and andreas.
+    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);
 }

src/Engine/Rendering/RawModelCustom.cpp

@@ -148,7 +148,9 @@ void RawModel::ReadMaterialSingle(unsigned int &offset, char* fileData, unsigned
             throw Resource::FailedLoadingException("Reading Material texture path failed");
         }
 
-        newMaterial.TexturePath = (fileData + offset);
+        newMaterial.TexturePath = "Textures/";
+        newMaterial.TexturePath += (fileData + offset);
+        newMaterial.TexturePath += ".png";
         offset += nameLengths[0];
     }
 

src/Engine/Rendering/Renderer.cpp

@@ -101,10 +101,10 @@ void Renderer::Draw(RenderFrame& frame)
     
         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_PickingPass->Draw(*scene);
+        m_LightCullingPass->GenerateNewFrustum(*scene);
+        m_LightCullingPass->FillLightList(*scene);
+        m_LightCullingPass->CullLights(*scene);
         m_DrawFinalPass->Draw(*scene);
         //m_DrawScenePass->Draw(rq);
 

tools/MayaExporter/MayaExporter/Mesh.h

@@ -69,9 +69,10 @@ public:
         for (auto aVertex : Vertices) {
             aVertex.WriteBinary(out);
         }
-        //for (auto aIndex : Indices) {
-        for (std::map<std::string, std::vector<int>>::reverse_iterator aIndex = Indices.rbegin(); aIndex != Indices.rend(); aIndex++){
-            out.write((char*)(*aIndex).second.data(), sizeof(int) * (*aIndex).second.size());
+        for (auto aIndex : Indices) {
+        //for (std::map<std::string, std::vector<int>>::reverse_iterator aIndex = Indices.rbegin(); aIndex != Indices.rend(); aIndex++){
+            //out.write((char*)(*aIndex).second.data(), sizeof(int) * (*aIndex).second.size());
+            out.write((char*)aIndex.second.data(), sizeof(int) * aIndex.second.size());
         }
     }