Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes growups changing direction when landing on a slope #2996

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions src/object/growup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@

GrowUp::GrowUp(const Vector& pos, Direction direction, const std::string& custom_sprite) :
MovingSprite(pos, custom_sprite.empty() ? "images/powerups/egg/egg.sprite" : custom_sprite, LAYER_OBJECTS, COLGROUP_MOVING),
physic(),
m_physic(),
m_custom_sprite(!custom_sprite.empty()),
shadesprite(SpriteManager::current()->create("images/powerups/egg/egg.sprite")),
lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
m_shadesprite(SpriteManager::current()->create("images/powerups/egg/egg.sprite")),
m_lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
{
physic.enable_gravity(true);
physic.set_velocity_x((direction == Direction::LEFT) ? -100.0f : 100.0f);
m_physic.enable_gravity(true);
m_physic.set_velocity_x((direction == Direction::LEFT) ? -100.0f : 100.0f);
SoundManager::current()->preload("sounds/grow.ogg");
// Set the shadow action for the egg sprite, so it remains in place as the egg rolls.
shadesprite->set_action("shadow");
m_shadesprite->set_action("shadow");
// Configure the light sprite for the glow effect.
lightsprite->set_blend(Blend::ADD);
lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
m_lightsprite->set_blend(Blend::ADD);
m_lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
}

void
GrowUp::update(float dt_sec)
{
if (!m_custom_sprite && physic.get_velocity_x() != 0)
if (!m_custom_sprite && m_physic.get_velocity_x() != 0)
m_sprite->set_angle(get_pos().x * 360.0f / (32.0f * math::PI));

m_col.set_movement(physic.get_movement(dt_sec));
m_col.set_movement(m_physic.get_movement(dt_sec));
}

void
Expand All @@ -58,19 +58,24 @@ GrowUp::draw(DrawingContext& context)
if (m_custom_sprite)
return;

shadesprite->draw(context.color(), get_pos(), m_layer);
lightsprite->draw(context.light(), get_bbox().get_middle(), 0);
m_shadesprite->draw(context.color(), get_pos(), m_layer);
m_lightsprite->draw(context.light(), get_bbox().get_middle(), 0);
}

void
GrowUp::collision_solid(const CollisionHit& hit)
{
if (hit.top)
physic.set_velocity_y(0);
if (hit.bottom && physic.get_velocity_y() > 0)
physic.set_velocity_y(0);
if (hit.left || hit.right) {
physic.set_velocity_x(-physic.get_velocity_x());
m_physic.set_velocity_y(0);

if (hit.bottom && m_physic.get_velocity_y() > 0)
m_physic.set_velocity_y(0);

if (hit.slope_normal.x == 0.0f &&
((hit.left && m_physic.get_velocity_x() < 0.0f) ||
(hit.right && m_physic.get_velocity_x() > 0.0f))) {
m_physic.set_velocity_x(-m_physic.get_velocity_x());
m_physic.set_acceleration_x(-m_physic.get_acceleration_x());
}
}

Expand All @@ -97,7 +102,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit )
void
GrowUp::do_jump()
{
physic.set_velocity_y(-300);
m_physic.set_velocity_y(-300);
}

/* EOF */
6 changes: 3 additions & 3 deletions src/object/growup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class GrowUp final : public MovingSprite
void do_jump();

private:
Physic physic;
Physic m_physic;

const bool m_custom_sprite;
SpritePtr shadesprite;
SpritePtr lightsprite;
SpritePtr m_shadesprite;
SpritePtr m_lightsprite;

private:
GrowUp(const GrowUp&) = delete;
Expand Down
Loading