ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed-weighted objects: negative values for speed-factor and strength-factor lead to the speed and/or the strength of the animation not being affected

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66 2013-10-25 13:34:18 +00:00
parent 01f029dad2
commit ee54d158c2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/karts/kart_model.cpp
View File

@ -762,12 +762,24 @@ void KartModel::update(float rotation_dt, float steer, const float suspension[4]
for(size_t i=0 ; i < m_speed_weighted_objects.size() ; i++)
{
SpeedWeightedObject& obj = m_speed_weighted_objects[i];
float strength = speed * m_kart->getKartProperties()->getSpeedWeightedStrengthFactor();
btClamp<float>(strength, 0.0f, 1.0f);
obj.m_node->setAnimationStrength(strength);
float anim_speed = speed * m_kart->getKartProperties()->getSpeedWeightedSpeedFactor();
obj.m_node->setAnimationSpeed(anim_speed);
// Animation strength
float strength = 1.0f;
const float strength_factor = m_kart->getKartProperties()->getSpeedWeightedStrengthFactor();
if(strength_factor >= 0.0f)
{
strength = speed * strength_factor;
btClamp<float>(strength, 0.0f, 1.0f);
}
obj.m_node->setAnimationStrength(strength);
// Animation speed
const float speed_factor = m_kart->getKartProperties()->getSpeedWeightedSpeedFactor();
if(speed_factor >= 0.0f)
{
float anim_speed = speed * speed_factor;
obj.m_node->setAnimationSpeed(anim_speed);
}
}
// Check if the end animation is being played, if so, don't