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

Improved code quality in item.cpp (#4722)

Browse Source 
Fixes bug where a bubblegum shield popping/bursting will leave an invisible gum object behind
This commit is contained in:
Semphriss 2022-01-25 20:13:51 -05:00 committed by GitHub
parent 3d4cb58af5
commit 01a78ba594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/items/item.cpp
View File

@ -222,6 +222,7 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
{ {
m_icon_node = NULL; m_icon_node = NULL;
m_was_available_previously = true; m_was_available_previously = true;
m_animation_start_ticks = 0;
m_distance_2 = 1.2f; m_distance_2 = 1.2f;
initItem(type, xyz, normal); initItem(type, xyz, normal);
m_graphical_type = getGrahpicalType(); m_graphical_type = getGrahpicalType();
@ -461,39 +462,36 @@ void Item::updateGraphics(float dt)
if (!m_was_available_previously && isAvailable()) if (!m_was_available_previously && isAvailable())
{ {
// Play animation when item respawns // Play animation when item respawns
m_node->setScale(core::vector3df(0, 0, 0));
m_animation_start_ticks = World::getWorld()->getTicksSinceStart(); m_animation_start_ticks = World::getWorld()->getTicksSinceStart();
m_node->setScale(core::vector3df(0.0f, 0.0f, 0.0f));
} }
float time_since_return = stk_config->ticks2Time( float time_since_return = stk_config->ticks2Time(
World::getWorld()->getTicksSinceStart() - m_animation_start_ticks); World::getWorld()->getTicksSinceStart() - m_animation_start_ticks);
if (isAvailable() && time_since_return <= 1.0f) if (is_visible)
{ {
float p = time_since_return, f = (1.0f - time_since_return); if (!isAvailable() && !(getType() == ITEM_BUBBLEGUM &&
float factor_v = sin(-13.0f * M_PI_2 * (p + 1.0f)) getOriginalType() == ITEM_NONE && !isUsedUp()))
* pow(2.0f, -10.0f * p) + 1.0f; {
float factor_h = 1.0f - (f * f * f * f * f - f * f * f * sin(f * M_PI)); // Keep it visible so particles work, but hide the model
m_node->setScale(core::vector3df(0.0f, 1.0f, 0.0f));
}
else if (time_since_return <= 1.0f && m_animation_start_ticks)
{
float p = time_since_return, f = (1.0f - time_since_return);
float factor_v = sin(-13.0f * M_PI_2 * (p + 1.0f))
* pow(2.0f, -10.0f * p) + 1.0f;
float factor_h = 1.0f - (f * f * f * f * f - f * f * f * sin(f * M_PI));
m_node->setScale(core::vector3df(factor_h, factor_v, factor_h)); m_node->setScale(core::vector3df(factor_h, factor_v, factor_h));
} }
else
{
m_node->setScale(core::vector3df(1.0f, 1.0f, 1.0f));
}
if (isAvailable() && time_since_return > 1.0f) // Handle rotation of the item
{
// Ensure the model has the wanted scale
m_node->setScale(core::vector3df(1.0f, 1.0f, 1.0f));
}
if (!isAvailable() && time_till_return <= 1.0f)
{
m_node->setVisible(true);
// Make it de facto invisible, but the model needs to be visible for
// particles to show
m_node->setScale(core::vector3df(0.0f, 1.0f, 0.0f));
}
if (isAvailable())
{
Vec3 hpr; Vec3 hpr;
if (rotating()) if (rotating())
{ {
@ -511,7 +509,7 @@ void Item::updateGraphics(float dt)
else else
hpr.setHPR(getOriginalRotation()); hpr.setHPR(getOriginalRotation());
m_node->setRotation(hpr.toIrrHPR()); m_node->setRotation(hpr.toIrrHPR());
} // if item is available } // if item is available
for (size_t i = 0; i < SPARK_AMOUNT; i++) for (size_t i = 0; i < SPARK_AMOUNT; i++)
{ {