v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply clang-tidy modernize-loop-convert transformation

pull/4699/head
Turo Lamminen 2022-08-23 13:59:42 +03:00
parent 04997ccbf3
commit 5f28c51c03
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
code/AssetLib/SMD/SMDLoader.cpp
View File

@ -147,10 +147,8 @@ void SMDImporter::InternReadFile( const std::string& pFile, aiScene* scene, IOSy
if (!asBones.empty()) { if (!asBones.empty()) {
// Check whether all bones have been initialized // Check whether all bones have been initialized
for (std::vector<SMD::Bone>::const_iterator for (const auto &asBone : asBones) {
i = asBones.begin(); if (!asBone.mName.length()) {
i != asBones.end();++i) {
if (!(*i).mName.length()) {
ASSIMP_LOG_WARN("SMD: Not all bones have been initialized"); ASSIMP_LOG_WARN("SMD: Not all bones have been initialized");
break; break;
} }
@ -210,12 +208,10 @@ void SMDImporter::LogWarning(const char* msg) {
void SMDImporter::FixTimeValues() { void SMDImporter::FixTimeValues() {
double dDelta = (double)iSmallestFrame; double dDelta = (double)iSmallestFrame;
double dMax = 0.0f; double dMax = 0.0f;
for (std::vector<SMD::Bone>::iterator for (auto &asBone : asBones) {
iBone = asBones.begin();
iBone != asBones.end();++iBone) {
for (std::vector<SMD::Bone::Animation::MatrixKey>::iterator for (std::vector<SMD::Bone::Animation::MatrixKey>::iterator
iKey = (*iBone).sAnim.asKeys.begin(); iKey = asBone.sAnim.asKeys.begin();
iKey != (*iBone).sAnim.asKeys.end();++iKey) { iKey != asBone.sAnim.asKeys.end();++iKey) {
(*iKey).dTime -= dDelta; (*iKey).dTime -= dDelta;
dMax = std::max(dMax, (*iKey).dTime); dMax = std::max(dMax, (*iKey).dTime);
} }
@ -351,8 +347,7 @@ void SMDImporter::CreateOutputMeshes() {
if (fSum) { if (fSum) {
fSum = 1 / fSum; fSum = 1 / fSum;
for (unsigned int iBone = 0;iBone < face.avVertices[iVert].aiBoneLinks.size();++iBone) { for (auto &pairval : face.avVertices[iVert].aiBoneLinks) {
TempWeightListEntry& pairval = face.avVertices[iVert].aiBoneLinks[iBone];
if (pairval.first >= asBones.size()) { if (pairval.first >= asBones.size()) {
continue; continue;
} }
@ -411,8 +406,7 @@ void SMDImporter::AddBoneChildren(aiNode* pcNode, uint32_t iParent) {
ai_assert( nullptr == pcNode->mChildren); ai_assert( nullptr == pcNode->mChildren);
// first count ... // first count ...
for (unsigned int i = 0; i < asBones.size();++i) { for (auto &bone : asBones) {
SMD::Bone& bone = asBones[i];
if (bone.iParent == iParent) { if (bone.iParent == iParent) {
++pcNode->mNumChildren; ++pcNode->mNumChildren;
} }
@ -516,21 +510,21 @@ void SMDImporter::CreateOutputAnimation(int index, const std::string &name) {
// now build valid keys // now build valid keys
unsigned int a = 0; unsigned int a = 0;
for (std::vector<SMD::Bone>::const_iterator i = asBones.begin(); i != asBones.end(); ++i) { for (const auto &asBone : asBones) {
aiNodeAnim* p = pp[a] = new aiNodeAnim(); aiNodeAnim* p = pp[a] = new aiNodeAnim();
// copy the name of the bone // copy the name of the bone
p->mNodeName.Set(i->mName); p->mNodeName.Set(asBone.mName);
p->mNumRotationKeys = (unsigned int)(*i).sAnim.asKeys.size(); p->mNumRotationKeys = (unsigned int)asBone.sAnim.asKeys.size();
if (p->mNumRotationKeys){ if (p->mNumRotationKeys){
p->mNumPositionKeys = p->mNumRotationKeys; p->mNumPositionKeys = p->mNumRotationKeys;
aiVectorKey* pVecKeys = p->mPositionKeys = new aiVectorKey[p->mNumRotationKeys]; aiVectorKey* pVecKeys = p->mPositionKeys = new aiVectorKey[p->mNumRotationKeys];
aiQuatKey* pRotKeys = p->mRotationKeys = new aiQuatKey[p->mNumRotationKeys]; aiQuatKey* pRotKeys = p->mRotationKeys = new aiQuatKey[p->mNumRotationKeys];
for (std::vector<SMD::Bone::Animation::MatrixKey>::const_iterator for (std::vector<SMD::Bone::Animation::MatrixKey>::const_iterator
qq = (*i).sAnim.asKeys.begin(); qq = asBone.sAnim.asKeys.begin();
qq != (*i).sAnim.asKeys.end(); ++qq) { qq != asBone.sAnim.asKeys.end(); ++qq) {
pRotKeys->mTime = pVecKeys->mTime = (*qq).dTime; pRotKeys->mTime = pVecKeys->mTime = (*qq).dTime;
// compute the rotation quaternion from the euler angles // compute the rotation quaternion from the euler angles
@ -982,8 +976,8 @@ void SMDImporter::ParseTriangle(const char* szCurrent, const char** szCurrentOut
SkipSpacesAndLineEnd(szCurrent,&szCurrent); SkipSpacesAndLineEnd(szCurrent,&szCurrent);
// load three vertices // load three vertices
for (unsigned int iVert = 0; iVert < 3;++iVert) { for (auto &avVertex : face.avVertices) {
ParseVertex(szCurrent,&szCurrent, face.avVertices[iVert]); ParseVertex(szCurrent,&szCurrent, avVertex);
} }
*szCurrentOut = szCurrent; *szCurrentOut = szCurrent;
} }
@ -1080,13 +1074,11 @@ void SMDImporter::ParseVertex(const char* szCurrent,
} }
vertex.aiBoneLinks.resize(iSize,std::pair<unsigned int, float>(0,0.0f)); vertex.aiBoneLinks.resize(iSize,std::pair<unsigned int, float>(0,0.0f));
for (std::vector<std::pair<unsigned int, float> >::iterator for (auto &aiBoneLink : vertex.aiBoneLinks) {
i = vertex.aiBoneLinks.begin(); if(!ParseUnsignedInt(szCurrent,&szCurrent,aiBoneLink.first)) {
i != vertex.aiBoneLinks.end();++i) {
if(!ParseUnsignedInt(szCurrent,&szCurrent,(*i).first)) {
SMDI_PARSE_RETURN; SMDI_PARSE_RETURN;
} }
if(!ParseFloat(szCurrent,&szCurrent,(*i).second)) { if(!ParseFloat(szCurrent,&szCurrent,aiBoneLink.second)) {
SMDI_PARSE_RETURN; SMDI_PARSE_RETURN;
} }
} }