From ffb993c864d52bfb12a6958819cc31090949a399 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 7 Sep 2013 22:06:50 +0200 Subject: [PATCH] Fixed [Color|Texture]Background not rendering Former-commit-id: a3bb4bd62176fea7ba88993b445b55e72c2c1835 --- src/Nazara/Graphics/ColorBackground.cpp | 7 ++++--- src/Nazara/Graphics/TextureBackground.cpp | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Nazara/Graphics/ColorBackground.cpp b/src/Nazara/Graphics/ColorBackground.cpp index 0672cffba..b8fea43db 100644 --- a/src/Nazara/Graphics/ColorBackground.cpp +++ b/src/Nazara/Graphics/ColorBackground.cpp @@ -14,7 +14,7 @@ namespace { NzRenderStates states; states.depthFunc = nzRendererComparison_Equal; - states.faceCulling = nzFaceSide_Front; + states.faceCulling = nzFaceSide_Back; states.parameters[nzRendererParameter_DepthBuffer] = true; states.parameters[nzRendererParameter_DepthWrite] = false; states.parameters[nzRendererParameter_FaceCulling] = true; @@ -34,8 +34,6 @@ m_color(color) params.fullscreenQuad.diffuseMapping = false; m_program = NzShaderProgramManager::Get(params); - m_program->SendColor(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuse), m_color); - m_program->SendFloat(m_program->GetUniformLocation(nzShaderUniform_VertexDepth), 1.f); } void NzColorBackground::Draw(const NzScene* scene) const @@ -47,6 +45,9 @@ void NzColorBackground::Draw(const NzScene* scene) const NzRenderer::SetRenderStates(states); NzRenderer::SetShaderProgram(m_program); + m_program->SendColor(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuse), m_color); + m_program->SendFloat(m_program->GetUniformLocation(nzShaderUniform_VertexDepth), 1.f); + NzRenderer::DrawFullscreenQuad(); } diff --git a/src/Nazara/Graphics/TextureBackground.cpp b/src/Nazara/Graphics/TextureBackground.cpp index 921c4666a..d26a7a1a8 100644 --- a/src/Nazara/Graphics/TextureBackground.cpp +++ b/src/Nazara/Graphics/TextureBackground.cpp @@ -14,7 +14,7 @@ namespace { NzRenderStates states; states.depthFunc = nzRendererComparison_Equal; - states.faceCulling = nzFaceSide_Front; + states.faceCulling = nzFaceSide_Back; states.parameters[nzRendererParameter_DepthBuffer] = true; states.parameters[nzRendererParameter_DepthWrite] = false; states.parameters[nzRendererParameter_FaceCulling] = true; @@ -33,9 +33,6 @@ NzTextureBackground::NzTextureBackground() params.fullscreenQuad.diffuseMapping = true; m_program = NzShaderProgramManager::Get(params); - m_program->SendColor(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuse), NzColor::White); - m_program->SendFloat(m_program->GetUniformLocation(nzShaderUniform_VertexDepth), 1.f); - m_program->SendInteger(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuseMap), 0); } NzTextureBackground::NzTextureBackground(NzTexture* texture) : @@ -54,6 +51,10 @@ void NzTextureBackground::Draw(const NzScene* scene) const NzRenderer::SetShaderProgram(m_program); NzRenderer::SetTexture(0, m_texture); + m_program->SendColor(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuse), NzColor::White); + m_program->SendFloat(m_program->GetUniformLocation(nzShaderUniform_VertexDepth), 1.f); + m_program->SendInteger(m_program->GetUniformLocation(nzShaderUniform_MaterialDiffuseMap), 0); + NzRenderer::DrawFullscreenQuad(); }