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

Fixed build warnings on MSVC14 x64 in the X3D format sources.

Browse Source
This commit is contained in:
Jared Mulconry
2016-11-27 15:54:22 +11:00
parent dc3f265803
commit cbfbf2a256
4 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/X3DImporter_Rendering.cpp
View File

@@ -524,7 +524,7 @@ void X3DImporter::ParseNode_Rendering_LineSet()
{
if(*vc_it < 2) throw DeadlyImportError("LineSet. vertexCount shall be greater than or equal to two.");
for(int32_t i = 0; i < *vc_it; i++) ne_alias.CoordIndex.push_back(coord_num++);// add vertices indices
for(int32_t i = 0; i < *vc_it; i++) ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num++));// add vertices indices
ne_alias.CoordIndex.push_back(-1);// add face delimiter.
}
@@ -678,17 +678,17 @@ void X3DImporter::ParseNode_Rendering_TriangleFanSet()
{
// 2 1
// 0
ne_alias.CoordIndex.push_back(coord_num_first);// first vertex is a center and always is [0].
ne_alias.CoordIndex.push_back(coord_num_prev++);
ne_alias.CoordIndex.push_back(coord_num_prev);
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_first));// first vertex is a center and always is [0].
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev++));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev));
}
else
{
// 1 2
// 0
ne_alias.CoordIndex.push_back(coord_num_first);// first vertex is a center and always is [0].
ne_alias.CoordIndex.push_back(coord_num_prev + 1);
ne_alias.CoordIndex.push_back(coord_num_prev++);
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_first));// first vertex is a center and always is [0].
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev + 1));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev++));
}// if(ccw) else
ne_alias.CoordIndex.push_back(-1);// add face delimiter.
@@ -875,17 +875,17 @@ void X3DImporter::ParseNode_Rendering_TriangleStripSet()
{
// 0 2
// 1
ne_alias.CoordIndex.push_back(coord_num0);
ne_alias.CoordIndex.push_back(coord_num1);
ne_alias.CoordIndex.push_back(coord_num2);
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num0));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num1));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num2));
}
else
{
// 0 1
// 2
ne_alias.CoordIndex.push_back(coord_num0);
ne_alias.CoordIndex.push_back(coord_num2);
ne_alias.CoordIndex.push_back(coord_num1);
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num0));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num2));
ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num1));
}// if(ccw) else
ne_alias.CoordIndex.push_back(-1);// add face delimiter.