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

This commit is contained in:
Tleety
2016-03-11 11:32:18 +01:00
2 changed files with 2 additions and 4 deletions
+1 -4
View File
@@ -201,10 +201,7 @@ GLuint BlurHUD::Draw(GLuint texture, RenderScene& scene)
void BlurHUD::OnWindowResize()
{
CommonFunctions::GenerateTexture(&m_GaussianTexture_vert, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality), GL_RGB16F, GL_RGB, GL_FLOAT);
m_GaussianFrameBuffer_vert.Generate();
CommonFunctions::GenerateTexture(&m_GaussianTexture_horiz, GL_CLAMP_TO_EDGE, GL_LINEAR, glm::vec2(m_Renderer->GetViewportSize().Width/m_BlurQuality, m_Renderer->GetViewportSize().Height/m_BlurQuality), GL_RGB16F, GL_RGB, GL_FLOAT);
m_GaussianFrameBuffer_horiz.Generate();
InitializeBuffers();
}
void BlurHUD::FillStencil(RenderScene& scene)
+1
View File
@@ -140,6 +140,7 @@ void Renderer::updateFramebufferSize()
m_LightCullingPass->OnWindowResize();
m_DrawBloomPass->OnWindowResize();
m_SSAOPass->OnWindowResize();
m_BlurHUDPass->OnWindowResize();
e.NewResolution = m_ViewportSize;
m_EventBroker->Publish(e);