Commit in order to pull from Master.

This commit is contained in:
antc13
2016-01-19 18:21:27 +01:00
parent 3826142e94
commit e643581971
5 changed files with 13 additions and 11 deletions
+1 -1
View File
@@ -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);
}
+3 -1
View File
@@ -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];
}
+4 -4
View File
@@ -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);