Merge pull request #1204 from assimp/issue-1128

Closes https://github.com/assimp/assimp/issues/1128: do not use non

code/D3MFImporter.cpp

@@ -97,31 +97,21 @@ public:
 
     }
 
-    void ImportXml(aiScene* scene)
+    void ImportXml(aiScene* scene) {
-    {
-
-        scene->mFlags |= AI_SCENE_FLAGS_NON_VERBOSE_FORMAT;
-
         scene->mRootNode = new aiNode();
         std::vector<aiNode*> children;
 
-        while(ReadToEndElement(D3MF::XmlTag::model))
+        while(ReadToEndElement(D3MF::XmlTag::model)) {
-        {
+            if(xmlReader->getNodeName() == D3MF::XmlTag::object) {
-
-            if(xmlReader->getNodeName() == D3MF::XmlTag::object)
-            {
                 children.push_back(ReadObject(scene));
-            }
+            } else if(xmlReader->getNodeName() == D3MF::XmlTag::build) {
-            else if(xmlReader->getNodeName() == D3MF::XmlTag::build)
+                // ???
-            {
-
             }
         }
 
         if(scene->mRootNode->mName.length == 0)
             scene->mRootNode->mName.Set("3MF");
 
-
         scene->mNumMeshes = static_cast<unsigned int>(meshes.size());
         scene->mMeshes = new aiMesh*[scene->mNumMeshes]();
 

test/CMakeLists.txt

@@ -122,6 +122,7 @@ SET( TEST_SRCS
   unit/utVersion.cpp
   unit/utVector3.cpp
   unit/utXImporterExporter.cpp
+  unit/utD3MFImportExport.cpp
 )
 
 SOURCE_GROUP( tests FILES  ${TEST_SRCS} )

test/unit/utD3MFImportExport.cpp

@@ -0,0 +1,57 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2016, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "UnitTestPCH.h"
+#include "AbstractImportExportBase.h"
+
+#include <assimp/Importer.hpp>
+
+class utD3MFImporterExporter : public AbstractImportExportBase {
+public:
+    virtual bool importerTest() {
+        Assimp::Importer importer;
+        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/3MF/box.3mf", 0);
+        return nullptr != scene;
+    }
+};
+
+TEST_F(utD3MFImporterExporter, import3MFFromFileTest) {
+    EXPECT_TRUE(importerTest());
+}