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

Removed [*]RenderQueue::AddModel 

Former-commit-id: 74b3e2b59b7a2ced16edca8dd7027dd8ae1db861
This commit is contained in:
Lynix 2014-03-14 23:48:10 +01:00
parent 2c3d8ee5f4
commit 0ca2c9ccb2
6 changed files with 18 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ class NAZARA_API NzAbstractRenderQueue : NzNonCopyable
virtual void AddDrawable(const NzDrawable* drawable) = 0; virtual void AddDrawable(const NzDrawable* drawable) = 0;
virtual void AddLight(const NzLight* light) = 0; virtual void AddLight(const NzLight* light) = 0;
virtual void AddModel(const NzModel* model) = 0;
virtual void AddSprite(const NzSprite* sprite) = 0; virtual void AddSprite(const NzSprite* sprite) = 0;
virtual void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix) = 0; virtual void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix) = 0;

9
include/Nazara/Graphics/DeferredRenderQueue.hpp
View File

@ -27,11 +27,10 @@ class NAZARA_API NzDeferredRenderQueue : public NzAbstractRenderQueue, NzResourc
NzDeferredRenderQueue(NzForwardRenderQueue* forwardQueue); NzDeferredRenderQueue(NzForwardRenderQueue* forwardQueue);
~NzDeferredRenderQueue(); ~NzDeferredRenderQueue();
void AddDrawable(const NzDrawable* drawable); void AddDrawable(const NzDrawable* drawable) override;
void AddLight(const NzLight* light); void AddLight(const NzLight* light) override;
void AddModel(const NzModel* model); void AddSprite(const NzSprite* sprite) override;
void AddSprite(const NzSprite* sprite); void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix) override;
void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix);
void Clear(bool fully); void Clear(bool fully);

9
include/Nazara/Graphics/ForwardRenderQueue.hpp
View File

@ -29,11 +29,10 @@ class NAZARA_API NzForwardRenderQueue : public NzAbstractRenderQueue, NzResource
NzForwardRenderQueue() = default; NzForwardRenderQueue() = default;
~NzForwardRenderQueue(); ~NzForwardRenderQueue();
void AddDrawable(const NzDrawable* drawable); void AddDrawable(const NzDrawable* drawable) override;
void AddLight(const NzLight* light); void AddLight(const NzLight* light) override;
void AddModel(const NzModel* model); void AddSprite(const NzSprite* sprite) override;
void AddSprite(const NzSprite* sprite); void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix) override;
void AddSubMesh(const NzMaterial* material, const NzSubMesh* subMesh, const NzMatrix4f& transformMatrix);
void Clear(bool fully); void Clear(bool fully);

30
src/Nazara/Graphics/DeferredRenderQueue.cpp
View File

@ -66,36 +66,6 @@ void NzDeferredRenderQueue::AddLight(const NzLight* light)
m_forwardQueue->AddLight(light); m_forwardQueue->AddLight(light);
} }
void NzDeferredRenderQueue::AddModel(const NzModel* model)
{
#if NAZARA_GRAPHICS_SAFE
if (!model)
{
NazaraError("Invalid model");
return;
}
if (!model->IsDrawable())
{
NazaraError("Model is not drawable");
return;
}
#endif
const NzMatrix4f& transformMatrix = model->GetTransformMatrix();
NzMesh* mesh = model->GetMesh();
unsigned int submeshCount = mesh->GetSubMeshCount();
for (unsigned int i = 0; i < submeshCount; ++i)
{
NzSubMesh* subMesh = mesh->GetSubMesh(i);
NzMaterial* material = model->GetMaterial(subMesh->GetMaterialIndex());
AddSubMesh(material, subMesh, transformMatrix);
}
}
void NzDeferredRenderQueue::AddSprite(const NzSprite* sprite) void NzDeferredRenderQueue::AddSprite(const NzSprite* sprite)
{ {
#if NAZARA_GRAPHICS_SAFE #if NAZARA_GRAPHICS_SAFE

30
src/Nazara/Graphics/ForwardRenderQueue.cpp
View File

@ -68,36 +68,6 @@ void NzForwardRenderQueue::AddLight(const NzLight* light)
} }
} }
void NzForwardRenderQueue::AddModel(const NzModel* model)
{
#if NAZARA_GRAPHICS_SAFE
if (!model)
{
NazaraError("Invalid model");
return;
}
if (!model->IsDrawable())
{
NazaraError("Model is not drawable");
return;
}
#endif
const NzMatrix4f& transformMatrix = model->GetTransformMatrix();
NzMesh* mesh = model->GetMesh();
unsigned int submeshCount = mesh->GetSubMeshCount();
for (unsigned int i = 0; i < submeshCount; ++i)
{
NzSubMesh* subMesh = mesh->GetSubMesh(i);
NzMaterial* material = model->GetMaterial(subMesh->GetMaterialIndex());
AddSubMesh(material, subMesh, transformMatrix);
}
}
void NzForwardRenderQueue::AddSprite(const NzSprite* sprite) void NzForwardRenderQueue::AddSprite(const NzSprite* sprite)
{ {
#if NAZARA_GRAPHICS_SAFE #if NAZARA_GRAPHICS_SAFE

11
src/Nazara/Graphics/Model.cpp
View File

@ -72,7 +72,16 @@ NzModel::~NzModel()
void NzModel::AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const void NzModel::AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const
{ {
renderQueue->AddModel(this); const NzMatrix4f& transformMatrix = GetTransformMatrix();
unsigned int submeshCount = m_mesh->GetSubMeshCount();
for (unsigned int i = 0; i < submeshCount; ++i)
{
NzSubMesh* subMesh = m_mesh->GetSubMesh(i);
NzMaterial* material = m_materials[subMesh->GetMaterialIndex()];
renderQueue->AddSubMesh(material, subMesh, transformMatrix);
}
} }
void NzModel::AdvanceAnimation(float elapsedTime) void NzModel::AdvanceAnimation(float elapsedTime)