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

ValidateDataStructure.cpp: 

* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
pull/2366/head
Charlie Gettys 2019-03-10 13:12:56 -04:00
parent 2e262dbbc6
commit 7bb1303773
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/ValidateDataStructure.cpp
View File

@ -330,6 +330,7 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh)
{ {
case 0: case 0:
ReportError("aiMesh::mFaces[%i].mNumIndices is 0",i); ReportError("aiMesh::mFaces[%i].mNumIndices is 0",i);
break;
case 1: case 1:
if (0 == (pMesh->mPrimitiveTypes & aiPrimitiveType_POINT)) if (0 == (pMesh->mPrimitiveTypes & aiPrimitiveType_POINT))
{ {
@ -811,9 +812,9 @@ void ValidateDSProcess::Validate( const aiAnimation* pAnimation,
{ {
Validate(&pNodeAnim->mNodeName); Validate(&pNodeAnim->mNodeName);
if (!pNodeAnim->mNumPositionKeys && !pNodeAnim->mScalingKeys && !pNodeAnim->mNumRotationKeys) if (!pNodeAnim->mNumPositionKeys && !pNodeAnim->mScalingKeys && !pNodeAnim->mNumRotationKeys) {
ReportError("Empty node animation channel"); ReportError("Empty node animation channel");
}
// otherwise check whether one of the keys exceeds the total duration of the animation // otherwise check whether one of the keys exceeds the total duration of the animation
if (pNodeAnim->mNumPositionKeys) if (pNodeAnim->mNumPositionKeys)
{ {
@ -916,8 +917,9 @@ void ValidateDSProcess::Validate( const aiNode* pNode)
} }
// Validate node name string first so that it's safe to use in below expressions // Validate node name string first so that it's safe to use in below expressions
this->Validate(&pNode->mName); this->Validate(&pNode->mName);
const char* nodeName = (&pNode->mName)->C_Str();
if (pNode != mScene->mRootNode && !pNode->mParent){ if (pNode != mScene->mRootNode && !pNode->mParent){
ReportError("Non-root node %s lacks a valid parent (aiNode::mParent is NULL) ",pNode->mName); ReportError("Non-root node %s lacks a valid parent (aiNode::mParent is NULL) ", nodeName);
} }
// validate all meshes // validate all meshes
@ -926,7 +928,7 @@ void ValidateDSProcess::Validate( const aiNode* pNode)
if (!pNode->mMeshes) if (!pNode->mMeshes)
{ {
ReportError("aiNode::mMeshes is NULL for node %s (aiNode::mNumMeshes is %i)", ReportError("aiNode::mMeshes is NULL for node %s (aiNode::mNumMeshes is %i)",
pNode->mNumMeshes, pNode->mName); pNode->mNumMeshes, nodeName);
} }
std::vector<bool> abHadMesh; std::vector<bool> abHadMesh;
abHadMesh.resize(mScene->mNumMeshes,false); abHadMesh.resize(mScene->mNumMeshes,false);
@ -935,12 +937,12 @@ void ValidateDSProcess::Validate( const aiNode* pNode)
if (pNode->mMeshes[i] >= mScene->mNumMeshes) if (pNode->mMeshes[i] >= mScene->mNumMeshes)
{ {
ReportError("aiNode::mMeshes[%i] is out of range for node %s (maximum is %i)", ReportError("aiNode::mMeshes[%i] is out of range for node %s (maximum is %i)",
pNode->mMeshes[i], pNode->mName, mScene->mNumMeshes-1); pNode->mMeshes[i], nodeName, mScene->mNumMeshes-1);
} }
if (abHadMesh[pNode->mMeshes[i]]) if (abHadMesh[pNode->mMeshes[i]])
{ {
ReportError("aiNode::mMeshes[%i] is already referenced by this node %s (value: %i)", ReportError("aiNode::mMeshes[%i] is already referenced by this node %s (value: %i)",
i, pNode->mName, pNode->mMeshes[i]); i, nodeName, pNode->mMeshes[i]);
} }
abHadMesh[pNode->mMeshes[i]] = true; abHadMesh[pNode->mMeshes[i]] = true;
} }
@ -949,7 +951,7 @@ void ValidateDSProcess::Validate( const aiNode* pNode)
{ {
if (!pNode->mChildren) { if (!pNode->mChildren) {
ReportError("aiNode::mChildren is NULL for node %s (aiNode::mNumChildren is %i)", ReportError("aiNode::mChildren is NULL for node %s (aiNode::mNumChildren is %i)",
pNode->mName, pNode->mNumChildren); nodeName, pNode->mNumChildren);
} }
for (unsigned int i = 0; i < pNode->mNumChildren;++i) { for (unsigned int i = 0; i < pNode->mNumChildren;++i) {
Validate(pNode->mChildren[i]); Validate(pNode->mChildren[i]);