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

warning fix for gcc

pull/2319/head
Mike Samsonov 2019-02-04 16:15:52 +00:00
parent 971ba308b3
commit 5ce1cfedfe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/glTF2Importer.cpp
View File

@ -666,7 +666,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
if (faces) { if (faces) {
aim->mFaces = faces; aim->mFaces = faces;
aim->mNumFaces = static_cast<unsigned int>(nFaces); aim->mNumFaces = static_cast<unsigned int>(nFaces);
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices)); ai_assert(CheckValidFacesIndices(faces, static_cast<unsigned>(nFaces), aim->mNumVertices));
} }
if (prim.material) { if (prim.material) {
@ -773,13 +773,13 @@ static void BuildVertexWeightMapping(Mesh::Primitive& primitive, std::vector<std
return; return;
} }
for (int i = 0; i < num_vertices; ++i) { for (size_t i = 0; i < num_vertices; ++i) {
for (int j = 0; j < 4; ++j) { for (int j = 0; j < 4; ++j) {
const unsigned int bone = (indices8!=nullptr) ? indices8[i].values[j] : indices16[i].values[j]; const unsigned int bone = (indices8!=nullptr) ? indices8[i].values[j] : indices16[i].values[j];
const float weight = weights[i].values[j]; const float weight = weights[i].values[j];
if (weight > 0 && bone < map.size()) { if (weight > 0 && bone < map.size()) {
map[bone].reserve(8); map[bone].reserve(8);
map[bone].emplace_back(i, weight); map[bone].emplace_back(static_cast<unsigned int>(i), weight);
} }
} }
} }