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

CAnimSetLoader: Collapse for loops into ranged for loops

This commit is contained in:
Lioncash 2020-06-12 11:28:05 -04:00
parent 9921ccfe25
commit 674ae65e56
1 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/Core/Resource/Factory/CAnimSetLoader.cpp
View File

@ -392,17 +392,17 @@ void CAnimSetLoader::ProcessPrimitives()
// Find all unique anim primitives // Find all unique anim primitives
std::set<CAnimPrimitive> UniquePrimitives; std::set<CAnimPrimitive> UniquePrimitives;
for (uint32 iAnim = 0; iAnim < pSet->mAnimations.size(); iAnim++) for (const auto& anim : pSet->mAnimations)
pSet->mAnimations[iAnim].pMetaAnim->GetUniquePrimitives(UniquePrimitives); anim.pMetaAnim->GetUniquePrimitives(UniquePrimitives);
for (uint32 iTrans = 0; iTrans < pSet->mTransitions.size(); iTrans++) for (const auto& transition : pSet->mTransitions)
pSet->mTransitions[iTrans].pMetaTrans->GetUniquePrimitives(UniquePrimitives); transition.pMetaTrans->GetUniquePrimitives(UniquePrimitives);
if (pSet->mpDefaultTransition) if (pSet->mpDefaultTransition)
pSet->mpDefaultTransition->GetUniquePrimitives(UniquePrimitives); pSet->mpDefaultTransition->GetUniquePrimitives(UniquePrimitives);
for (uint32 iTrans = 0; iTrans < pSet->mHalfTransitions.size(); iTrans++) for (const auto& halfTransition : pSet->mHalfTransitions)
pSet->mHalfTransitions[iTrans].pMetaTrans->GetUniquePrimitives(UniquePrimitives); halfTransition.pMetaTrans->GetUniquePrimitives(UniquePrimitives);
if (mGame == EGame::CorruptionProto || mGame == EGame::Corruption) if (mGame == EGame::CorruptionProto || mGame == EGame::Corruption)
{ {
@ -413,15 +413,14 @@ void CAnimSetLoader::ProcessPrimitives()
} }
// Copy anim primitives into the animset // Copy anim primitives into the animset
for (auto Iter = UniquePrimitives.begin(); Iter != UniquePrimitives.end(); Iter++) for (const auto& primitive : UniquePrimitives)
{ {
const CAnimPrimitive& rkPrim = *Iter; const uint32 ID = primitive.ID();
uint32 ID = rkPrim.ID();
if (ID >= pSet->mAnimPrimitives.size()) if (ID >= pSet->mAnimPrimitives.size())
pSet->mAnimPrimitives.resize(ID + 1); pSet->mAnimPrimitives.resize(ID + 1);
pSet->mAnimPrimitives[ID] = rkPrim; pSet->mAnimPrimitives[ID] = primitive;
} }
// Add used animation indices from the animset to the character's list // Add used animation indices from the animset to the character's list
@ -433,22 +432,18 @@ void CAnimSetLoader::ProcessPrimitives()
std::set<CAnimPrimitive> DefaultTransPrimitives; std::set<CAnimPrimitive> DefaultTransPrimitives;
pSet->mpDefaultTransition->GetUniquePrimitives(DefaultTransPrimitives); pSet->mpDefaultTransition->GetUniquePrimitives(DefaultTransPrimitives);
for (uint32 iChar = 0; iChar < pSet->mCharacters.size(); iChar++) for (auto& character : pSet->mCharacters)
{ {
SSetCharacter& rChar = pSet->mCharacters[iChar]; for (const auto& primitive : DefaultTransPrimitives)
for (auto Iter = DefaultTransPrimitives.begin(); Iter != DefaultTransPrimitives.end(); Iter++)
{ {
const CAnimPrimitive& rkPrim = *Iter; character.UsedAnimationIndices.insert(primitive.ID());
rChar.UsedAnimationIndices.insert(rkPrim.ID());
} }
} }
} }
// Add animations referenced by used transitions // Add animations referenced by used transitions
for (uint32 iChar = 0; iChar < pSet->mCharacters.size(); iChar++) for (auto& character : pSet->mCharacters)
{ {
SSetCharacter& rChar = pSet->mCharacters[iChar];
bool AddedNewAnims = true; bool AddedNewAnims = true;
// Loop this until we run out of new animations. This is in case any animations // Loop this until we run out of new animations. This is in case any animations
@ -457,47 +452,41 @@ void CAnimSetLoader::ProcessPrimitives()
{ {
AddedNewAnims = false; AddedNewAnims = false;
for (uint32 iTrans = 0; iTrans < pSet->mTransitions.size(); iTrans++) for (auto& transition : pSet->mTransitions)
{ {
STransition& rTrans = pSet->mTransitions[iTrans]; if (character.UsedAnimationIndices.find(transition.AnimIdA) == character.UsedAnimationIndices.cend() ||
character.UsedAnimationIndices.find(transition.AnimIdB) == character.UsedAnimationIndices.cend())
if ( rChar.UsedAnimationIndices.find(rTrans.AnimIdA) != rChar.UsedAnimationIndices.end() &&
rChar.UsedAnimationIndices.find(rTrans.AnimIdB) != rChar.UsedAnimationIndices.end() )
{ {
std::set<CAnimPrimitive> Primitives; continue;
rTrans.pMetaTrans->GetUniquePrimitives(Primitives); }
for (auto Iter = Primitives.begin(); Iter != Primitives.end(); Iter++) std::set<CAnimPrimitive> Primitives;
transition.pMetaTrans->GetUniquePrimitives(Primitives);
for (const auto& primitive : Primitives)
{
if (character.UsedAnimationIndices.find(primitive.ID()) == character.UsedAnimationIndices.cend())
{ {
const CAnimPrimitive& rkPrim = *Iter; character.UsedAnimationIndices.insert(primitive.ID());
AddedNewAnims = true;
if (rChar.UsedAnimationIndices.find(rkPrim.ID()) == rChar.UsedAnimationIndices.end())
{
rChar.UsedAnimationIndices.insert(rkPrim.ID());
AddedNewAnims = true;
}
} }
} }
} }
for (uint32 iHalf = 0; iHalf < pSet->mHalfTransitions.size(); iHalf++) for (SHalfTransition& trans : pSet->mHalfTransitions)
{ {
SHalfTransition& rTrans = pSet->mHalfTransitions[iHalf]; if (character.UsedAnimationIndices.find(trans.AnimID) == character.UsedAnimationIndices.cend())
continue;
if (rChar.UsedAnimationIndices.find(rTrans.AnimID) != rChar.UsedAnimationIndices.end()) std::set<CAnimPrimitive> Primitives;
trans.pMetaTrans->GetUniquePrimitives(Primitives);
for (const auto& primitive : Primitives)
{ {
std::set<CAnimPrimitive> Primitives; if (character.UsedAnimationIndices.find(primitive.ID()) == character.UsedAnimationIndices.cend())
rTrans.pMetaTrans->GetUniquePrimitives(Primitives);
for (auto Iter = Primitives.begin(); Iter != Primitives.end(); Iter++)
{ {
const CAnimPrimitive& rkPrim = *Iter; character.UsedAnimationIndices.insert(primitive.ID());
AddedNewAnims = true;
if (rChar.UsedAnimationIndices.find(rkPrim.ID()) == rChar.UsedAnimationIndices.end())
{
rChar.UsedAnimationIndices.insert(rkPrim.ID());
AddedNewAnims = true;
}
} }
} }
} }