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

Spider: Reduce overdraw when playing

Browse source
This commit is contained in:
Jamie Mansfield 2021-07-15 15:57:03 +01:00 • committed by Andreas Kling
parent 0f9873475b
commit 882b4dc848
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,17 +101,29 @@ void Game::draw_cards()
update_score(-1); update_score(-1);
auto original_stock_rect = stock_pile.bounding_box();
for (auto pile : piles) { for (auto pile : piles) {
auto& current_pile = stack(pile); auto& current_pile = stack(pile);
auto card = stock_pile.pop(); auto card = stock_pile.pop();
card->set_upside_down(false); card->set_upside_down(false);
current_pile.push(card); current_pile.push(card);
update(current_pile.bounding_box());
} }
update(original_stock_rect);
detect_full_stacks(); detect_full_stacks();
}
update(); void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
{
for (auto& stack : m_stacks) {
if (intersecting_card.rect().intersects(stack.bounding_box()))
update(stack.bounding_box());
}
update(intersecting_card.rect());
} }
void Game::ensure_top_card_is_visible(NonnullRefPtr<CardStack> stack) void Game::ensure_top_card_is_visible(NonnullRefPtr<CardStack> stack)
@ -151,10 +163,15 @@ void Game::detect_full_stacks()
break; break;
} else if (card.value() == Card::card_count - 1) { } else if (card.value() == Card::card_count - 1) {
// we have a full set // we have a full set
auto original_current_rect = current_pile.bounding_box();
for (size_t j = 0; j < Card::card_count; j++) { for (size_t j = 0; j < Card::card_count; j++) {
completed_stack.push(current_pile.pop()); completed_stack.push(current_pile.pop());
} }
update(original_current_rect);
update(completed_stack.bounding_box());
ensure_top_card_is_visible(current_pile); ensure_top_card_is_visible(current_pile);
update_score(101); update_score(101);
@ -276,12 +293,16 @@ void Game::mouseup_event(GUI::MouseEvent& event)
if (stack.bounding_box().intersects(focused_card.rect())) { if (stack.bounding_box().intersects(focused_card.rect())) {
if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size(), Cards::CardStack::Any)) { if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size(), Cards::CardStack::Any)) {
for (auto& to_intersect : m_focused_cards) { for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
stack.push(to_intersect); stack.push(to_intersect);
m_focused_stack->pop(); m_focused_stack->pop();
} }
update_score(-1); update_score(-1);
update(m_focused_stack->bounding_box());
update(stack.bounding_box());
detect_full_stacks(); detect_full_stacks();
ensure_top_card_is_visible(*m_focused_stack); ensure_top_card_is_visible(*m_focused_stack);
@ -294,12 +315,14 @@ void Game::mouseup_event(GUI::MouseEvent& event)
} }
if (rebound) { if (rebound) {
for (auto& to_intersect : m_focused_cards)
mark_intersecting_stacks_dirty(to_intersect);
m_focused_stack->rebound_cards(); m_focused_stack->rebound_cards();
update(m_focused_stack->bounding_box());
} }
m_mouse_down = false; m_mouse_down = false;
update();
} }
void Game::mousemove_event(GUI::MouseEvent& event) void Game::mousemove_event(GUI::MouseEvent& event)
@ -314,9 +337,10 @@ void Game::mousemove_event(GUI::MouseEvent& event)
int dy = click_location.dy_relative_to(m_mouse_down_location); int dy = click_location.dy_relative_to(m_mouse_down_location);
for (auto& to_intersect : m_focused_cards) { for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
to_intersect.rect().translate_by(dx, dy); to_intersect.rect().translate_by(dx, dy);
update(to_intersect.rect());
} }
update();
m_mouse_down_location = click_location; m_mouse_down_location = click_location;
} }

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

@ -67,6 +67,7 @@ private:
void start_timer_if_necessary(); void start_timer_if_necessary();
void update_score(int delta); void update_score(int delta);
void draw_cards(); void draw_cards();
void mark_intersecting_stacks_dirty(Card& intersecting_card);
void ensure_top_card_is_visible(NonnullRefPtr<CardStack> stack); void ensure_top_card_is_visible(NonnullRefPtr<CardStack> stack);
void detect_full_stacks(); void detect_full_stacks();
void detect_victory(); void detect_victory();