From ebcb4c66c3adc94217bb912f48789ccde6682668 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 6 Apr 2013 10:17:09 -0700
Subject: [PATCH] Properly read and use the NIF root record list

---
 components/nif/niffile.cpp               | 20 ++++++++++++--------
 components/nif/niffile.hpp               | 14 +++++++++++++-
 components/nifbullet/bulletnifloader.cpp | 11 +++++------
 components/nifogre/ogrenifloader.cpp     | 20 ++++++++++----------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index f97c50680..44eae2953 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -345,14 +345,18 @@ void NIFFile::parse()
       }
     }
 
-  /* After the data, the nif contains an int N and then a list of N
-     ints following it. This might be a list of the root nodes in the
-     tree, but for the moment we ignore it.
-   */
-
-  // Once parsing is done, do post-processing.
-  for(size_t i=0; i<recNum; i++)
-    records[i]->post(this);
+    size_t rootNum = nif.getUInt();
+    roots.resize(rootNum);
+
+    for(size_t i = 0;i < rootNum;i++)
+    {
+        intptr_t idx = nif.getInt();
+        roots[i] = ((idx >= 0) ? records.at(idx) : NULL);
+    }
+
+    // Once parsing is done, do post-processing.
+    for(size_t i=0; i<recNum; i++)
+        records[i]->post(this);
 }
 
 /// \todo move to the write cpp file
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index ed11bdd7c..6e629772e 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -66,6 +66,9 @@ class NIFFile
     /// Record list
     std::vector<Record*> records;
 
+    /// Root list
+    std::vector<Record*> roots;
+
     /// Parse the file
     void parse();
 
@@ -115,9 +118,18 @@ public:
         assert(res != NULL);
         return res;
     }
-
     /// Number of records
     size_t numRecords() { return records.size(); }
+
+    /// Get a given root
+    Record *getRoot(size_t index=0)
+    {
+        Record *res = roots.at(index);
+        assert(res != NULL);
+        return res;
+    }
+    /// Number of roots
+    size_t numRoots() { return roots.size(); }
 };
 
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 08625ee9c..6bd43f6e3 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -91,21 +91,20 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     // likely a sign of incomplete code rather than faulty input.
     Nif::NIFFile::ptr pnif (Nif::NIFFile::create (resourceName.substr(0, resourceName.length()-7)));
     Nif::NIFFile & nif = *pnif.get ();
-    if (nif.numRecords() < 1)
+    if (nif.numRoots() < 1)
     {
-        warn("Found no records in NIF.");
+        warn("Found no root nodes in NIF.");
         return;
     }
 
-    // The first record is assumed to be the root node
-    Nif::Record *r = nif.getRecord(0);
+    Nif::Record *r = nif.getRoot(0);
     assert(r != NULL);
 
     Nif::Node *node = dynamic_cast<Nif::Node*>(r);
     if (node == NULL)
     {
-        warn("First record in file was not a node, but a " +
-                r->recName + ". Skipping file.");
+        warn("First root in file was not a node, but a " +
+             r->recName + ". Skipping file.");
         return;
     }
 
diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 1e42fed37..830e85cde 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -553,7 +553,7 @@ void loadResource(Ogre::Resource *resource)
     OgreAssert(skel, "Attempting to load a skeleton into a non-skeleton resource!");
 
     Nif::NIFFile::ptr nif(Nif::NIFFile::create(skel->getName()));
-    const Nif::Node *node = static_cast<const Nif::Node*>(nif->getRecord(0));
+    const Nif::Node *node = static_cast<const Nif::Node*>(nif->getRoot(0));
 
     std::vector<const Nif::NiKeyframeController*> ctrls;
     Ogre::Bone *animroot = NULL;
@@ -1441,7 +1441,7 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
             return;
         }
 
-        const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif->getRecord(0));
+        const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif->getRecord(mShapeIndex));
         findTriShape(mesh, node);
     }
 
@@ -1603,21 +1603,21 @@ public:
     {
         Nif::NIFFile::ptr pnif = Nif::NIFFile::create(name);
         Nif::NIFFile &nif = *pnif.get();
-        if(nif.numRecords() < 1)
+        if(nif.numRoots() < 1)
         {
-            nif.warn("Found no NIF records in "+name+".");
+            nif.warn("Found no root nodes in "+name+".");
             return;
         }
 
         // The first record is assumed to be the root node
-        const Nif::Record *r = nif.getRecord(0);
+        const Nif::Record *r = nif.getRoot(0);
         assert(r != NULL);
 
         const Nif::Node *node = dynamic_cast<Nif::Node const *>(r);
         if(node == NULL)
         {
-            nif.warn("First record in "+name+" was not a node, but a "+
-                    r->recName+".");
+            nif.warn("First root in "+name+" was not a node, but a "+
+                     r->recName+".");
             return;
         }
 
@@ -1722,14 +1722,14 @@ Ogre::SkeletonPtr Loader::getSkeleton(std::string name, const std::string &group
         return skel;
 
     Nif::NIFFile::ptr nif = Nif::NIFFile::create(name);
-    if(nif->numRecords() < 1)
+    if(nif->numRoots() < 1)
     {
-        nif->warn("Found no NIF records in "+name+".");
+        nif->warn("Found no root nodes in "+name+".");
         return skel;
     }
 
     // The first record is assumed to be the root node
-    const Nif::Record *r = nif->getRecord(0);
+    const Nif::Record *r = nif->getRoot(0);
     assert(r != NULL);
 
     const Nif::Node *node = dynamic_cast<const Nif::Node*>(r);