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

clean all warnings for vs-2019

Browse Source
This commit is contained in:
Kim Kulling
2020-03-08 21:24:01 +01:00
parent 920535165d
commit e8d2b84017
55 changed files with 9135 additions and 9009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/Q3D/Q3DLoader.cpp
View File

@@ -266,8 +266,11 @@ void Q3DImporter::InternReadFile( const std::string& pFile,
Material& mat = materials.back();
// read the material name
while (( c = stream.GetI1()))
c = stream.GetI1();
while (c) {
mat.name.data[mat.name.length++] = c;
c = stream.GetI1();
}
// add the terminal character
mat.name.data[mat.name.length] = '\0';
@@ -554,20 +557,20 @@ outer:
}
// copy texture coordinates
if (uv && m.uv.size())
if (uv && curMesh.uv.size())
{
if (m.prevUVIdx != 0xffffffff && m.uv.size() >= m.verts.size()) // workaround
if (curMesh.prevUVIdx != 0xffffffff && curMesh.uv.size() >= curMesh.verts.size()) // workaround
{
*uv = m.uv[face.indices[n]];
*uv = curMesh.uv[face.indices[n]];
}
else
{
if (face.uvindices[n] >= m.uv.size())
if (face.uvindices[n] >= curMesh.uv.size())
{
ASSIMP_LOG_WARN("Quick3D: Texture coordinate index overflow");
face.uvindices[n] = 0;
}
*uv = m.uv[face.uvindices[n]];
*uv = curMesh.uv[face.uvindices[n]];
}
uv->y = 1.f - uv->y;
++uv;