From e1492e9a62bf0d4ff1dce5b933ba05cad8de270d Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 5 May 2021 09:42:59 -0400 Subject: [PATCH] Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.). --- Userland/Games/Solitaire/CMakeLists.txt | 2 +- Userland/Games/Solitaire/Card.cpp | 4 ++ Userland/Games/Solitaire/Card.h | 4 ++ Userland/Games/Solitaire/CardStack.cpp | 4 ++ Userland/Games/Solitaire/CardStack.h | 4 ++ .../{SolitaireWidget.cpp => Game.cpp} | 54 ++++++++++--------- .../Solitaire/{SolitaireWidget.h => Game.h} | 16 +++--- Userland/Games/Solitaire/main.cpp | 6 +-- 8 files changed, 59 insertions(+), 35 deletions(-) rename Userland/Games/Solitaire/{SolitaireWidget.cpp => Game.cpp} (87%) rename Userland/Games/Solitaire/{SolitaireWidget.h => Game.h} (90%) diff --git a/Userland/Games/Solitaire/CMakeLists.txt b/Userland/Games/Solitaire/CMakeLists.txt index 4a9d4e6c71..09ef04f528 100644 --- a/Userland/Games/Solitaire/CMakeLists.txt +++ b/Userland/Games/Solitaire/CMakeLists.txt @@ -1,8 +1,8 @@ set(SOURCES Card.cpp CardStack.cpp + Game.cpp main.cpp - SolitaireWidget.cpp ) serenity_app(Solitaire ICON app-solitaire) diff --git a/Userland/Games/Solitaire/Card.cpp b/Userland/Games/Solitaire/Card.cpp index b1a98ba6d7..40c4d4d072 100644 --- a/Userland/Games/Solitaire/Card.cpp +++ b/Userland/Games/Solitaire/Card.cpp @@ -9,6 +9,8 @@ #include #include +namespace Solitaire { + static const NonnullRefPtr s_diamond = Gfx::CharacterBitmap::create_from_ascii( " # " " ### " @@ -155,3 +157,5 @@ void Card::clear_and_draw(GUI::Painter& painter, const Color& background_color) draw(painter); save_old_position(); } + +} diff --git a/Userland/Games/Solitaire/Card.h b/Userland/Games/Solitaire/Card.h index 3cdd15513d..8a3c97cc47 100644 --- a/Userland/Games/Solitaire/Card.h +++ b/Userland/Games/Solitaire/Card.h @@ -13,6 +13,8 @@ #include #include +namespace Solitaire { + class Card final : public Core::Object { C_OBJECT(Card) public: @@ -63,3 +65,5 @@ private: bool m_moving { false }; bool m_upside_down { false }; }; + +} diff --git a/Userland/Games/Solitaire/CardStack.cpp b/Userland/Games/Solitaire/CardStack.cpp index d859678507..8d77476db0 100644 --- a/Userland/Games/Solitaire/CardStack.cpp +++ b/Userland/Games/Solitaire/CardStack.cpp @@ -6,6 +6,8 @@ #include "CardStack.h" +namespace Solitaire { + CardStack::CardStack() : m_position({ 0, 0 }) , m_type(Invalid) @@ -216,3 +218,5 @@ void CardStack::calculate_bounding_box() m_bounding_box.set_size(Card::width + width, Card::height + height); } + +} diff --git a/Userland/Games/Solitaire/CardStack.h b/Userland/Games/Solitaire/CardStack.h index 589da87443..d42fc5af18 100644 --- a/Userland/Games/Solitaire/CardStack.h +++ b/Userland/Games/Solitaire/CardStack.h @@ -9,6 +9,8 @@ #include "Card.h" #include +namespace Solitaire { + class CardStack final { public: enum Type { @@ -78,3 +80,5 @@ private: bool m_dirty { false }; Gfx::IntRect m_base; }; + +} diff --git a/Userland/Games/Solitaire/SolitaireWidget.cpp b/Userland/Games/Solitaire/Game.cpp similarity index 87% rename from Userland/Games/Solitaire/SolitaireWidget.cpp rename to Userland/Games/Solitaire/Game.cpp index 19df773abf..0a22602087 100644 --- a/Userland/Games/Solitaire/SolitaireWidget.cpp +++ b/Userland/Games/Solitaire/Game.cpp @@ -4,25 +4,27 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "SolitaireWidget.h" +#include "Game.h" #include #include +namespace Solitaire { + static const Color s_background_color { Color::from_rgb(0x008000) }; static constexpr uint8_t new_game_animation_delay = 5; static constexpr int s_timer_interval_ms = 1000 / 60; -SolitaireWidget::SolitaireWidget(Function&& on_score_update) +Game::Game(Function&& on_score_update) : m_on_score_update(move(on_score_update)) { set_fill_with_background_color(false); m_stacks[Stock] = CardStack({ 10, 10 }, CardStack::Type::Stock); m_stacks[Waste] = CardStack({ 10 + Card::width + 10, 10 }, CardStack::Type::Waste); - m_stacks[Foundation4] = CardStack({ SolitaireWidget::width - Card::width - 10, 10 }, CardStack::Type::Foundation); - m_stacks[Foundation3] = CardStack({ SolitaireWidget::width - 2 * Card::width - 20, 10 }, CardStack::Type::Foundation); - m_stacks[Foundation2] = CardStack({ SolitaireWidget::width - 3 * Card::width - 30, 10 }, CardStack::Type::Foundation); - m_stacks[Foundation1] = CardStack({ SolitaireWidget::width - 4 * Card::width - 40, 10 }, CardStack::Type::Foundation); + m_stacks[Foundation4] = CardStack({ Game::width - Card::width - 10, 10 }, CardStack::Type::Foundation); + m_stacks[Foundation3] = CardStack({ Game::width - 2 * Card::width - 20, 10 }, CardStack::Type::Foundation); + m_stacks[Foundation2] = CardStack({ Game::width - 3 * Card::width - 30, 10 }, CardStack::Type::Foundation); + m_stacks[Foundation1] = CardStack({ Game::width - 4 * Card::width - 40, 10 }, CardStack::Type::Foundation); m_stacks[Pile1] = CardStack({ 10, 10 + Card::height + 10 }, CardStack::Type::Normal); m_stacks[Pile2] = CardStack({ 10 + Card::width + 10, 10 + Card::height + 10 }, CardStack::Type::Normal); m_stacks[Pile3] = CardStack({ 10 + 2 * Card::width + 20, 10 + Card::height + 10 }, CardStack::Type::Normal); @@ -32,7 +34,7 @@ SolitaireWidget::SolitaireWidget(Function&& on_score_update) m_stacks[Pile7] = CardStack({ 10 + 6 * Card::width + 60, 10 + Card::height + 10 }, CardStack::Type::Normal); } -SolitaireWidget::~SolitaireWidget() +Game::~Game() { } @@ -41,11 +43,11 @@ static float rand_float() return rand() / static_cast(RAND_MAX); } -void SolitaireWidget::timer_event(Core::TimerEvent&) +void Game::timer_event(Core::TimerEvent&) { if (m_game_over_animation) { VERIFY(!m_animation.card().is_null()); - if (m_animation.card()->position().x() > SolitaireWidget::width || m_animation.card()->rect().right() < 0) + if (m_animation.card()->position().x() > Game::width || m_animation.card()->rect().right() < 0) create_new_animation_card(); m_animation.tick(); @@ -57,18 +59,18 @@ void SolitaireWidget::timer_event(Core::TimerEvent&) } } -void SolitaireWidget::create_new_animation_card() +void Game::create_new_animation_card() { srand(time(nullptr)); auto card = Card::construct(static_cast(rand() % Card::Type::__Count), rand() % Card::card_count); - card->set_position({ rand() % (SolitaireWidget::width - Card::width), rand() % (SolitaireWidget::height / 8) }); + card->set_position({ rand() % (Game::width - Card::width), rand() % (Game::height / 8) }); - int x_sgn = card->position().x() > (SolitaireWidget::width / 2) ? -1 : 1; + int x_sgn = card->position().x() > (Game::width / 2) ? -1 : 1; m_animation = Animation(card, rand_float() + .4f, x_sgn * ((rand() % 3) + 2), .6f + rand_float() * .4f); } -void SolitaireWidget::start_game_over_animation() +void Game::start_game_over_animation() { if (m_game_over_animation) return; @@ -77,7 +79,7 @@ void SolitaireWidget::start_game_over_animation() m_game_over_animation = true; } -void SolitaireWidget::stop_game_over_animation() +void Game::stop_game_over_animation() { if (!m_game_over_animation) return; @@ -86,7 +88,7 @@ void SolitaireWidget::stop_game_over_animation() update(); } -void SolitaireWidget::setup() +void Game::setup() { stop_game_over_animation(); stop_timer(); @@ -115,13 +117,13 @@ void SolitaireWidget::setup() update(); } -void SolitaireWidget::update_score(int to_add) +void Game::update_score(int to_add) { m_score = max(static_cast(m_score) + to_add, 0); m_on_score_update(m_score); } -void SolitaireWidget::keydown_event(GUI::KeyEvent& event) +void Game::keydown_event(GUI::KeyEvent& event) { if (m_new_game_animation || m_game_over_animation) return; @@ -130,7 +132,7 @@ void SolitaireWidget::keydown_event(GUI::KeyEvent& event) start_game_over_animation(); } -void SolitaireWidget::mousedown_event(GUI::MouseEvent& event) +void Game::mousedown_event(GUI::MouseEvent& event) { GUI::Widget::mousedown_event(event); @@ -183,7 +185,7 @@ void SolitaireWidget::mousedown_event(GUI::MouseEvent& event) } } -void SolitaireWidget::mouseup_event(GUI::MouseEvent& event) +void Game::mouseup_event(GUI::MouseEvent& event) { GUI::Widget::mouseup_event(event); @@ -236,7 +238,7 @@ void SolitaireWidget::mouseup_event(GUI::MouseEvent& event) m_has_to_repaint = true; } -void SolitaireWidget::mousemove_event(GUI::MouseEvent& event) +void Game::mousemove_event(GUI::MouseEvent& event) { GUI::Widget::mousemove_event(event); @@ -256,7 +258,7 @@ void SolitaireWidget::mousemove_event(GUI::MouseEvent& event) m_has_to_repaint = true; } -void SolitaireWidget::doubleclick_event(GUI::MouseEvent& event) +void Game::doubleclick_event(GUI::MouseEvent& event) { GUI::Widget::doubleclick_event(event); @@ -297,7 +299,7 @@ void SolitaireWidget::doubleclick_event(GUI::MouseEvent& event) m_has_to_repaint = true; } -void SolitaireWidget::check_for_game_over() +void Game::check_for_game_over() { for (auto& stack : m_stacks) { if (stack.type() != CardStack::Type::Foundation) @@ -309,7 +311,7 @@ void SolitaireWidget::check_for_game_over() start_game_over_animation(); } -void SolitaireWidget::move_card(CardStack& from, CardStack& to) +void Game::move_card(CardStack& from, CardStack& to) { auto card = from.pop(); @@ -325,7 +327,7 @@ void SolitaireWidget::move_card(CardStack& from, CardStack& to) m_has_to_repaint = true; } -void SolitaireWidget::mark_intersecting_stacks_dirty(Card& intersecting_card) +void Game::mark_intersecting_stacks_dirty(Card& intersecting_card) { for (auto& stack : m_stacks) { if (intersecting_card.rect().intersects(stack.bounding_box())) { @@ -335,7 +337,7 @@ void SolitaireWidget::mark_intersecting_stacks_dirty(Card& intersecting_card) } } -void SolitaireWidget::paint_event(GUI::PaintEvent& event) +void Game::paint_event(GUI::PaintEvent& event) { GUI::Widget::paint_event(event); @@ -412,3 +414,5 @@ void SolitaireWidget::paint_event(GUI::PaintEvent& event) } } } + +} diff --git a/Userland/Games/Solitaire/SolitaireWidget.h b/Userland/Games/Solitaire/Game.h similarity index 90% rename from Userland/Games/Solitaire/SolitaireWidget.h rename to Userland/Games/Solitaire/Game.h index b7efe3cc31..18e6d3d875 100644 --- a/Userland/Games/Solitaire/SolitaireWidget.h +++ b/Userland/Games/Solitaire/Game.h @@ -10,17 +10,19 @@ #include #include -class SolitaireWidget final : public GUI::Widget { - C_OBJECT(SolitaireWidget) +namespace Solitaire { + +class Game final : public GUI::Widget { + C_OBJECT(Game) public: static constexpr int width = 640; static constexpr int height = 480; - virtual ~SolitaireWidget() override; + virtual ~Game() override; void setup(); private: - SolitaireWidget(Function&& on_score_update); + Game(Function&& on_score_update); class Animation { public: @@ -43,9 +45,9 @@ private: VERIFY(!m_animation_card.is_null()); m_y_velocity += m_gravity; - if (m_animation_card->position().y() + Card::height + m_y_velocity > SolitaireWidget::height + 1 && m_y_velocity > 0) { + if (m_animation_card->position().y() + Card::height + m_y_velocity > Game::height + 1 && m_y_velocity > 0) { m_y_velocity = min((m_y_velocity * -m_bouncyness), -8.f); - m_animation_card->rect().set_y(SolitaireWidget::height - Card::height); + m_animation_card->rect().set_y(Game::height - Card::height); m_animation_card->rect().translate_by(m_x_velocity, 0); } else { m_animation_card->rect().translate_by(m_x_velocity, m_y_velocity); @@ -119,3 +121,5 @@ private: uint32_t m_score { 0 }; Function m_on_score_update; }; + +} diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index 3fcdf5152e..0b8423f30a 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "SolitaireWidget.h" +#include "Game.h" #include #include #include @@ -37,9 +37,9 @@ int main(int argc, char** argv) auto window = GUI::Window::construct(); window->set_resizable(false); - window->resize(SolitaireWidget::width, SolitaireWidget::height); + window->resize(Solitaire::Game::width, Solitaire::Game::height); - auto widget = SolitaireWidget::construct([&](uint32_t score) { + auto widget = Solitaire::Game::construct([&](uint32_t score) { window->set_title(String::formatted("Score: {} - Solitaire", score)); });