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

Replaced struct by lambda 

Former-commit-id: 4bb344e15c5f83480c30cb89fc3c213b33c2bbd4
This commit is contained in:
Lynix 2014-07-08 11:55:40 +02:00
parent f19b89f947
commit a0c2d81114
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,26 +173,19 @@ void NzForwardRenderQueue::Clear(bool fully)
void NzForwardRenderQueue::Sort(const NzAbstractViewer* viewer) void NzForwardRenderQueue::Sort(const NzAbstractViewer* viewer)
{ {
struct TransparentModelComparator NzPlanef nearPlane = viewer->GetFrustum().GetPlane(nzFrustumPlane_Near);
NzVector3f viewerNormal = viewer->GetForward();
std::sort(transparentModels.begin(), transparentModels.end(), [this, &nearPlane, &viewerNormal](unsigned int index1, unsigned int index2)
{ {
bool operator()(unsigned int index1, unsigned int index2) const NzSpheref& sphere1 = transparentModelData[index1].boundingSphere;
{ const NzSpheref& sphere2 = transparentModelData[index2].boundingSphere;
const NzSpheref& sphere1 = queue->transparentModelData[index1].boundingSphere;
const NzSpheref& sphere2 = queue->transparentModelData[index2].boundingSphere;
NzVector3f position1 = sphere1.GetNegativeVertex(viewerNormal); NzVector3f position1 = sphere1.GetNegativeVertex(viewerNormal);
NzVector3f position2 = sphere2.GetNegativeVertex(viewerNormal); NzVector3f position2 = sphere2.GetNegativeVertex(viewerNormal);
return nearPlane.Distance(position1) > nearPlane.Distance(position2); return nearPlane.Distance(position1) > nearPlane.Distance(position2);
} });
NzForwardRenderQueue* queue;
NzPlanef nearPlane;
NzVector3f viewerNormal;
};
TransparentModelComparator comparator {this, viewer->GetFrustum().GetPlane(nzFrustumPlane_Near), viewer->GetForward()};
std::sort(transparentModels.begin(), transparentModels.end(), comparator);
} }
bool NzForwardRenderQueue::OnResourceDestroy(const NzResource* resource, int index) bool NzForwardRenderQueue::OnResourceDestroy(const NzResource* resource, int index)