AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CCollisionLoader: Collapse for loop into ranged for 

Also removes a delete left behind in an error case.
This commit is contained in:
Lioncash 2020-06-12 12:52:26 -04:00
parent 3449f60317
commit 3b3b2cc80f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,16 +231,15 @@ std::unique_ptr<CCollisionMeshGroup> CCollisionLoader::LoadDCLN(IInputStream& rD
CCollisionLoader Loader; CCollisionLoader Loader;
Loader.mpGroup = ptr.get(); Loader.mpGroup = ptr.get();
uint32 NumMeshes = rDCLN.ReadLong(); const uint32 NumMeshes = rDCLN.ReadLong();
for (uint32 MeshIdx = 0; MeshIdx < NumMeshes; MeshIdx++) for (uint32 MeshIdx = 0; MeshIdx < NumMeshes; MeshIdx++)
{ {
uint32 DeafBabe = rDCLN.ReadLong(); const uint32 DeafBabe = rDCLN.ReadLong();
if (DeafBabe != 0xDEAFBABE) if (DeafBabe != 0xDEAFBABE)
{ {
errorf("%s [0x%X]: Invalid collision magic: 0x%08X", *rDCLN.GetSourceString(), rDCLN.Tell() - 4, DeafBabe); errorf("%s [0x%X]: Invalid collision magic: 0x%08X", *rDCLN.GetSourceString(), rDCLN.Tell() - 4, DeafBabe);
delete Loader.mpGroup;
return nullptr; return nullptr;
} }
@ -261,11 +260,9 @@ std::unique_ptr<CCollisionMeshGroup> CCollisionLoader::LoadDCLN(IInputStream& rD
{ {
Loader.mpMesh->mAABox = CAABox::skInfinite; Loader.mpMesh->mAABox = CAABox::skInfinite;
for (uint i=0; i<Loader.mpMesh->mIndexData.Vertices.size(); i++) for (const auto& vert : Loader.mpMesh->mIndexData.Vertices)
{ {
Loader.mpMesh->mAABox.ExpandBounds( Loader.mpMesh->mAABox.ExpandBounds(vert);
Loader.mpMesh->mIndexData.Vertices[i]
);
} }
} }