Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more warnings.

Browse Source
This commit is contained in:
Kim Kulling
2020-02-16 15:37:20 +01:00
parent 4a3ecbea14
commit c2bfbdacf4
15 changed files with 133 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/Assbin/AssbinFileWriter.cpp
View File

@@ -371,7 +371,7 @@ protected:
void* value = node->mMetaData->mValues[i].mData;
Write<aiString>(&chunk, key);
Write<uint16_t>(&chunk, type);
Write<uint16_t>(&chunk, (uint16_t) type);
switch (type) {
case AI_BOOL:
@@ -553,13 +553,14 @@ protected:
const aiFace& f = mesh->mFaces[i];
static_assert(AI_MAX_FACE_INDICES <= 0xffff, "AI_MAX_FACE_INDICES <= 0xffff");
Write<uint16_t>(&chunk,f.mNumIndices);
Write<uint32_t>(&chunk,f.mNumIndices);
for (unsigned int a = 0; a < f.mNumIndices;++a) {
if (mesh->mNumVertices < (1u<<16)) {
Write<uint16_t>(&chunk,f.mIndices[a]);
}
else Write<unsigned int>(&chunk,f.mIndices[a]);
Write<uint32_t>(&chunk,f.mIndices[a]);
} else {
Write<unsigned int>(&chunk, f.mIndices[a]);
}
}
}
}