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

Fixed int/unsigned int comparaisons.

pull/2838/head
Marc-Antoine Lortie 2019-12-18 08:33:41 -05:00
parent 5d79639a8a
commit 607243448f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp
View File

@ -71,7 +71,7 @@ public:
AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS, AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS,
false, // Set config value to false. false, // Set config value to false.
[&](const aiScene *scene) { [&](const aiScene *scene) {
EXPECT_EQ(0, scene->mNumAnimations); EXPECT_EQ(0u, scene->mNumAnimations);
EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS)); EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS));
EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_GROUPS)); EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_GROUPS));
EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_TRANSITION_GRAPH)); EXPECT_EQ(nullptr, scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_TRANSITION_GRAPH));
@ -89,7 +89,7 @@ public:
AI_CONFIG_IMPORT_MDL_HL1_READ_BLEND_CONTROLLERS, AI_CONFIG_IMPORT_MDL_HL1_READ_BLEND_CONTROLLERS,
false, // Set config value to false. false, // Set config value to false.
[&](const aiScene *scene) { [&](const aiScene *scene) {
EXPECT_NE(0, scene->mNumAnimations); EXPECT_NE(0u, scene->mNumAnimations);
const aiNode *sequence_infos = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS); const aiNode *sequence_infos = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS);
EXPECT_NE(nullptr, sequence_infos); EXPECT_NE(nullptr, sequence_infos);
@ -107,7 +107,7 @@ public:
AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATION_EVENTS, AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATION_EVENTS,
false, // Set config value to false. false, // Set config value to false.
[&](const aiScene *scene) { [&](const aiScene *scene) {
EXPECT_NE(0, scene->mNumAnimations); EXPECT_NE(0u, scene->mNumAnimations);
const aiNode *sequence_infos = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS); const aiNode *sequence_infos = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_SEQUENCE_INFOS);
EXPECT_NE(nullptr, sequence_infos); EXPECT_NE(nullptr, sequence_infos);

2
test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
View File

@ -211,7 +211,7 @@ public:
const aiNode *bodyparts_node = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_BODYPARTS); const aiNode *bodyparts_node = scene->mRootNode->FindNode(AI_MDL_HL1_NODE_BODYPARTS);
EXPECT_NE(nullptr, bodyparts_node); EXPECT_NE(nullptr, bodyparts_node);
EXPECT_EQ(3, bodyparts_node->mNumChildren); EXPECT_EQ(3u, bodyparts_node->mNumChildren);
for (unsigned int i = 0; i < bodyparts_node->mNumChildren; ++i) { for (unsigned int i = 0; i < bodyparts_node->mNumChildren; ++i) {
expect_named_children(bodyparts_node->mChildren[i], expect_named_children(bodyparts_node->mChildren[i],
expected_bodypart_sub_models_names[i]); expected_bodypart_sub_models_names[i]);