FIX: issue 125: Export node order should be deterministic

iimachines · Jun 2, 2020 · b673d7b · b673d7b
1 parent 5a3b24b
commit b673d7b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/ExportableAsset.cpp b/src/ExportableAsset.cpp
@@ -111,12 +111,14 @@ ExportableAsset::ExportableAsset(const Arguments &args)
             trs.scale[0] = trs.scale[1] = trs.scale[2] = rootScaleFactor;
         }
 
-        for (auto *node : m_scene.orphans()) {
-            m_glRootNode.children.push_back(&node->glSecondaryNode());
+        for (auto &&pair : m_scene.orphans()) {
+            GLTF::Node *secondary_node = &pair.second->glSecondaryNode();
+            m_glRootNode.children.push_back(secondary_node);
         }
     } else {
-        for (auto *node : m_scene.orphans()) {
-            m_scene.glScene.nodes.push_back(&node->glSecondaryNode());
+        for (auto &&pair : m_scene.orphans()) {
+            GLTF::Node *secondary_node = &pair.second->glSecondaryNode();
+            m_scene.glScene.nodes.push_back(secondary_node);
         }
     }
 

diff --git a/src/ExportableScene.cpp b/src/ExportableScene.cpp
@@ -84,6 +84,10 @@ void ExportableScene::getAllAccessors(AccessorsPerDagPath &accessors) {
     }
 }
 
+void ExportableScene::registerOrphanNode(ExportableNode *node) {
+    m_orphans[node->dagPath] = node;
+}
+
 int ExportableScene::distanceToRoot(MDagPath dagPath) {
     int distance;
 

diff --git a/src/ExportableScene.h b/src/ExportableScene.h
@@ -6,7 +6,10 @@
 class ExportableNode;
 
 typedef std::map<std::string, std::unique_ptr<ExportableNode>> NodeTable;
-typedef std::set<ExportableNode *> OrphanNodes;
+
+// OrphanNodes = nodes without a parent. We use the MDagPath as a key to make
+// sure we get a deterministic output (pointers change)
+typedef std::map<MDagPath, ExportableNode *, MDagPathComparer> OrphanNodes;
 
 typedef std::map<MDagPath, std::vector<GLTF::Accessor *>, MDagPathComparer>
     AccessorsPerDagPath;
@@ -40,7 +43,7 @@ class ExportableScene {
     void getAllAccessors(AccessorsPerDagPath &accessors);
 
     // Register a node without parent
-    void registerOrphanNode(ExportableNode *node) { m_orphans.insert(node); }
+    void registerOrphanNode(ExportableNode *node);
 
     static int distanceToRoot(MDagPath dagPath);