GRAPHICS: Populate animation nodes

src/graphics/aurora/animation.h

@@ -72,9 +72,13 @@ class Animation {
 	/** Get the specified node, from the current state. */
 //	const AnimNode *getNode(const Common::UString &node) const;
 
-protected:
 	typedef std::list<AnimNode *> NodeList;
 	typedef std::map<Common::UString, AnimNode *, Common::UString::iless> NodeMap;
+		NodeList nodeList; ///< The nodes within the state.
+		NodeMap  nodeMap;  ///< The nodes within the state, indexed by name.
+
+		NodeList rootNodes; ///< The nodes in the state without a parent.
+protected:
 
 	Common::UString _name; ///< The model's name.
     float _length;

src/graphics/aurora/animnode.cpp

@@ -40,9 +40,11 @@ namespace Graphics {
 namespace Aurora {
 
 
-AnimNode::AnimNode(Animation &animation) :
-	_animation(&animation), _parent(0)
-	{
+AnimNode::AnimNode(ModelNode *modelnode) :
+	_parent(0) {
+	// actual data is loaded as a generic modelnode
+	if (modelnode)
+		_name = modelnode->getName();
 }
 
 AnimNode::~AnimNode() {

src/graphics/aurora/animnode.h

@@ -46,18 +46,19 @@ namespace Graphics {
 
 namespace Aurora {
 
-class Animation;
+class ModelNode;
 
 class AnimNode {
 public:
-	AnimNode(Animation &anim);
+//	AnimNode(Animation &anim);
+	AnimNode(ModelNode* modelnode);
 	~AnimNode();
 
 	/** Get the node's name. */
 	const Common::UString &getName() const;
 
 protected:
-	Animation *_animation; ///< The animation this node belongs to.
+//	Animation *_animation; ///< The animation this node belongs to.
 
 	AnimNode *_parent;               ///< The node's parent.
 	std::list<AnimNode *> _children; ///< The node's children.

src/graphics/aurora/model_nwn.cpp

@@ -42,6 +42,7 @@
 
 #include "graphics/aurora/model_nwn.h"
 #include "graphics/aurora/animation.h"
+#include "graphics/aurora/animnode.h"
 
 using Common::kDebugGraphics;
 
@@ -469,17 +470,14 @@ void Model_NWN::readAnimBinary(ParserContext &ctx, uint32 offset) {
 		_defaultAnimations.push_back(anim);
 	}
 	debugC(4, kDebugGraphics, "Loaded animation \"%s\" in model \"%s\"", ctx.state->name.c_str(), _name.c_str());
-/*
+
 	for (std::list<ModelNode *>::iterator n = ctx.nodes.begin();
 		  n != ctx.nodes.end(); ++n) {
-
-			anim->nodeList.push_back(*n);
-			anim->nodeMap.insert(std::make_pair((*n)->getName(), *n));
-
-		if (!(*n)->getParent())
-			anim->rootNodes.push_back(*n);
+			AnimNode* animnode = new AnimNode(*n);
+			anim->nodeList.push_back(animnode);
+			anim->nodeMap.insert(std::make_pair(animnode->getName(), animnode));
 	}
-*/
+
 }