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

Collected items do not appear from below now, but grow

Browse Source 
(i.e. being scaled from 0 to 1). This allows it easily
to have items floating in mid air.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-02-07 10:35:45 +00:00
parent 566e12d129
commit 5eaee4de39
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/items/item.cpp
View File

@ -126,20 +126,21 @@ void Item::update(float dt)
if(m_collected)
{
m_time_till_return -= dt;
if ( m_time_till_return > 0 )
if(m_time_till_return<0)
{
Vec3 hell(m_coord.getXYZ());
m_collected=false;
m_node->setScale(core::vector3df(1,1,1));
hell.setZ( (m_time_till_return>1.0f) ? -1000000.0f
: m_coord.getXYZ().getZ() - m_time_till_return / 2.0f);
m_node->setPosition(hell.toIrrVector());
}
else
} // time till return <0 --> is fully visible again
else if ( m_time_till_return <=1.0f )
{
m_collected = false;
} // T>0
}
// Make it visible by scaling it from 0 to 1:
m_node->setVisible(true);
m_node->setScale(core::vector3df(1,1,1)*(1-m_time_till_return));
core::vector3df pos = m_coord.getXYZ().toIrrVector();
pos.Y = pos.Y+2.0f*m_time_till_return;
} // time till return < 1
} // if collected
else
{ // not m_collected
@ -185,6 +186,7 @@ void Item::collected(float t)
// Note if the time is negative, in update the m_collected flag will
// be automatically set to false again.
m_time_till_return = t;
m_node->setVisible(false);
}
} // isCollected