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

Merge branch 'master' into ColladaAnimationFix

pull/3619/head
Kim Kulling 2021-02-05 15:52:50 +01:00 committed by GitHub
parent 65bc86e181 5cf5ca4a16
commit c749591c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/Common/utStandardShapes.cpp
View File

@ -46,7 +46,7 @@ TEST_F( utStandardShapes, testMakeMesh ) {
Assimp::StandardShapes::MakeSphere(1, positions);
// Make mesh
const auto numIndicesPerPrimitive = 3;
const auto numIndicesPerPrimitive = 3u;
aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive);
// The mNumIndices member of the second face is now incorrect

4
test/unit/utFBXImporterExporter.cpp
View File

@ -324,7 +324,7 @@ TEST_F(utFBXImporterExporter, importMaxPbrMaterialsMetalRoughness) {
ASSERT_NE(nullptr, scene);
ASSERT_TRUE(scene->mRootNode);
ASSERT_EQ(scene->mNumMaterials, 1);
ASSERT_EQ(scene->mNumMaterials, 1u);
const aiMaterial* mat = scene->mMaterials[0];
aiString texture;
ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS);
@ -377,7 +377,7 @@ TEST_F(utFBXImporterExporter, importMaxPbrMaterialsSpecularGloss) {
ASSERT_NE(nullptr, scene);
ASSERT_TRUE(scene->mRootNode);
ASSERT_EQ(scene->mNumMaterials, 1);
ASSERT_EQ(scene->mNumMaterials, 1u);
const aiMaterial* mat = scene->mMaterials[0];
aiString texture;
ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS);

6
test/unit/utFindDegenerates.cpp
View File

@ -201,8 +201,8 @@ TEST_F(FindDegeneratesProcessTest, meshRemoval) {
mProcess->Execute(scene.get());
EXPECT_EQ(scene->mNumMeshes, 1);
EXPECT_EQ(scene->mNumMeshes, 1u);
EXPECT_EQ(scene->mMeshes[0], meshWhichSurvives);
EXPECT_EQ(scene->mRootNode->mNumMeshes, 1);
EXPECT_EQ(scene->mRootNode->mMeshes[0], 0);
EXPECT_EQ(scene->mRootNode->mNumMeshes, 1u);
EXPECT_EQ(scene->mRootNode->mMeshes[0], 0u);
}