Browse Source

AMF: fixes.

Kim Kulling 5 years ago
parent
commit
075540e15a
2 changed files with 4 additions and 9 deletions
  1. 0 2
      code/AssetLib/AMF/AMFImporter.cpp
  2. 4 7
      code/AssetLib/AMF/AMFImporter_Geometry.cpp

+ 0 - 2
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",

+ 4 - 7
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.
 }