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

Merge branch 'master' of https://github.com/assimp/assimp

pull/1146/head
Kim Kulling 2017-01-19 11:19:02 +01:00
parent f121e2eb66 45eb13719e
commit ebd04041ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/D3MFImporter.cpp
View File

@ -229,9 +229,10 @@ private:
aiVector3D ReadVertex() aiVector3D ReadVertex()
{ {
aiVector3D vertex; aiVector3D vertex;
vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr); vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr);
vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr); vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr);
vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); vertex.z = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr);
return vertex; return vertex;
} }

8
code/PlyLoader.cpp
View File

@ -439,7 +439,7 @@ void PLYImporter::LoadTextureCoordinates(std::vector<aiVector2D>* pvOut)
PLY::ElementInstanceList* pcList = NULL; PLY::ElementInstanceList* pcList = NULL;
unsigned int cnt = 0; unsigned int cnt = 0;
// serach in the DOM for a vertex entry // search in the DOM for a vertex entry
unsigned int _i = 0; unsigned int _i = 0;
for (std::vector<PLY::Element>::const_iterator i = pcDOM->alElements.begin(); for (std::vector<PLY::Element>::const_iterator i = pcDOM->alElements.begin();
i != pcDOM->alElements.end();++i,++_i) i != pcDOM->alElements.end();++i,++_i)
@ -752,7 +752,7 @@ void PLYImporter::LoadFaces(std::vector<PLY::Face>* pvOut)
// index of the vertex index list // index of the vertex index list
unsigned int iProperty = 0xFFFFFFFF; unsigned int iProperty = 0xFFFFFFFF;
PLY::EDataType eType = EDT_Char; PLY::EDataType eType = EDT_Char;
bool bIsTristrip = false; bool bIsTriStrip = false;
// index of the material index property // index of the material index property
unsigned int iMaterialIndex = 0xFFFFFFFF; unsigned int iMaterialIndex = 0xFFFFFFFF;
@ -803,7 +803,7 @@ void PLYImporter::LoadFaces(std::vector<PLY::Face>* pvOut)
if (!(*a).bIsList)continue; if (!(*a).bIsList)continue;
iProperty = _a; iProperty = _a;
bOne = true; bOne = true;
bIsTristrip = true; bIsTriStrip = true;
eType = (*a).eType; eType = (*a).eType;
break; break;
} }
@ -813,7 +813,7 @@ void PLYImporter::LoadFaces(std::vector<PLY::Face>* pvOut)
// check whether we have at least one per-face information set // check whether we have at least one per-face information set
if (pcList && bOne) if (pcList && bOne)
{ {
if (!bIsTristrip) if (!bIsTriStrip)
{ {
pvOut->reserve(pcList->alInstances.size()); pvOut->reserve(pcList->alInstances.size());
for (std::vector<ElementInstance>::const_iterator i = pcList->alInstances.begin(); for (std::vector<ElementInstance>::const_iterator i = pcList->alInstances.begin();