Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace NULL and avoid ai_assert with more than 2 tests.

Browse Source
This commit is contained in:
Kim Kulling
2020-06-23 21:05:42 +02:00
parent 6397bfbf90 c70d57be4f
commit 6205af4efb
659 changed files with 30283 additions and 48642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/PostProcessing/PretransformVertices.cpp
View File

@@ -445,7 +445,7 @@ void PretransformVertices::Execute(aiScene *pScene) {
delete mesh->mBones[a];
delete[] mesh->mBones;
mesh->mBones = NULL;
mesh->mBones = nullptr;
}
// now build a list of output meshes
@@ -472,12 +472,12 @@ void PretransformVertices::Execute(aiScene *pScene) {
pScene->mMeshes = npp;
}
// now iterate through all meshes and transform them to worldspace
// now iterate through all meshes and transform them to world-space
for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
ApplyTransform(pScene->mMeshes[i], *reinterpret_cast<aiMatrix4x4 *>(pScene->mMeshes[i]->mBones));
// prevent improper destruction
pScene->mMeshes[i]->mBones = NULL;
pScene->mMeshes[i]->mBones = nullptr;
pScene->mMeshes[i]->mNumBones = 0;
}
} else {
@@ -539,22 +539,22 @@ void PretransformVertices::Execute(aiScene *pScene) {
for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
aiMesh *mesh = pScene->mMeshes[i];
mesh->mNumBones = 0;
mesh->mBones = NULL;
mesh->mBones = nullptr;
// we're reusing the face index arrays. avoid destruction
for (unsigned int a = 0; a < mesh->mNumFaces; ++a) {
mesh->mFaces[a].mNumIndices = 0;
mesh->mFaces[a].mIndices = NULL;
mesh->mFaces[a].mIndices = nullptr;
}
delete mesh;
// Invalidate the contents of the old mesh array. We will most
// likely have less output meshes now, so the last entries of
// the mesh array are not overridden. We set them to NULL to
// the mesh array are not overridden. We set them to nullptr to
// make sure the developer gets notified when his application
// attempts to access these fields ...
mesh = NULL;
mesh = nullptr;
}
// It is impossible that we have more output meshes than
@@ -571,14 +571,14 @@ void PretransformVertices::Execute(aiScene *pScene) {
delete pScene->mAnimations[i];
delete[] pScene->mAnimations;
pScene->mAnimations = NULL;
pScene->mAnimations = nullptr;
pScene->mNumAnimations = 0;
// --- we need to keep all cameras and lights
for (unsigned int i = 0; i < pScene->mNumCameras; ++i) {
aiCamera *cam = pScene->mCameras[i];
const aiNode *nd = pScene->mRootNode->FindNode(cam->mName);
ai_assert(NULL != nd);
ai_assert(nullptr != nd);
// multiply all properties of the camera with the absolute
// transformation of the corresponding node
@@ -590,7 +590,7 @@ void PretransformVertices::Execute(aiScene *pScene) {
for (unsigned int i = 0; i < pScene->mNumLights; ++i) {
aiLight *l = pScene->mLights[i];
const aiNode *nd = pScene->mRootNode->FindNode(l->mName);
ai_assert(NULL != nd);
ai_assert(nullptr != nd);
// multiply all properties of the camera with the absolute
// transformation of the corresponding node