Merge branch 'EditorUsefulness' of github.com:teamfisk/TacticalZ into EditorUsefulness

This commit is contained in:
2016-01-21 17:01:06 +01:00
3 changed files with 8 additions and 4 deletions
+4
View File
@@ -31,6 +31,10 @@ void DrawFinalPass::Draw(RenderScene& scene)
m_ForwardPlusProgram->Bind();
GLuint shaderHandle = m_ForwardPlusProgram->GetHandle();
if (scene.ClearDepth) {
glClear(GL_DEPTH_BUFFER_BIT);
}
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());
+3 -1
View File
@@ -53,7 +53,9 @@ void PickingPass::Draw(RenderScene& scene)
GLuint ShaderHandle = m_PickingProgram->GetHandle();
m_PickingProgram->Bind();
if (scene.ClearDepth) {
glClear(GL_DEPTH_BUFFER_BIT);
}
m_Camera = scene.Camera;
+1 -3
View File
@@ -87,9 +87,7 @@ void Renderer::Draw(RenderFrame& frame)
m_PickingPass->ClearPicking();
for (auto scene : frame.RenderScenes){
if (scene->ClearDepth) {
glClear(GL_DEPTH_BUFFER_BIT);
}
SortRenderJobsByDepth(*scene);
m_PickingPass->Draw(*scene);
m_LightCullingPass->GenerateNewFrustum(*scene);