From b9ced7877220f9417e69ed1056bba5515388f6bc Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 5 Jun 2015 13:38:22 +0200 Subject: [PATCH] Graphics/RenderTechnique: Remove Clear method Let's face it, this method was useless from the beginning. Former-commit-id: c38f57785c900acf66560ad07aa29498312c6063 --- SDK/src/NDK/Systems/RenderSystem.cpp | 1 - include/Nazara/Graphics/AbstractRenderTechnique.hpp | 1 - include/Nazara/Graphics/DeferredRenderTechnique.hpp | 3 +-- include/Nazara/Graphics/ForwardRenderTechnique.hpp | 1 - src/Nazara/Graphics/DeferredRenderTechnique.cpp | 5 ----- src/Nazara/Graphics/ForwardRenderTechnique.cpp | 9 +++------ src/Nazara/Graphics/Scene.cpp | 1 - 7 files changed, 4 insertions(+), 17 deletions(-) diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp index f1852f9b9..adda8cabf 100644 --- a/SDK/src/NDK/Systems/RenderSystem.cpp +++ b/SDK/src/NDK/Systems/RenderSystem.cpp @@ -35,7 +35,6 @@ namespace Ndk graphicsComponent.AddToRenderQueue(renderQueue, drawableNode.GetTransformMatrix()); } - m_renderTechnique.Clear(&dummyScene); m_renderTechnique.Draw(&dummyScene); } } diff --git a/include/Nazara/Graphics/AbstractRenderTechnique.hpp b/include/Nazara/Graphics/AbstractRenderTechnique.hpp index 3cc22e30c..9409cbc16 100644 --- a/include/Nazara/Graphics/AbstractRenderTechnique.hpp +++ b/include/Nazara/Graphics/AbstractRenderTechnique.hpp @@ -22,7 +22,6 @@ class NAZARA_API NzAbstractRenderTechnique : NzNonCopyable NzAbstractRenderTechnique(); virtual ~NzAbstractRenderTechnique(); - virtual void Clear(const NzScene* scene) const = 0; virtual bool Draw(const NzScene* scene) const = 0; virtual void EnableInstancing(bool instancing); diff --git a/include/Nazara/Graphics/DeferredRenderTechnique.hpp b/include/Nazara/Graphics/DeferredRenderTechnique.hpp index 1a5f2669c..a49475315 100644 --- a/include/Nazara/Graphics/DeferredRenderTechnique.hpp +++ b/include/Nazara/Graphics/DeferredRenderTechnique.hpp @@ -30,8 +30,7 @@ class NAZARA_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique, p NzDeferredRenderTechnique(); ~NzDeferredRenderTechnique(); - void Clear(const NzScene* scene) const; - bool Draw(const NzScene* scene) const; + bool Draw(const NzScene* scene) const override; void EnablePass(nzRenderPassType renderPass, int position, bool enable); diff --git a/include/Nazara/Graphics/ForwardRenderTechnique.hpp b/include/Nazara/Graphics/ForwardRenderTechnique.hpp index de5c86e26..318e8b707 100644 --- a/include/Nazara/Graphics/ForwardRenderTechnique.hpp +++ b/include/Nazara/Graphics/ForwardRenderTechnique.hpp @@ -20,7 +20,6 @@ class NAZARA_API NzForwardRenderTechnique : public NzAbstractRenderTechnique NzForwardRenderTechnique(); ~NzForwardRenderTechnique() = default; - void Clear(const NzScene* scene) const override; bool Draw(const NzScene* scene) const override; unsigned int GetMaxLightPassPerObject() const; diff --git a/src/Nazara/Graphics/DeferredRenderTechnique.cpp b/src/Nazara/Graphics/DeferredRenderTechnique.cpp index 51d609325..e44bb82a8 100644 --- a/src/Nazara/Graphics/DeferredRenderTechnique.cpp +++ b/src/Nazara/Graphics/DeferredRenderTechnique.cpp @@ -203,11 +203,6 @@ m_GBufferSize(0U) NzDeferredRenderTechnique::~NzDeferredRenderTechnique() = default; -void NzDeferredRenderTechnique::Clear(const NzScene* scene) const -{ - NazaraUnused(scene); -} - bool NzDeferredRenderTechnique::Draw(const NzScene* scene) const { NzRecti viewerViewport = scene->GetViewer()->GetViewport(); diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 3ccc4ce14..f1541de28 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -50,8 +50,10 @@ m_maxLightPassPerObject(3) m_spriteBuffer.Reset(NzVertexDeclaration::Get(nzVertexLayout_XYZ_Color_UV), &m_vertexBuffer); } -void NzForwardRenderTechnique::Clear(const NzScene* scene) const +bool NzForwardRenderTechnique::Draw(const NzScene* scene) const { + m_renderQueue.Sort(scene->GetViewer()); + NzRenderer::Enable(nzRendererParameter_DepthBuffer, true); NzRenderer::Enable(nzRendererParameter_DepthWrite, true); NzRenderer::Clear(nzRendererBuffer_Depth); @@ -59,11 +61,6 @@ void NzForwardRenderTechnique::Clear(const NzScene* scene) const NzAbstractBackground* background = (scene->IsBackgroundEnabled()) ? scene->GetBackground() : nullptr; if (background) background->Draw(scene); -} - -bool NzForwardRenderTechnique::Draw(const NzScene* scene) const -{ - m_renderQueue.Sort(scene->GetViewer()); if (!m_renderQueue.opaqueModels.empty()) DrawOpaqueModels(scene); diff --git a/src/Nazara/Graphics/Scene.cpp b/src/Nazara/Graphics/Scene.cpp index bad7102af..344cf863c 100644 --- a/src/Nazara/Graphics/Scene.cpp +++ b/src/Nazara/Graphics/Scene.cpp @@ -71,7 +71,6 @@ void NzScene::Draw() try { NzErrorFlags errFlags(nzErrorFlag_ThrowException, true); - m_renderTechnique->Clear(this); m_renderTechnique->Draw(this); } catch (const std::exception& e)