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

ASE: Added WIP support for *SMOOTHSKINMESH elements in ASE/ASC files. Fixes in the ASE loader. Fixed animation parsing. Temporary implementation of target lights and cameras, including animations.

Browse Source 
3DS: Fixed transformation problems (Pivot points), added WIP animation support. No target animation yet (cameras, spot lights). Not yet fully tested, but static models that worked before should still work now, except all look correct now :-) (some problems with very large models remaining)
Further work on the IRR and IRRMESH loaders. IRR still WIP, IRRMESH more stable now.
Work on the LWo loader. Added support for the "one-layer-only" mode. Hierarchy bug still unfixed, UV coords bug still unfixed.
Further work on the FindInvalidDataprocess. Improved validation for normals, no false positives anymore.
Further work on the MDR loader, still WIP.
Moved DeterminePType-Step to ScenePreprocessor.
aiAnimation::mDuration is optional now, ScenePreprocessor computes it automatically if set to -1.
Fixes in the SMD loader. Still crashes on some files.
Updated animation documentation.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@236 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-11-09 23:17:19 +00:00
parent 06e4262f80
commit f7aa836330
50 changed files with 4252 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/ValidateDataStructure.cpp
View File

@@ -242,6 +242,10 @@ void ValidateDSProcess::Execute( aiScene* pScene)
{
ReportError("aiScene::mNumMeshes is 0. At least one mesh must be there");
}
else if (pScene->mMeshes)
{
ReportError("aiScene::mMeshes is non-null although there are no meshes");
}
// validate all animations
if (pScene->mNumAnimations)
@@ -250,7 +254,11 @@ void ValidateDSProcess::Execute( aiScene* pScene)
DoValidation(pScene->mAnimations,pScene->mNumAnimations,
"mAnimations","mNumAnimations");
}
else if (pScene->mAnimations)
{
ReportError("aiScene::mAnimations is non-null although there are no animations");
}
// validate all cameras
if (pScene->mNumCameras)
{
@@ -258,6 +266,10 @@ void ValidateDSProcess::Execute( aiScene* pScene)
DoValidationWithNameCheck(pScene->mCameras,pScene->mNumCameras,
"mCameras","mNumCameras");
}
else if (pScene->mCameras)
{
ReportError("aiScene::mCameras is non-null although there are no cameras");
}
// validate all lights
if (pScene->mNumLights)
@@ -266,6 +278,10 @@ void ValidateDSProcess::Execute( aiScene* pScene)
DoValidationWithNameCheck(pScene->mLights,pScene->mNumLights,
"mLights","mNumLights");
}
else if (pScene->mLights)
{
ReportError("aiScene::mLights is non-null although there are no lights");
}
// validate all materials
if (pScene->mNumMaterials)
@@ -277,6 +293,10 @@ void ValidateDSProcess::Execute( aiScene* pScene)
{
ReportError("aiScene::mNumMaterials is 0. At least one material must be there");
}
else if (pScene->mMaterials)
{
ReportError("aiScene::mMaterials is non-null although there are no materials");
}
if (!has)ReportError("The aiScene data structure is empty");
DefaultLogger::get()->debug("ValidateDataStructureProcess end");
@@ -452,7 +472,7 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh)
// now validate all bones
if (pMesh->HasBones())
if (pMesh->mNumBones)
{
if (!pMesh->mBones)
{
@@ -498,6 +518,10 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh)
}
delete[] afSum;
}
else if (pMesh->mBones)
{
ReportError("aiMesh::mBones is non-null although there are no bones");
}
}
// ------------------------------------------------------------------------------------------------
void ValidateDSProcess::Validate( const aiMesh* pMesh,
@@ -513,7 +537,7 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh,
// check whether all vertices affected by this bone are valid
for (unsigned int i = 0; i < pBone->mNumWeights;++i)
{
if (pBone->mWeights[i].mVertexId > pMesh->mNumVertices)
if (pBone->mWeights[i].mVertexId >= pMesh->mNumVertices)
{
this->ReportError("aiBone::mWeights[%i].mVertexId is out of range",i);
}
@@ -832,14 +856,14 @@ __break_out:
{
if (pNodeAnim->mPositionKeys[i].mTime > pAnimation->mDuration)
{
this->ReportError("aiNodeAnim::mPositionKeys[%i].mTime (%.5f) is larger "
ReportError("aiNodeAnim::mPositionKeys[%i].mTime (%.5f) is larger "
"than aiAnimation::mDuration (which is %.5f)",i,
(float)pNodeAnim->mPositionKeys[i].mTime,
(float)pAnimation->mDuration);
}
if (pNodeAnim->mPositionKeys[i].mTime <= dLast)
{
this->ReportWarning("aiNodeAnim::mPositionKeys[%i].mTime (%.5f) is smaller "
ReportWarning("aiNodeAnim::mPositionKeys[%i].mTime (%.5f) is smaller "
"than aiAnimation::mPositionKeys[%i] (which is %.5f)",i,
(float)pNodeAnim->mPositionKeys[i].mTime,
i-1, (float)dLast);
@@ -860,14 +884,14 @@ __break_out:
{
if (pNodeAnim->mRotationKeys[i].mTime > pAnimation->mDuration)
{
this->ReportError("aiNodeAnim::mRotationKeys[%i].mTime (%.5f) is larger "
ReportError("aiNodeAnim::mRotationKeys[%i].mTime (%.5f) is larger "
"than aiAnimation::mDuration (which is %.5f)",i,
(float)pNodeAnim->mRotationKeys[i].mTime,
(float)pAnimation->mDuration);
}
if (pNodeAnim->mRotationKeys[i].mTime <= dLast)
{
this->ReportWarning("aiNodeAnim::mRotationKeys[%i].mTime (%.5f) is smaller "
ReportWarning("aiNodeAnim::mRotationKeys[%i].mTime (%.5f) is smaller "
"than aiAnimation::mRotationKeys[%i] (which is %.5f)",i,
(float)pNodeAnim->mRotationKeys[i].mTime,
i-1, (float)dLast);
@@ -888,14 +912,14 @@ __break_out:
{
if (pNodeAnim->mScalingKeys[i].mTime > pAnimation->mDuration)
{
this->ReportError("aiNodeAnim::mScalingKeys[%i].mTime (%.5f) is larger "
ReportError("aiNodeAnim::mScalingKeys[%i].mTime (%.5f) is larger "
"than aiAnimation::mDuration (which is %.5f)",i,
(float)pNodeAnim->mScalingKeys[i].mTime,
(float)pAnimation->mDuration);
}
if (pNodeAnim->mScalingKeys[i].mTime <= dLast)
{
this->ReportWarning("aiNodeAnim::mScalingKeys[%i].mTime (%.5f) is smaller "
ReportWarning("aiNodeAnim::mScalingKeys[%i].mTime (%.5f) is smaller "
"than aiAnimation::mScalingKeys[%i] (which is %.5f)",i,
(float)pNodeAnim->mScalingKeys[i].mTime,
i-1, (float)dLast);
@@ -903,6 +927,12 @@ __break_out:
dLast = pNodeAnim->mScalingKeys[i].mTime;
}
}
if (!pNodeAnim->mNumScalingKeys && !pNodeAnim->mNumRotationKeys &&
!pNodeAnim->mNumPositionKeys)
{
ReportError("A node animation channel must have at least one subtrack");
}
}
// ------------------------------------------------------------------------------------------------
void ValidateDSProcess::Validate( const aiNode* pNode)