ColladaLoader: format.
parent
ce1302cd71
commit
51b790c482
|
@ -73,7 +73,7 @@ static const aiImporterDesc desc = {
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Constructor to be privately used by Importer
|
// Constructor to be privately used by Importer
|
||||||
ColladaLoader::ColladaLoader()
|
ColladaLoader::ColladaLoader()
|
||||||
: noSkeletonMesh(), ignoreUpDirection(false), mNodeNameCounter()
|
: noSkeletonMesh(), ignoreUpDirection(false), mNodeNameCounter()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
@ -624,8 +624,8 @@ aiMesh* ColladaLoader::CreateMesh( const ColladaParser& pParser, const Collada::
|
||||||
if( pSrcController)
|
if( pSrcController)
|
||||||
{
|
{
|
||||||
// refuse if the vertex count does not match
|
// refuse if the vertex count does not match
|
||||||
// if( pSrcController->mWeightCounts.size() != dstMesh->mNumVertices)
|
// if( pSrcController->mWeightCounts.size() != dstMesh->mNumVertices)
|
||||||
// throw DeadlyImportError( "Joint Controller vertex count does not match mesh vertex count");
|
// throw DeadlyImportError( "Joint Controller vertex count does not match mesh vertex count");
|
||||||
|
|
||||||
// resolve references - joint names
|
// resolve references - joint names
|
||||||
const Collada::Accessor& jointNamesAcc = pParser.ResolveLibraryReference( pParser.mAccessorLibrary, pSrcController->mJointNameSource);
|
const Collada::Accessor& jointNamesAcc = pParser.ResolveLibraryReference( pParser.mAccessorLibrary, pSrcController->mJointNameSource);
|
||||||
|
@ -937,7 +937,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
|
||||||
|
|
||||||
// find the collada node corresponding to the aiNode
|
// find the collada node corresponding to the aiNode
|
||||||
const Collada::Node* srcNode = FindNode( pParser.mRootNode, nodeName);
|
const Collada::Node* srcNode = FindNode( pParser.mRootNode, nodeName);
|
||||||
// ai_assert( srcNode != NULL);
|
// ai_assert( srcNode != NULL);
|
||||||
if( !srcNode)
|
if( !srcNode)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1155,7 +1155,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
|
||||||
}
|
}
|
||||||
|
|
||||||
// there should be some keyframes, but we aren't that fixated on valid input data
|
// there should be some keyframes, but we aren't that fixated on valid input data
|
||||||
// ai_assert( resultTrafos.size() > 0);
|
// ai_assert( resultTrafos.size() > 0);
|
||||||
|
|
||||||
// build an animation channel for the given node out of these trafo keys
|
// build an animation channel for the given node out of these trafo keys
|
||||||
if( !resultTrafos.empty() )
|
if( !resultTrafos.empty() )
|
||||||
|
|
Loading…
Reference in New Issue