sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Graphics/RenderTechnique: Remove Clear method" 

This reverts commit 8aa3764660d5c98995135f736ecd710677fa240c [formerly 9b4ec3ae32492e383c19a06bd1c3e461b3fcf46d].

It seems I was wrong about the Clear method, my revert broke the Deferred Rendering


Former-commit-id: b8d2db34ffd9d24798670f19aba0de88f5b77a1c
This commit is contained in:
Lynix 2016-04-06 12:39:29 +02:00
parent 9efed23cbc
commit 0697fe1079
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SDK/src/NDK/Systems/RenderSystem.cpp
View File

@ -99,6 +99,7 @@ namespace Ndk
sceneData.background = m_background; sceneData.background = m_background;
sceneData.viewer = &camComponent; sceneData.viewer = &camComponent;
m_renderTechnique.Clear(sceneData);
m_renderTechnique.Draw(sceneData); m_renderTechnique.Draw(sceneData);
} }
} }

1
include/Nazara/Graphics/AbstractRenderTechnique.hpp
View File

@ -28,6 +28,7 @@ namespace Nz
AbstractRenderTechnique(AbstractRenderTechnique&&) = default; AbstractRenderTechnique(AbstractRenderTechnique&&) = default;
virtual ~AbstractRenderTechnique(); virtual ~AbstractRenderTechnique();
virtual void Clear(const SceneData& sceneData) const = 0;
virtual bool Draw(const SceneData& sceneData) const = 0; virtual bool Draw(const SceneData& sceneData) const = 0;
virtual void EnableInstancing(bool instancing); virtual void EnableInstancing(bool instancing);

1
include/Nazara/Graphics/DeferredRenderTechnique.hpp
View File

@ -32,6 +32,7 @@ namespace Nz
DeferredRenderTechnique(); DeferredRenderTechnique();
~DeferredRenderTechnique(); ~DeferredRenderTechnique();
void Clear(const SceneData& sceneData) const override;
bool Draw(const SceneData& sceneData) const override; bool Draw(const SceneData& sceneData) const override;
void EnablePass(RenderPassType renderPass, int position, bool enable); void EnablePass(RenderPassType renderPass, int position, bool enable);

1
include/Nazara/Graphics/ForwardRenderTechnique.hpp
View File

@ -24,6 +24,7 @@ namespace Nz
ForwardRenderTechnique(); ForwardRenderTechnique();
~ForwardRenderTechnique() = default; ~ForwardRenderTechnique() = default;
void Clear(const SceneData& sceneData) const override;
bool Draw(const SceneData& sceneData) const override; bool Draw(const SceneData& sceneData) const override;
unsigned int GetMaxLightPassPerObject() const; unsigned int GetMaxLightPassPerObject() const;

5
src/Nazara/Graphics/DeferredRenderTechnique.cpp
View File

@ -204,6 +204,11 @@ namespace Nz
DeferredRenderTechnique::~DeferredRenderTechnique() = default; DeferredRenderTechnique::~DeferredRenderTechnique() = default;
void DeferredRenderTechnique::Clear(const SceneData& sceneData) const
{
NazaraUnused(sceneData);
}
bool DeferredRenderTechnique::Draw(const SceneData& sceneData) const bool DeferredRenderTechnique::Draw(const SceneData& sceneData) const
{ {
NazaraAssert(sceneData.viewer, "Invalid viewer"); NazaraAssert(sceneData.viewer, "Invalid viewer");

13
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@ -49,18 +49,21 @@ namespace Nz
m_spriteBuffer.Reset(VertexDeclaration::Get(VertexLayout_XYZ_Color_UV), &m_vertexBuffer); m_spriteBuffer.Reset(VertexDeclaration::Get(VertexLayout_XYZ_Color_UV), &m_vertexBuffer);
} }
bool ForwardRenderTechnique::Draw(const SceneData& sceneData) const void ForwardRenderTechnique::Clear(const SceneData& sceneData) const
{ {
NazaraAssert(sceneData.viewer, "Invalid viewer");
m_renderQueue.Sort(sceneData.viewer);
Renderer::Enable(RendererParameter_DepthBuffer, true); Renderer::Enable(RendererParameter_DepthBuffer, true);
Renderer::Enable(RendererParameter_DepthWrite, true); Renderer::Enable(RendererParameter_DepthWrite, true);
Renderer::Clear(RendererBuffer_Depth); Renderer::Clear(RendererBuffer_Depth);
if (sceneData.background) if (sceneData.background)
sceneData.background->Draw(sceneData.viewer); sceneData.background->Draw(sceneData.viewer);
}
bool ForwardRenderTechnique::Draw(const SceneData& sceneData) const
{
NazaraAssert(sceneData.viewer, "Invalid viewer");
m_renderQueue.Sort(sceneData.viewer);
for (auto& pair : m_renderQueue.layers) for (auto& pair : m_renderQueue.layers)
{ {