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

Merge branch 'issue_3564' of https://github.com/assimp/assimp into issue_3564

pull/3635/head
Kim Kulling 2021-02-05 21:45:53 +01:00
parent 710f1d17d4 0e941c2478
commit 6f759474bc
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); Assimp::StandardShapes::MakeSphere(1, positions);
// Make mesh // Make mesh
const auto numIndicesPerPrimitive = 3; const auto numIndicesPerPrimitive = 3u;
aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive); aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive);
// The mNumIndices member of the second face is now incorrect // 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_NE(nullptr, scene);
ASSERT_TRUE(scene->mRootNode); ASSERT_TRUE(scene->mRootNode);
ASSERT_EQ(scene->mNumMaterials, 1); ASSERT_EQ(scene->mNumMaterials, 1u);
const aiMaterial* mat = scene->mMaterials[0]; const aiMaterial* mat = scene->mMaterials[0];
aiString texture; aiString texture;
ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS); 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_NE(nullptr, scene);
ASSERT_TRUE(scene->mRootNode); ASSERT_TRUE(scene->mRootNode);
ASSERT_EQ(scene->mNumMaterials, 1); ASSERT_EQ(scene->mNumMaterials, 1u);
const aiMaterial* mat = scene->mMaterials[0]; const aiMaterial* mat = scene->mMaterials[0];
aiString texture; aiString texture;
ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS); 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()); mProcess->Execute(scene.get());
EXPECT_EQ(scene->mNumMeshes, 1); EXPECT_EQ(scene->mNumMeshes, 1u);
EXPECT_EQ(scene->mMeshes[0], meshWhichSurvives); EXPECT_EQ(scene->mMeshes[0], meshWhichSurvives);
EXPECT_EQ(scene->mRootNode->mNumMeshes, 1); EXPECT_EQ(scene->mRootNode->mNumMeshes, 1u);
EXPECT_EQ(scene->mRootNode->mMeshes[0], 0); EXPECT_EQ(scene->mRootNode->mMeshes[0], 0u);
} }