From 8b1e7b95ba4637cf01b65a1254f3e76b0cd55c77 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 5 Feb 2013 17:55:12 -0800
Subject: [PATCH] Attempt to load the skeleton source if it doesn't yet exist

---
 apps/openmw/mwrender/animation.cpp     |  9 +++++++--
 components/nifogre/ogre_nif_loader.cpp | 27 ++++++++++++++++++++++++++
 components/nifogre/ogre_nif_loader.hpp |  2 ++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index baca70e37d..f0ba8d654c 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -52,8 +52,13 @@ Ogre::Bone *Animation::insertSkeletonSource(const std::string &name)
     Ogre::SkeletonPtr skel = skelMgr.getByName(name);
     if(skel.isNull())
     {
-        std::cerr<< "Failed to get skeleton source "<<name <<std::endl;
-        return NULL;
+        NifOgre::Loader::createSkeleton(name);
+        skel = skelMgr.getByName(name);
+        if(skel.isNull())
+        {
+            std::cerr<< "Failed to get skeleton source "<<name <<std::endl;
+            return NULL;
+        }
     }
     skel->touch();
     mSkeletonSources.push_back(skel);
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index b878c29f40..c7f6ac50da 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -1250,6 +1250,33 @@ EntityList Loader::createEntities(Ogre::Entity *parent, const std::string &bonen
 }
 
 
+bool Loader::createSkeleton(const std::string &name, const std::string &group)
+{
+    Nif::NIFFile::ptr pnif = Nif::NIFFile::create(name);
+    Nif::NIFFile &nif = *pnif.get();
+    if(nif.numRecords() < 1)
+    {
+        nif.warn("Found no NIF records in "+name+".");
+        return false;
+    }
+
+    // The first record is assumed to be the root node
+    Nif::Record const *r = nif.getRecord(0);
+    assert(r != NULL);
+
+    Nif::Node const *node = dynamic_cast<Nif::Node const *>(r);
+    if(node == NULL)
+    {
+        nif.warn("First record in "+name+" was not a node, but a "+
+                 r->recName+".");
+        return false;
+    }
+
+    NIFSkeletonLoader skelldr;
+    return skelldr.createSkeleton(name, group, node);
+}
+
+
 /* More code currently not in use, from the old D source. This was
    used in the first attempt at loading NIF meshes, where each submesh
    in the file was given a separate bone in a skeleton. Unfortunately
diff --git a/components/nifogre/ogre_nif_loader.hpp b/components/nifogre/ogre_nif_loader.hpp
index 12be522332..0064defe29 100644
--- a/components/nifogre/ogre_nif_loader.hpp
+++ b/components/nifogre/ogre_nif_loader.hpp
@@ -77,6 +77,8 @@ public:
     static EntityList createEntities(Ogre::SceneNode *parentNode,
                                      std::string name,
                                      const std::string &group="General");
+
+    static bool createSkeleton(const std::string &name, const std::string &group="General");
 };
 
 }