Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
parent
97b67d5cb5
commit
98532b45bf
|
@ -866,8 +866,8 @@ void ColladaExporter::WriteController( size_t pIndex)
|
||||||
|
|
||||||
std::vector<ai_real> bind_poses;
|
std::vector<ai_real> bind_poses;
|
||||||
bind_poses.reserve(mesh->mNumBones * 16);
|
bind_poses.reserve(mesh->mNumBones * 16);
|
||||||
for( size_t i = 0; i < mesh->mNumBones; ++i)
|
for(unsigned int i = 0; i < mesh->mNumBones; ++i)
|
||||||
for( size_t j = 0; j < 4; ++j)
|
for( unsigned int j = 0; j < 4; ++j)
|
||||||
bind_poses.insert(bind_poses.end(), mesh->mBones[i]->mOffsetMatrix[j], mesh->mBones[i]->mOffsetMatrix[j] + 4);
|
bind_poses.insert(bind_poses.end(), mesh->mBones[i]->mOffsetMatrix[j], mesh->mBones[i]->mOffsetMatrix[j] + 4);
|
||||||
|
|
||||||
WriteFloatArray( idstr + "-skin-bind_poses", FloatType_Mat4x4, (const ai_real*) bind_poses.data(), bind_poses.size() / 16);
|
WriteFloatArray( idstr + "-skin-bind_poses", FloatType_Mat4x4, (const ai_real*) bind_poses.data(), bind_poses.size() / 16);
|
||||||
|
@ -924,11 +924,11 @@ void ColladaExporter::WriteController( size_t pIndex)
|
||||||
|
|
||||||
ai_uint weight_index = 0;
|
ai_uint weight_index = 0;
|
||||||
std::vector<ai_int> joint_weight_indices(2 * joint_weight_indices_length, (ai_int)-1);
|
std::vector<ai_int> joint_weight_indices(2 * joint_weight_indices_length, (ai_int)-1);
|
||||||
for( size_t i = 0; i < mesh->mNumBones; ++i)
|
for( unsigned int i = 0; i < mesh->mNumBones; ++i)
|
||||||
for( size_t j = 0; j < mesh->mBones[i]->mNumWeights; ++j)
|
for( unsigned j = 0; j < mesh->mBones[i]->mNumWeights; ++j)
|
||||||
{
|
{
|
||||||
unsigned int vId = mesh->mBones[i]->mWeights[j].mVertexId;
|
unsigned int vId = mesh->mBones[i]->mWeights[j].mVertexId;
|
||||||
for( size_t k = 0; k < num_influences[vId]; ++k)
|
for( ai_uint k = 0; k < num_influences[vId]; ++k)
|
||||||
{
|
{
|
||||||
if (joint_weight_indices[2 * (accum_influences[vId] + k)] == -1)
|
if (joint_weight_indices[2 * (accum_influences[vId] + k)] == -1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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->mNumPositionKeys = static_cast<unsigned int>(resultTrafos.size());
|
||||||
dstAnim->mNumRotationKeys= resultTrafos.size();
|
dstAnim->mNumRotationKeys = static_cast<unsigned int>(resultTrafos.size());
|
||||||
dstAnim->mNumScalingKeys = 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];
|
||||||
|
|
Loading…
Reference in New Issue