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

Refactored code 

Former-commit-id: 95c723425cc2ac626b5ddd6d77f69e0a4b0a630a
This commit is contained in:
Lynix 2013-08-26 13:36:41 +02:00
parent 75de88066b
commit 7d9eac7660
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,9 @@ class NAZARA_API NzForwardRenderTechnique : public NzAbstractRenderTechnique
void SetMaxLightsPerObject(unsigned int lightCount); void SetMaxLightsPerObject(unsigned int lightCount);
private: private:
void DrawOpaqueModels(const NzScene* scene, NzForwardRenderQueue::BatchedModelContainer& opaqueModels); void DrawOpaqueModels(const NzScene* scene);
void DrawSprites(const NzScene* scene, NzForwardRenderQueue::BatchedSpriteContainer& sprites); void DrawSprites(const NzScene* scene);
void DrawTransparentModels(const NzScene* scene, NzForwardRenderQueue::TransparentModelContainer& transparentModels); void DrawTransparentModels(const NzScene* scene);
NzForwardRenderQueue m_renderQueue; NzForwardRenderQueue m_renderQueue;
NzIndexBufferRef m_indexBuffer; NzIndexBufferRef m_indexBuffer;

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

@ -81,13 +81,13 @@ void NzForwardRenderTechnique::Draw(const NzScene* scene)
m_renderQueue.Sort(scene->GetViewer()); m_renderQueue.Sort(scene->GetViewer());
if (!m_renderQueue.opaqueModels.empty()) if (!m_renderQueue.opaqueModels.empty())
DrawOpaqueModels(scene, m_renderQueue.opaqueModels); DrawOpaqueModels(scene);
if (!m_renderQueue.sprites.empty()) if (!m_renderQueue.sprites.empty())
DrawSprites(scene, m_renderQueue.sprites); DrawSprites(scene);
if (!m_renderQueue.transparentsModels.empty()) if (!m_renderQueue.transparentsModels.empty())
DrawTransparentModels(scene, m_renderQueue.transparentsModels); DrawTransparentModels(scene);
// Les autres drawables (Exemple: Terrain) // Les autres drawables (Exemple: Terrain)
for (const NzDrawable* drawable : m_renderQueue.otherDrawables) for (const NzDrawable* drawable : m_renderQueue.otherDrawables)
@ -162,14 +162,14 @@ void NzForwardRenderTechnique::SetMaxLightsPerObject(unsigned int lightCount)
m_maxLightsPerObject = lightCount; m_maxLightsPerObject = lightCount;
} }
void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene, NzForwardRenderQueue::BatchedModelContainer& opaqueModels) void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene)
{ {
NzAbstractViewer* viewer = scene->GetViewer(); NzAbstractViewer* viewer = scene->GetViewer();
const NzShaderProgram* lastProgram = nullptr; const NzShaderProgram* lastProgram = nullptr;
unsigned int lightCount = 0; unsigned int lightCount = 0;
for (auto& matIt : opaqueModels) for (auto& matIt : m_renderQueue.opaqueModels)
{ {
bool& used = std::get<0>(matIt.second); bool& used = std::get<0>(matIt.second);
if (used) if (used)
@ -320,7 +320,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene, NzForwardR
} }
} }
void NzForwardRenderTechnique::DrawSprites(const NzScene* scene, NzForwardRenderQueue::BatchedSpriteContainer& sprites) void NzForwardRenderTechnique::DrawSprites(const NzScene* scene)
{ {
NzAbstractViewer* viewer = scene->GetViewer(); NzAbstractViewer* viewer = scene->GetViewer();
const NzShaderProgram* lastProgram = nullptr; const NzShaderProgram* lastProgram = nullptr;
@ -329,7 +329,7 @@ void NzForwardRenderTechnique::DrawSprites(const NzScene* scene, NzForwardRender
NzRenderer::SetMatrix(nzMatrixType_World, NzMatrix4f::Identity()); NzRenderer::SetMatrix(nzMatrixType_World, NzMatrix4f::Identity());
NzRenderer::SetVertexBuffer(&m_spriteBuffer); NzRenderer::SetVertexBuffer(&m_spriteBuffer);
for (auto& matIt : sprites) for (auto& matIt : m_renderQueue.sprites)
{ {
const NzMaterial* material = matIt.first; const NzMaterial* material = matIt.first;
auto& spriteVector = matIt.second; auto& spriteVector = matIt.second;
@ -400,13 +400,13 @@ void NzForwardRenderTechnique::DrawSprites(const NzScene* scene, NzForwardRender
} }
} }
void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene, NzForwardRenderQueue::TransparentModelContainer& transparentModels) void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene)
{ {
NzAbstractViewer* viewer = scene->GetViewer(); NzAbstractViewer* viewer = scene->GetViewer();
const NzShaderProgram* lastProgram = nullptr; const NzShaderProgram* lastProgram = nullptr;
unsigned int lightCount = 0; unsigned int lightCount = 0;
for (const std::pair<unsigned int, bool>& pair : transparentModels) for (const std::pair<unsigned int, bool>& pair : m_renderQueue.transparentsModels)
{ {
// Matériau // Matériau
const NzMaterial* material = (pair.second) ? const NzMaterial* material = (pair.second) ?