v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace uint by unsigned int

pull/5265/head^2
Kim Kulling 2023-10-07 18:43:05 +02:00
parent 1ee13872b1
commit 3c1423d5a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/utglTF2ImportExport.cpp
View File

@ -537,7 +537,7 @@ bool checkSkinnedScene(const aiScene *scene){
{0.049f, 0.000f, 0.000f, 0.000f}}; {0.049f, 0.000f, 0.000f, 0.000f}};
for (size_t boneIndex = 0; boneIndex < 10u; ++boneIndex) { for (size_t boneIndex = 0; boneIndex < 10u; ++boneIndex) {
EXPECT_EQ(scene->mMeshes[0]->mBones[boneIndex]->mNumWeights, numWeights[boneIndex]); EXPECT_EQ(scene->mMeshes[0]->mBones[boneIndex]->mNumWeights, numWeights[boneIndex]);
std::map<uint, float> map; std::map<unsigned int, float> map;
for (size_t jointIndex = 0; jointIndex < scene->mMeshes[0]->mBones[boneIndex]->mNumWeights; ++jointIndex){ for (size_t jointIndex = 0; jointIndex < scene->mMeshes[0]->mBones[boneIndex]->mNumWeights; ++jointIndex){
auto key = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mVertexId; auto key = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mVertexId;
auto weight = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mWeight; auto weight = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mWeight;
@ -584,7 +584,7 @@ void checkSkinnedSceneLimited(const aiScene *scene){
{0.000f, 0.000f, 0.000f, 0.000f}}; {0.000f, 0.000f, 0.000f, 0.000f}};
for (size_t boneIndex = 0; boneIndex < 10u; ++boneIndex) { for (size_t boneIndex = 0; boneIndex < 10u; ++boneIndex) {
EXPECT_EQ(scene->mMeshes[0]->mBones[boneIndex]->mNumWeights, numWeights[boneIndex]); EXPECT_EQ(scene->mMeshes[0]->mBones[boneIndex]->mNumWeights, numWeights[boneIndex]);
std::map<uint, float> map; std::map<unsigned int, float> map;
for (size_t jointIndex = 0; jointIndex < scene->mMeshes[0]->mBones[boneIndex]->mNumWeights; ++jointIndex){ for (size_t jointIndex = 0; jointIndex < scene->mMeshes[0]->mBones[boneIndex]->mNumWeights; ++jointIndex){
auto key = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mVertexId; auto key = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mVertexId;
auto weight = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mWeight; auto weight = scene->mMeshes[0]->mBones[boneIndex]->mWeights[jointIndex].mWeight;