GRAPHICS: Apply animation scaling to node positions

src/graphics/aurora/animation.cpp

@@ -75,9 +75,13 @@ void Animation::update(Model *model, float lastFrame, float nextFrame) {
 	//TODO: also need to fire off associated events
 	//for event in _events event->fire()
 
+
+	float scale = model->getAnimationScale(_name);
+	if(scale != 1.0f)
+		status("Anim %s has scale %f in model %s", _name.c_str(), scale, model->getName().c_str());
 	for (NodeList::iterator n = nodeList.begin();
 	     n != nodeList.end(); ++n) {
-		(*n)->update(model, lastFrame, nextFrame);
+		(*n)->update(model, lastFrame, nextFrame, scale);
 	}
 }
 

src/graphics/aurora/animnode.cpp

@@ -67,7 +67,7 @@ const Common::UString &AnimNode::getName() const {
 	return _name;
 }
 
-void AnimNode::update(Model *model, float lastFrame, float nextFrame) {
+void AnimNode::update(Model *model, float lastFrame, float nextFrame, float scale) {
 	if(!_nodedata)
 		return;
 	//determine the corresponding keyframes
@@ -77,7 +77,7 @@ void AnimNode::update(Model *model, float lastFrame, float nextFrame) {
 	_nodedata->interpolateOrientation(nextFrame, oX, oY, oZ, oA);
 	ModelNode *target = model->getNode(_name);
 	if(target) {
-		target->setPosition(curX, curY, curZ);
+		target->setPosition(curX * scale, curY * scale, curZ * scale);
 		target->setOrientation(oX, oY, oZ, oA);
 	}
 	//update the position/orientation of corresponding modelnode

src/graphics/aurora/animnode.h

@@ -57,7 +57,7 @@ class AnimNode {
 	const Common::UString &getName() const;
 
 	/** Update the model properties interpolating between frames */
-	void update(Model *model, float lastFrame, float nextFrame);
+	void update(Model *model, float lastFrame, float nextFrame, float scale);
 protected:
 //	Animation *_animation; ///< The animation this node belongs to.
 

src/graphics/aurora/model.cpp

@@ -57,6 +57,8 @@ Model::Model(ModelType type) : Renderable((RenderableType) type),
 	_rotation[0] = 0.0; _rotation[1] = 0.0; _rotation[2] = 0.0;
 
 	_modelScale[0] = 1.0; _modelScale[1] = 1.0; _modelScale[2] = 1.0;
+	//TODO: is this the same as modelScale for non-UI?
+	_animationScale = 1.0;
 }
 
 Model::~Model() {
@@ -368,6 +370,21 @@ Animation *Model::getAnimation(const Common::UString &anim) {
 	return n->second;
 }
 
+float Model::getAnimationScale(const Common::UString &anim) {
+	//TODO: we can cache this for performance
+	AnimationMap::iterator n = _animationMap.find(anim);
+	if (n == _animationMap.end()) {
+		//animation scaling only applies to inherited animations
+		if(_supermodel)
+			return _animationScale * _supermodel->getAnimationScale(anim);
+		//can't find it, return sensible default
+		return 1.0f;
+	}
+
+	//we found it, don't scale further
+	return 1.0f;
+}
+
 void Model::calculateDistance() {
 	if (_type == kModelTypeGUIFront) {
 		_distance = _position[2];

src/graphics/aurora/model.h

@@ -135,6 +135,8 @@ class Model : public GLContainer, public Renderable {
 	void populateDefaultAnimations();
 	/** select the default idle animation */
 	void selectDefaultAnimation();
+	/** determine what animation scaling applies */
+	float getAnimationScale(const Common::UString &anim);
 
 	// Renderable
 	void calculateDistance();
@@ -180,6 +182,7 @@ class Model : public GLContainer, public Renderable {
 	AnimationList _defaultAnimations;
 	Animation *_currentAnimation;
 	Animation *_nextAnimation;
+	float _animationScale;
 
 	float _modelScale[3]; ///< The model's scale.
 

src/graphics/aurora/model_nwn.cpp

@@ -251,7 +251,7 @@ void Model_NWN::loadBinary(ParserContext &ctx) {
 
 	float radius = ctx.mdl->readIEEEFloatLE();
 
-	float scale = ctx.mdl->readIEEEFloatLE();
+	_animationScale = ctx.mdl->readIEEEFloatLE();
 
 	_superModelName.readFixedASCII(*ctx.mdl, 64);
 

src/graphics/aurora/modelnode.cpp

@@ -510,7 +510,7 @@ void ModelNode::interpolatePosition(float time, float &x, float &y, float &z) co
 		return;
 	}
 
-	int lastFrame = 0;
+	uint32 lastFrame = 0;
 	for(uint32 i = 0; i < _positionFrames.size(); i++) {
 		PositionKeyFrame pos = _positionFrames[i];
 		if(pos.time < time)
@@ -531,8 +531,6 @@ void ModelNode::interpolatePosition(float time, float &x, float &y, float &z) co
 	x = f * next.x + (1.0f - f) * last.x;
 	y = f * next.y + (1.0f - f) * last.y;
 	z = f * next.z + (1.0f - f) * last.z;
-	// f = (t - last.t)/(next.t - last.t)
-	// v = f * next + (1-f) * last
 }
 
 void ModelNode::interpolateOrientation(float time, float &x, float &y, float &z, float& a) const {
@@ -543,7 +541,7 @@ void ModelNode::interpolateOrientation(float time, float &x, float &y, float &z,
 		return;
 	}
 
-	int lastFrame = 0;
+	uint32 lastFrame = 0;
 	for(uint32 i = 0; i < _orientationFrames.size(); i++) {
 		QuaternionKeyFrame pos = _orientationFrames[i];
 		if(pos.time < time)