RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +00:00
Code Issues Activity Actions

Spider: Add animation when drawing cards

Browse source
This commit is contained in:
Nihal Jere 2021-12-01 17:36:24 -06:00 • committed by Brian Gianforcaro
parent d70595c09e
commit 4574a58f6f
2 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Userland/Games/Spider/Game.cpp
View file

@ -14,6 +14,7 @@ REGISTER_WIDGET(Spider, Game);
namespace Spider { namespace Spider {
static constexpr uint8_t new_game_animation_delay = 2; static constexpr uint8_t new_game_animation_delay = 2;
static constexpr uint8_t draw_animation_delay = 2;
static constexpr int s_timer_interval_ms = 1000 / 60; static constexpr int s_timer_interval_ms = 1000 / 60;
Game::Game() Game::Game()
@ -108,19 +109,8 @@ void Game::draw_cards()
update_score(-1); update_score(-1);
auto original_stock_rect = stock_pile.bounding_box(); m_draw_animation = true;
for (auto pile : piles) { start_timer(s_timer_interval_ms);
auto& current_pile = stack(pile);
auto card = stock_pile.pop();
card->set_upside_down(false);
current_pile.push(card);
update(current_pile.bounding_box());
}
update(original_stock_rect);
detect_full_stacks();
} }
void Game::mark_intersecting_stacks_dirty(Card& intersecting_card) void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
@ -248,7 +238,7 @@ void Game::mousedown_event(GUI::MouseEvent& event)
{ {
GUI::Frame::mousedown_event(event); GUI::Frame::mousedown_event(event);
if (m_new_game_animation) if (m_new_game_animation || m_draw_animation)
return; return;
auto click_location = event.position(); auto click_location = event.position();
@ -289,7 +279,7 @@ void Game::mouseup_event(GUI::MouseEvent& event)
{ {
GUI::Frame::mouseup_event(event); GUI::Frame::mouseup_event(event);
if (!m_focused_stack || m_focused_cards.is_empty() || m_new_game_animation) if (!m_focused_stack || m_focused_cards.is_empty() || m_new_game_animation || m_draw_animation)
return; return;
bool rebound = true; bool rebound = true;
@ -337,7 +327,7 @@ void Game::mousemove_event(GUI::MouseEvent& event)
{ {
GUI::Frame::mousemove_event(event); GUI::Frame::mousemove_event(event);
if (!m_mouse_down || m_new_game_animation) if (!m_mouse_down || m_new_game_animation || m_draw_animation)
return; return;
auto click_location = event.position(); auto click_location = event.position();
@ -391,7 +381,28 @@ void Game::timer_event(Core::TimerEvent&)
stop_timer(); stop_timer();
} }
} }
} else if (m_draw_animation) {
if (m_draw_animation_delay < draw_animation_delay) {
++m_draw_animation_delay;
} else {
auto& stock_pile = stack(Stock);
auto& current_pile = stack(piles.at(m_draw_animation_pile));
auto card = stock_pile.pop();
card->set_upside_down(false);
current_pile.push(card);
update(current_pile.bounding_box());
++m_draw_animation_pile;
if (m_draw_animation_pile == piles.size()) {
update(stock_pile.bounding_box());
detect_full_stacks();
m_draw_animation = false;
m_draw_animation_delay = 0;
m_draw_animation_pile = 0;
stop_timer();
}
}
} }
} }
} }

4
Userland/Games/Spider/Game.h
View file

@ -99,6 +99,10 @@ private:
uint8_t m_new_game_animation_delay { 0 }; uint8_t m_new_game_animation_delay { 0 };
uint8_t m_new_game_animation_pile { 0 }; uint8_t m_new_game_animation_pile { 0 };
bool m_draw_animation { false };
uint8_t m_draw_animation_delay { 0 };
uint8_t m_draw_animation_pile { 0 };
uint32_t m_score { 500 }; uint32_t m_score { 500 };
}; };