From 342824303c147704e4942ced859275d6be09b601 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 16 Jan 2017 21:01:49 +0100 Subject: [PATCH 1/5] Update PlyLoader.cpp --- code/PlyLoader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index dc002531f..11c5cb474 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -746,7 +746,6 @@ void PLYImporter::LoadFaces(std::vector* pvOut) { ai_assert(NULL != pvOut); - PLY::ElementInstanceList* pcList = NULL; bool bOne = false; // index of the vertex index list From f438652df861d7f7176169da7361b1e6dd6987d8 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 16 Jan 2017 21:04:24 +0100 Subject: [PATCH 2/5] Update PlyLoader.cpp --- code/PlyLoader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 11c5cb474..45fbe6187 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -751,7 +751,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; @@ -802,7 +802,7 @@ void PLYImporter::LoadFaces(std::vector* pvOut) if (!(*a).bIsList)continue; iProperty = _a; bOne = true; - bIsTristrip = true; + bIsTriStrip = true; eType = (*a).eType; break; } @@ -812,7 +812,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(); From f14e433dd9b93c85e2653e60cf190b2b53b3555c Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 16 Jan 2017 21:06:05 +0100 Subject: [PATCH 3/5] Update PlyLoader.cpp Typo --- code/PlyLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 45fbe6187..9c7faa16b 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) From 54757a47a8ba153b91d017ddb8fb4d17a22851b6 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 16 Jan 2017 21:09:38 +0100 Subject: [PATCH 4/5] Update PlyLoader.cpp Sorry, I was wrong --- code/PlyLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 9c7faa16b..431faf9c3 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -746,6 +746,7 @@ void PLYImporter::LoadFaces(std::vector* pvOut) { ai_assert(NULL != pvOut); + PLY::ElementInstanceList* pcList = NULL; bool bOne = false; // index of the vertex index list From 45eb13719ec3f48eff4d7d0f2738c8604b3e0c23 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 17 Jan 2017 22:05:45 +0100 Subject: [PATCH 5/5] fixes https://github.com/assimp/assimp/issues/1141: fix typo. --- code/D3MFImporter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; }