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

Graphics/ForwardRenderQueue: Cleanup a bit

This commit is contained in:
Lynix 2017-04-21 21:48:05 +02:00
parent 33b10989e2
commit 140e52203d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ namespace Nz
std::vector<BillboardData> billboards; std::vector<BillboardData> billboards;
}; };
typedef std::map<const Material*, BatchedBillboardEntry, MaterialComparator> BatchedBillboardContainer; using BatchedBillboardContainer = std::map<const Material*, BatchedBillboardEntry, MaterialComparator>;
struct BatchedBillboardPipelineEntry struct BatchedBillboardPipelineEntry
{ {
@ -81,7 +81,7 @@ namespace Nz
bool enabled = false; bool enabled = false;
}; };
typedef std::map<const MaterialPipeline*, BatchedBillboardPipelineEntry, MaterialPipelineComparator> BillboardPipelineBatches; using BillboardPipelineBatches = std::map<const MaterialPipeline*, BatchedBillboardPipelineEntry, MaterialPipelineComparator>;
/// Sprites /// Sprites
struct SpriteChain_XYZ_Color_UV struct SpriteChain_XYZ_Color_UV
@ -97,7 +97,7 @@ namespace Nz
std::vector<SpriteChain_XYZ_Color_UV> spriteChains; std::vector<SpriteChain_XYZ_Color_UV> spriteChains;
}; };
typedef std::map<const Texture*, BatchedSpriteEntry> SpriteOverlayBatches; using SpriteOverlayBatches = std::map<const Texture*, BatchedSpriteEntry>;
struct BatchedBasicSpriteEntry struct BatchedBasicSpriteEntry
{ {
@ -107,7 +107,7 @@ namespace Nz
bool enabled = false; bool enabled = false;
}; };
typedef std::map<const Material*, BatchedBasicSpriteEntry, MaterialComparator> SpriteMaterialBatches; using SpriteMaterialBatches = std::map<const Material*, BatchedBasicSpriteEntry, MaterialComparator>;
struct BatchedSpritePipelineEntry struct BatchedSpritePipelineEntry
{ {
@ -115,7 +115,7 @@ namespace Nz
bool enabled = false; bool enabled = false;
}; };
typedef std::map<const MaterialPipeline*, BatchedSpritePipelineEntry, MaterialPipelineComparator> SpritePipelineBatches; using SpritePipelineBatches = std::map<const MaterialPipeline*, BatchedSpritePipelineEntry, MaterialPipelineComparator>;
/// Meshes /// Meshes
struct MeshDataComparator struct MeshDataComparator
@ -132,7 +132,7 @@ namespace Nz
Spheref squaredBoundingSphere; Spheref squaredBoundingSphere;
}; };
typedef std::map<MeshData, MeshInstanceEntry, MeshDataComparator> MeshInstanceContainer; using MeshInstanceContainer = std::map<MeshData, MeshInstanceEntry, MeshDataComparator>;
struct BatchedModelEntry struct BatchedModelEntry
{ {
@ -142,7 +142,7 @@ namespace Nz
bool enabled = false; bool enabled = false;
}; };
typedef std::map<const Material*, BatchedModelEntry, MaterialComparator> MeshMaterialBatches; using MeshMaterialBatches = std::map<const Material*, BatchedModelEntry, MaterialComparator>;
struct BatchedMaterialEntry struct BatchedMaterialEntry
{ {
@ -150,7 +150,7 @@ namespace Nz
MeshMaterialBatches materialMap; MeshMaterialBatches materialMap;
}; };
typedef std::map<const MaterialPipeline*, BatchedMaterialEntry, MaterialPipelineComparator> MeshPipelineBatches; using MeshPipelineBatches = std::map<const MaterialPipeline*, BatchedMaterialEntry, MaterialPipelineComparator>;
struct TransparentModelData struct TransparentModelData
{ {
@ -160,7 +160,7 @@ namespace Nz
const Material* material; const Material* material;
}; };
typedef std::vector<std::size_t> TransparentModelContainer; using TransparentModelContainer = std::vector<std::size_t>;
struct Layer struct Layer
{ {