|
@@ -728,7 +728,7 @@ aiMesh* ColladaLoader::CreateMesh( const ColladaParser& pParser, const Collada::
|
|
? aiMorphingMethod_MORPH_RELATIVE
|
|
? aiMorphingMethod_MORPH_RELATIVE
|
|
: aiMorphingMethod_MORPH_NORMALIZED;
|
|
: aiMorphingMethod_MORPH_NORMALIZED;
|
|
dstMesh->mAnimMeshes = new aiAnimMesh*[animMeshes.size()];
|
|
dstMesh->mAnimMeshes = new aiAnimMesh*[animMeshes.size()];
|
|
- dstMesh->mNumAnimMeshes = animMeshes.size();
|
|
|
|
|
|
+ dstMesh->mNumAnimMeshes = static_cast<unsigned int>(animMeshes.size());
|
|
for (unsigned int i = 0; i < animMeshes.size(); i++)
|
|
for (unsigned int i = 0; i < animMeshes.size(); i++)
|
|
dstMesh->mAnimMeshes[i] = animMeshes.at(i);
|
|
dstMesh->mAnimMeshes[i] = animMeshes.at(i);
|
|
}
|
|
}
|
|
@@ -1377,9 +1377,9 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
|
|
{
|
|
{
|
|
aiNodeAnim* dstAnim = new aiNodeAnim;
|
|
aiNodeAnim* dstAnim = new aiNodeAnim;
|
|
dstAnim->mNodeName = nodeName;
|
|
dstAnim->mNodeName = nodeName;
|
|
- dstAnim->mNumPositionKeys = resultTrafos.size();
|
|
|
|
- dstAnim->mNumRotationKeys= resultTrafos.size();
|
|
|
|
- dstAnim->mNumScalingKeys = resultTrafos.size();
|
|
|
|
|
|
+ dstAnim->mNumPositionKeys = static_cast<unsigned int>(resultTrafos.size());
|
|
|
|
+ dstAnim->mNumRotationKeys = static_cast<unsigned int>(resultTrafos.size());
|
|
|
|
+ dstAnim->mNumScalingKeys = static_cast<unsigned int>(resultTrafos.size());
|
|
dstAnim->mPositionKeys = new aiVectorKey[resultTrafos.size()];
|
|
dstAnim->mPositionKeys = new aiVectorKey[resultTrafos.size()];
|
|
dstAnim->mRotationKeys = new aiQuatKey[resultTrafos.size()];
|
|
dstAnim->mRotationKeys = new aiQuatKey[resultTrafos.size()];
|
|
dstAnim->mScalingKeys = new aiVectorKey[resultTrafos.size()];
|
|
dstAnim->mScalingKeys = new aiVectorKey[resultTrafos.size()];
|
|
@@ -1445,11 +1445,11 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
|
|
++morphAnimChannelIndex;
|
|
++morphAnimChannelIndex;
|
|
}
|
|
}
|
|
|
|
|
|
- morphAnim->mNumKeys = morphTimeValues.size();
|
|
|
|
|
|
+ morphAnim->mNumKeys = static_cast<unsigned int>(morphTimeValues.size());
|
|
morphAnim->mKeys = new aiMeshMorphKey[morphAnim->mNumKeys];
|
|
morphAnim->mKeys = new aiMeshMorphKey[morphAnim->mNumKeys];
|
|
for (unsigned int key = 0; key < morphAnim->mNumKeys; key++)
|
|
for (unsigned int key = 0; key < morphAnim->mNumKeys; key++)
|
|
{
|
|
{
|
|
- morphAnim->mKeys[key].mNumValuesAndWeights = morphChannels.size();
|
|
|
|
|
|
+ morphAnim->mKeys[key].mNumValuesAndWeights = static_cast<unsigned int>(morphChannels.size());
|
|
morphAnim->mKeys[key].mValues = new unsigned int [morphChannels.size()];
|
|
morphAnim->mKeys[key].mValues = new unsigned int [morphChannels.size()];
|
|
morphAnim->mKeys[key].mWeights = new double [morphChannels.size()];
|
|
morphAnim->mKeys[key].mWeights = new double [morphChannels.size()];
|
|
|
|
|
|
@@ -1470,13 +1470,13 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
|
|
{
|
|
{
|
|
aiAnimation* anim = new aiAnimation;
|
|
aiAnimation* anim = new aiAnimation;
|
|
anim->mName.Set( pName);
|
|
anim->mName.Set( pName);
|
|
- anim->mNumChannels = anims.size();
|
|
|
|
|
|
+ anim->mNumChannels = static_cast<unsigned int>(anims.size());
|
|
if (anim->mNumChannels > 0)
|
|
if (anim->mNumChannels > 0)
|
|
{
|
|
{
|
|
anim->mChannels = new aiNodeAnim*[anims.size()];
|
|
anim->mChannels = new aiNodeAnim*[anims.size()];
|
|
std::copy( anims.begin(), anims.end(), anim->mChannels);
|
|
std::copy( anims.begin(), anims.end(), anim->mChannels);
|
|
}
|
|
}
|
|
- anim->mNumMorphMeshChannels = morphAnims.size();
|
|
|
|
|
|
+ anim->mNumMorphMeshChannels = static_cast<unsigned int>(morphAnims.size());
|
|
if (anim->mNumMorphMeshChannels > 0)
|
|
if (anim->mNumMorphMeshChannels > 0)
|
|
{
|
|
{
|
|
anim->mMorphMeshChannels = new aiMeshMorphAnim*[anim->mNumMorphMeshChannels];
|
|
anim->mMorphMeshChannels = new aiMeshMorphAnim*[anim->mNumMorphMeshChannels];
|