From 075540e15adad24ab3d3dd2e50285b4617d40bcb Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 2 Sep 2020 22:37:57 +0200 Subject: [PATCH] AMF: fixes. --- code/AssetLib/AMF/AMFImporter.cpp | 2 -- code/AssetLib/AMF/AMFImporter_Geometry.cpp | 11 ++++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/code/AssetLib/AMF/AMFImporter.cpp b/code/AssetLib/AMF/AMFImporter.cpp index 881651e75..801f38e85 100644 --- a/code/AssetLib/AMF/AMFImporter.cpp +++ b/code/AssetLib/AMF/AMFImporter.cpp @@ -58,8 +58,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { -/// \var aiImporterDesc AMFImporter::Description -/// Conastant which hold importer description const aiImporterDesc AMFImporter::Description = { "Additive manufacturing file format(AMF) Importer", "smalcom", diff --git a/code/AssetLib/AMF/AMFImporter_Geometry.cpp b/code/AssetLib/AMF/AMFImporter_Geometry.cpp index 55986b552..394474b91 100644 --- a/code/AssetLib/AMF/AMFImporter_Geometry.cpp +++ b/code/AssetLib/AMF/AMFImporter_Geometry.cpp @@ -159,13 +159,10 @@ void AMFImporter::ParseNode_Coordinates(XmlNode &node) { AMFCoordinates &als = *((AMFCoordinates *)ne); // alias for convenience - if (node.attributes().begin() != node.attributes().end()) { - als.Coordinate.x = (ai_real)node.attribute("x").as_float(); - als.Coordinate.y = (ai_real)node.attribute("y").as_float(); - als.Coordinate.z = (ai_real)node.attribute("z").as_float(); - } else { - mNodeElement_Cur->Child.push_back(ne); - } + als.Coordinate.x = (ai_real)node.attribute("x").as_float(); + als.Coordinate.y = (ai_real)node.attribute("y").as_float(); + als.Coordinate.z = (ai_real)node.attribute("z").as_float(); + mNodeElement_Cur->Child.push_back(ne); mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph. }