diff options
Diffstat (limited to 'Games')
| -rw-r--r-- | Games/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Games/Pong/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Games/Pong/Game.cpp | 236 | ||||
| -rw-r--r-- | Games/Pong/Game.h | 120 | ||||
| -rw-r--r-- | Games/Pong/main.cpp | 93 |
5 files changed, 457 insertions, 0 deletions
diff --git a/Games/CMakeLists.txt b/Games/CMakeLists.txt index 50e0701cfd..370959e095 100644 --- a/Games/CMakeLists.txt +++ b/Games/CMakeLists.txt @@ -2,5 +2,6 @@ add_subdirectory(2048) add_subdirectory(Breakout) add_subdirectory(Chess) add_subdirectory(Minesweeper) +add_subdirectory(Pong) add_subdirectory(Snake) add_subdirectory(Solitaire) diff --git a/Games/Pong/CMakeLists.txt b/Games/Pong/CMakeLists.txt new file mode 100644 index 0000000000..39560740ef --- /dev/null +++ b/Games/Pong/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCES + main.cpp + Game.cpp +) + +serenity_bin(Pong) +target_link_libraries(Pong LibGUI) diff --git a/Games/Pong/Game.cpp b/Games/Pong/Game.cpp new file mode 100644 index 0000000000..f028bf914e --- /dev/null +++ b/Games/Pong/Game.cpp @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2020, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "Game.h" + +namespace Pong { + +Game::Game() +{ + set_override_cursor(Gfx::StandardCursor::Hidden); + start_timer(16); + reset(); +} + +Game::~Game() +{ +} + +void Game::reset_paddles() +{ + m_player1_paddle.moving_up = false; + m_player1_paddle.moving_down = false; + m_player1_paddle.rect = { game_width - 12, game_height / 2 - 40, m_player1_paddle.width, m_player1_paddle.height }; + m_player2_paddle.moving_up = false; + m_player2_paddle.moving_down = false; + m_player2_paddle.rect = { 4, game_height / 2 - 40, m_player2_paddle.width, m_player2_paddle.height }; +} + +void Game::reset() +{ + reset_ball(1); + reset_paddles(); +} + +void Game::timer_event(Core::TimerEvent&) +{ + tick(); +} + +void Game::paint_event(GUI::PaintEvent& event) +{ + GUI::Painter painter(*this); + painter.add_clip_rect(event.rect()); + + painter.fill_rect(rect(), Color::Black); + painter.fill_rect(enclosing_int_rect(m_net.rect()), m_net.color); + + painter.fill_ellipse(enclosing_int_rect(m_ball.rect()), Color::Red); + + painter.fill_rect(enclosing_int_rect(m_player1_paddle.rect), m_player1_paddle.color); + painter.fill_rect(enclosing_int_rect(m_player2_paddle.rect), m_player2_paddle.color); + + painter.draw_text(player_1_score_rect(), String::formatted("{}", m_player_1_score), Gfx::TextAlignment::TopLeft, Color::White); + painter.draw_text(player_2_score_rect(), String::formatted("{}", m_player_2_score), Gfx::TextAlignment::TopLeft, Color::White); +} + +void Game::keyup_event(GUI::KeyEvent& event) +{ + switch (event.key()) { + case Key_Up: + m_player1_paddle.moving_up = false; + break; + case Key_Down: + m_player1_paddle.moving_down = false; + break; + default: + break; + } +} + +void Game::keydown_event(GUI::KeyEvent& event) +{ + switch (event.key()) { + case Key_Escape: + GUI::Application::the()->quit(); + break; + case Key_Up: + m_player1_paddle.moving_up = true; + break; + case Key_Down: + m_player1_paddle.moving_down = true; + break; + default: + break; + } +} + +void Game::mousemove_event(GUI::MouseEvent& event) +{ + float new_paddle_y = event.y() - m_player1_paddle.rect.height() / 2; + new_paddle_y = max(0.0f, new_paddle_y); + new_paddle_y = min(game_height - m_player1_paddle.rect.height(), new_paddle_y); + m_player1_paddle.rect.set_y(new_paddle_y); +} + +void Game::reset_ball(int serve_to_player) +{ + int position_y_min = (game_width / 2) - 50; + int position_y_max = (game_width / 2) + 50; + int position_y = arc4random() % (position_y_max - position_y_min + 1) + position_y_min; + int position_x = (game_height / 2); + int velocity_y = arc4random() % 3 + 1; + int velocity_x = 5 + (5 - velocity_y); + if (arc4random() % 2) + velocity_y = velocity_y * -1; + if (serve_to_player == 2) + velocity_x = velocity_x * -1; + + m_ball = {}; + m_ball.position = { position_x, position_y }; + m_ball.velocity = { velocity_x, velocity_y }; +} + +void Game::game_over(int winner) +{ + GUI::MessageBox::show(window(), String::format("Player %d wins!", winner), "Pong", GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::OK); +} + +void Game::round_over(int winner) +{ + stop_timer(); + if (winner == 1) + m_player_1_score++; + + if (winner == 2) + m_player_2_score++; + + if (m_player_1_score == m_score_to_win || m_player_2_score == m_score_to_win) { + game_over(winner); + return; + } + + reset_ball(winner); + reset_paddles(); + start_timer(16); +} + +void Game::calculate_move() +{ + if ((m_ball.y() + m_ball.radius) < (m_player2_paddle.rect.y() + (m_player2_paddle.rect.height() / 2))) { + m_player2_paddle.moving_up = true; + m_player2_paddle.moving_down = false; + return; + } + if ((m_ball.y() + m_ball.radius) > (m_player2_paddle.rect.y() + (m_player2_paddle.rect.height() / 2))) { + m_player2_paddle.moving_up = false; + m_player2_paddle.moving_down = true; + return; + } + m_player2_paddle.moving_up = false; + m_player2_paddle.moving_down = false; +} + +void Game::tick() +{ + auto new_ball = m_ball; + new_ball.position += new_ball.velocity; + + if (new_ball.y() < new_ball.radius || new_ball.y() > game_height - new_ball.radius) { + new_ball.position.set_y(m_ball.y()); + new_ball.velocity.set_y(new_ball.velocity.y() * -1); + } + + if (new_ball.x() < new_ball.radius) { + round_over(1); + return; + } + + if (new_ball.x() > (game_width - new_ball.radius)) { + round_over(2); + return; + } + + if (new_ball.rect().intersects(m_player1_paddle.rect)) { + new_ball.position.set_x(m_ball.x()); + new_ball.velocity.set_x(new_ball.velocity.x() * -1); + + float distance_to_middle_of_paddle = new_ball.y() - m_player1_paddle.rect.center().y(); + float relative_impact_point = distance_to_middle_of_paddle / m_player1_paddle.rect.height(); + new_ball.velocity.set_y(relative_impact_point * 7); + } + + if (new_ball.rect().intersects(m_player2_paddle.rect)) { + new_ball.position.set_x(m_ball.x()); + new_ball.velocity.set_x(new_ball.velocity.x() * -1); + + float distance_to_middle_of_paddle = new_ball.y() - m_player2_paddle.rect.center().y(); + float relative_impact_point = distance_to_middle_of_paddle / m_player2_paddle.rect.height(); + new_ball.velocity.set_y(relative_impact_point * 7); + } + + if (m_player1_paddle.moving_up) { + m_player1_paddle.rect.set_y(max(0.0f, m_player1_paddle.rect.y() - m_player1_paddle.speed)); + } + if (m_player1_paddle.moving_down) { + m_player1_paddle.rect.set_y(min(game_height - m_player1_paddle.rect.height(), m_player1_paddle.rect.y() + m_player1_paddle.speed)); + } + + calculate_move(); + + if (m_player2_paddle.moving_up) { + m_player2_paddle.rect.set_y(max(0.0f, m_player2_paddle.rect.y() - m_player2_paddle.speed)); + } + if (m_player2_paddle.moving_down) { + m_player2_paddle.rect.set_y(min(game_height - m_player2_paddle.rect.height(), m_player2_paddle.rect.y() + m_player2_paddle.speed)); + } + + m_ball = new_ball; + + update(); +} + +} diff --git a/Games/Pong/Game.h b/Games/Pong/Game.h new file mode 100644 index 0000000000..df042f0be7 --- /dev/null +++ b/Games/Pong/Game.h @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2020, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include <LibCore/ConfigFile.h> +#include <LibGUI/Application.h> +#include <LibGUI/MessageBox.h> +#include <LibGUI/Painter.h> +#include <LibGUI/Widget.h> +#include <LibGfx/Bitmap.h> +#include <LibGfx/Font.h> +#include <LibGfx/StandardCursor.h> + +namespace Pong { + +class Game final : public GUI::Widget { + C_OBJECT(Game); + +public: + static const int game_width = 560; + static const int game_height = 480; + + virtual ~Game() override; + +private: + Game(); + + virtual void paint_event(GUI::PaintEvent&) override; + virtual void keyup_event(GUI::KeyEvent&) override; + virtual void keydown_event(GUI::KeyEvent&) override; + virtual void mousemove_event(GUI::MouseEvent&) override; + virtual void timer_event(Core::TimerEvent&) override; + + void reset(); + void reset_ball(int serve_to_player); + void reset_paddles(); + void tick(); + void round_over(int player); + void game_over(int player); + void calculate_move(); + + struct Ball { + Gfx::FloatPoint position; + Gfx::FloatPoint velocity; + float radius { 4 }; + + float x() const { return position.x(); } + float y() const { return position.y(); } + + Gfx::FloatRect rect() const + { + return { x() - radius, y() - radius, radius * 2, radius * 2 }; + } + }; + + struct Paddle { + Gfx::FloatRect rect; + float speed { 5 }; + float width { 8 }; + float height { 28 }; + bool moving_up { false }; + bool moving_down { false }; + Gfx::Color color { Color::White }; + }; + + struct Net { + Gfx::Color color { Color::White }; + Gfx::FloatRect rect() const + { + return { (game_width / 2) - 1, 0, 2, game_height }; + } + }; + + Gfx::IntRect player_1_score_rect() const + { + int score_width = font().width(String::formatted("{}", m_player_1_score)); + return { (game_width / 2) + score_width + 2, 2, score_width, font().glyph_height() }; + } + + Gfx::IntRect player_2_score_rect() const + { + int score_width = font().width(String::formatted("{}", m_player_2_score)); + return { (game_width / 2) - score_width - 2, 2, score_width, font().glyph_height() }; + } + + Net m_net; + Ball m_ball; + Paddle m_player1_paddle; + Paddle m_player2_paddle; + + int m_score_to_win = 21; + int m_player_1_score = 0; + int m_player_2_score = 0; +}; + +} diff --git a/Games/Pong/main.cpp b/Games/Pong/main.cpp new file mode 100644 index 0000000000..13c5267a53 --- /dev/null +++ b/Games/Pong/main.cpp @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2020, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "Game.h" +#include <LibCore/ConfigFile.h> +#include <LibGUI/AboutDialog.h> +#include <LibGUI/Application.h> +#include <LibGUI/Icon.h> +#include <LibGUI/Menu.h> +#include <LibGUI/MenuBar.h> +#include <LibGUI/Window.h> +#include <LibGfx/Bitmap.h> + +int main(int argc, char** argv) +{ + if (pledge("stdio rpath wpath cpath shared_buffer accept cpath unix fattr", nullptr) < 0) { + perror("pledge"); + return 1; + } + + auto app = GUI::Application::construct(argc, argv); + + if (pledge("stdio rpath wpath cpath shared_buffer accept", nullptr) < 0) { + perror("pledge"); + return 1; + } + + auto config = Core::ConfigFile::get_for_app("Pong"); + + if (unveil("/res", "r") < 0) { + perror("unveil"); + return 1; + } + + if (unveil(config->file_name().characters(), "rwc") < 0) { + perror("unveil"); + return 1; + } + + if (unveil(nullptr, nullptr) < 0) { + perror("unveil"); + return 1; + } + + auto window = GUI::Window::construct(); + window->resize(Pong::Game::game_width, Pong::Game::game_height); + auto app_icon = GUI::Icon::default_icon("app-pong"); + window->set_icon(app_icon.bitmap_for_size(16)); + window->set_title("Pong"); + window->set_double_buffering_enabled(false); + window->set_main_widget<Pong::Game>(); + window->show(); + + auto menubar = GUI::MenuBar::construct(); + + auto& app_menu = menubar->add_menu("Pong"); + app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { + GUI::Application::the()->quit(); + return; + })); + + auto& help_menu = menubar->add_menu("Help"); + help_menu.add_action(GUI::Action::create("About", [&](const GUI::Action&) { + GUI::AboutDialog::show("Pong", app_icon.bitmap_for_size(32), window); + })); + + app->set_menubar(move(menubar)); + + return app->exec(); +} |