AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-04 04:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

CCollisionLoader: Collapse for loop into ranged for pt. 2

Browse Source
This commit is contained in:
Lioncash 2020-06-12 12:57:18 -04:00
parent 3b3b2cc80f
commit 48d8d361b6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Core/Resource/Factory/CCollisionLoader.cpp
View File

@ -132,59 +132,59 @@ void CCollisionLoader::LoadCollisionMaterial(IInputStream& Src, CCollisionMateri
void CCollisionLoader::LoadCollisionIndices(IInputStream& File, SCollisionIndexData& OutData) void CCollisionLoader::LoadCollisionIndices(IInputStream& File, SCollisionIndexData& OutData)
{ {
// Materials // Materials
uint NumMaterials = File.ReadLong(); const uint NumMaterials = File.ReadLong();
OutData.Materials.resize( NumMaterials ); OutData.Materials.resize(NumMaterials);
for (uint i=0; i<NumMaterials; i++) for (auto& material : OutData.Materials)
{ {
LoadCollisionMaterial(File, OutData.Materials[i]); LoadCollisionMaterial(File, material);
} }
// Property indices for vertices/edges/triangles // Property indices for vertices/edges/triangles
uint VertexMaterialCount = File.ReadLong(); const uint32 VertexMaterialCount = File.ReadLong();
OutData.VertexMaterialIndices.resize(VertexMaterialCount); OutData.VertexMaterialIndices.resize(VertexMaterialCount);
File.ReadBytes(OutData.VertexMaterialIndices.data(), VertexMaterialCount); File.ReadBytes(OutData.VertexMaterialIndices.data(), VertexMaterialCount);
uint32 EdgeMaterialCount = File.ReadLong(); const uint32 EdgeMaterialCount = File.ReadLong();
OutData.EdgeMaterialIndices.resize(EdgeMaterialCount); OutData.EdgeMaterialIndices.resize(EdgeMaterialCount);
File.ReadBytes(OutData.EdgeMaterialIndices.data(), EdgeMaterialCount); File.ReadBytes(OutData.EdgeMaterialIndices.data(), EdgeMaterialCount);
uint32 TriMaterialCount = File.ReadLong(); const uint32 TriMaterialCount = File.ReadLong();
OutData.TriangleMaterialIndices.resize(TriMaterialCount); OutData.TriangleMaterialIndices.resize(TriMaterialCount);
File.ReadBytes(OutData.TriangleMaterialIndices.data(), TriMaterialCount); File.ReadBytes(OutData.TriangleMaterialIndices.data(), TriMaterialCount);
// Edges // Edges
uint NumEdges = File.ReadLong(); const uint32 NumEdges = File.ReadLong();
OutData.EdgeIndices.resize( NumEdges * 2 ); OutData.EdgeIndices.resize(NumEdges * 2);
for (uint i=0; i<OutData.EdgeIndices.size(); i++) for (auto& edge : OutData.EdgeIndices)
{ {
OutData.EdgeIndices[i] = File.ReadShort(); edge = File.ReadShort();
} }
// Triangles // Triangles
uint NumTris = File.ReadLong(); const uint32 NumTris = File.ReadLong();
OutData.TriangleIndices.resize( NumTris ); OutData.TriangleIndices.resize(NumTris);
for (uint i=0; i<NumTris; i++) for (auto& triangle : OutData.TriangleIndices)
{ {
OutData.TriangleIndices[i] = File.ReadShort(); triangle = File.ReadShort();
} }
// Echoes introduces a new data chunk; don't know what it is yet, skipping for now // Echoes introduces a new data chunk; don't know what it is yet, skipping for now
if (mVersion >= EGame::Echoes) if (mVersion >= EGame::Echoes)
{ {
uint UnknownCount = File.ReadLong(); const uint32 UnknownCount = File.ReadLong();
File.Skip(UnknownCount * 2); File.Skip(UnknownCount * 2);
} }
// Vertices // Vertices
uint NumVertices = File.ReadLong(); const uint32 NumVertices = File.ReadLong();
OutData.Vertices.resize(NumVertices); OutData.Vertices.resize(NumVertices);
for (uint32 i=0; i<NumVertices; i++) for (auto& vert : OutData.Vertices)
{ {
OutData.Vertices[i].Read(File); vert.Read(File);
} }
} }