diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index 399bfdd36..347263145 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -229,9 +229,10 @@ private: aiVector3D ReadVertex() { aiVector3D vertex; + 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.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; } diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index dc002531f..431faf9c3 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -439,7 +439,7 @@ void PLYImporter::LoadTextureCoordinates(std::vector* pvOut) PLY::ElementInstanceList* pcList = NULL; unsigned int cnt = 0; - // serach in the DOM for a vertex entry + // search in the DOM for a vertex entry unsigned int _i = 0; for (std::vector::const_iterator i = pcDOM->alElements.begin(); i != pcDOM->alElements.end();++i,++_i) @@ -752,7 +752,7 @@ void PLYImporter::LoadFaces(std::vector* pvOut) // index of the vertex index list unsigned int iProperty = 0xFFFFFFFF; PLY::EDataType eType = EDT_Char; - bool bIsTristrip = false; + bool bIsTriStrip = false; // index of the material index property unsigned int iMaterialIndex = 0xFFFFFFFF; @@ -803,7 +803,7 @@ void PLYImporter::LoadFaces(std::vector* pvOut) if (!(*a).bIsList)continue; iProperty = _a; bOne = true; - bIsTristrip = true; + bIsTriStrip = true; eType = (*a).eType; break; } @@ -813,7 +813,7 @@ void PLYImporter::LoadFaces(std::vector* pvOut) // check whether we have at least one per-face information set if (pcList && bOne) { - if (!bIsTristrip) + if (!bIsTriStrip) { pvOut->reserve(pcList->alInstances.size()); for (std::vector::const_iterator i = pcList->alInstances.begin();