From d1d729370e02e8d507bec9aa382444d11c751d92 Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Fri, 1 Jan 2021 17:13:56 +0000 Subject: [PATCH] Games: Add Conway --- Base/res/apps/Conway.af | 4 + Base/res/icons/16x16/app-conway.png | Bin 0 -> 197 bytes Base/res/icons/32x32/app-conway.png | Bin 0 -> 275 bytes Games/CMakeLists.txt | 1 + Games/Conway/CMakeLists.txt | 7 ++ Games/Conway/Game.cpp | 118 ++++++++++++++++++++++++++++ Games/Conway/Game.h | 52 ++++++++++++ Games/Conway/main.cpp | 93 ++++++++++++++++++++++ 8 files changed, 275 insertions(+) create mode 100644 Base/res/apps/Conway.af create mode 100644 Base/res/icons/16x16/app-conway.png create mode 100644 Base/res/icons/32x32/app-conway.png create mode 100644 Games/Conway/CMakeLists.txt create mode 100644 Games/Conway/Game.cpp create mode 100644 Games/Conway/Game.h create mode 100644 Games/Conway/main.cpp diff --git a/Base/res/apps/Conway.af b/Base/res/apps/Conway.af new file mode 100644 index 0000000000..a158d53362 --- /dev/null +++ b/Base/res/apps/Conway.af @@ -0,0 +1,4 @@ +[App] +Name=Conway +Executable=/bin/Conway +Category=Games diff --git a/Base/res/icons/16x16/app-conway.png b/Base/res/icons/16x16/app-conway.png new file mode 100644 index 0000000000000000000000000000000000000000..ca39bc18668ad5e8654af462e8898a319a8b51cb GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l`xgPd341trB=*iU|F4=adx_q7?SdpRxqwyi8iJu}YcKo+V q-PoY5ncO{dq6qg6CP8TihJt$&f|k!NKF`3wz~JfX=d#Wzp$PzD9y%WY literal 0 HcmV?d00001 diff --git a/Base/res/icons/32x32/app-conway.png b/Base/res/icons/32x32/app-conway.png new file mode 100644 index 0000000000000000000000000000000000000000..af831a8996b5643d993803170a57f467250c0860 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0XB4ude`@%$Aj3=9nHC7!;n>`xgPdDM9qy^s9Cz`(G;)5S3);_%xk8@ZYd zL|pToj`3YO`Cfzd<7;nq!LGj@>8%!f4_dwqIjFhbS@87U4{aax9ts>P{C?Xw{3_?t z6?z-K?CX5R)Nv%IbL;n)Od5S2XXLEg8CVn!ykmGLuC}EtTsUg2tFTZ51IrI@VXKKV zUjNz?xn# +#include +#include + +Game::Game() +{ + srand(time(nullptr)); + reset(); +} + +Game::~Game() +{ +} + +void Game::reset() +{ + stop_timer(); + seed_universe(); + start_timer(m_sleep); + update(); +} + +void Game::seed_universe() +{ + for (int y = 0; y < m_rows; y++) { + for (int x = 0; x < m_columns; x++) { + m_universe[y][x] = (arc4random() % 2) ? 1 : 0; + } + } +} + +void Game::update_universe() +{ + bool new_universe[m_rows][m_columns]; + + for (int y = 0; y < m_rows; y++) { + for (int x = 0; x < m_columns; x++) { + int n = 0; + auto cell = m_universe[y][x]; + + for (int y1 = y - 1; y1 <= y + 1; y1++) { + for (int x1 = x - 1; x1 <= x + 1; x1++) { + if (m_universe[(y1 + m_rows) % m_rows][(x1 + m_columns) % m_columns]) { + n++; + } + } + } + + if (cell) + n--; + + if (n == 3 || (n == 2 && cell)) + new_universe[y][x] = true; + else + new_universe[y][x] = false; + } + } + + for (int y = 0; y < m_rows; y++) { + for (int x = 0; x < m_columns; x++) { + m_universe[y][x] = new_universe[y][x]; + } + } +} + +void Game::timer_event(Core::TimerEvent&) +{ + update_universe(); + update(); +} + +void Game::paint_event(GUI::PaintEvent& event) +{ + GUI::Painter painter(*this); + painter.add_clip_rect(event.rect()); + painter.fill_rect(event.rect(), m_dead_color); + auto game_rect = rect(); + auto cell_size = Gfx::IntSize(game_rect.width() / m_columns, game_rect.height() / m_rows); + + for (int y = 0; y < m_rows; y++) { + for (int x = 0; x < m_columns; x++) { + Gfx::IntRect rect { + x * cell_size.width(), + y * cell_size.height(), + cell_size.width(), + cell_size.height() + }; + painter.fill_rect(rect, m_universe[y][x] ? m_alive_color : m_dead_color); + } + } +} diff --git a/Games/Conway/Game.h b/Games/Conway/Game.h new file mode 100644 index 0000000000..6733409548 --- /dev/null +++ b/Games/Conway/Game.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021, 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 + +class Game : public GUI::Widget { + C_OBJECT(Game) +public: + virtual ~Game() override; + void reset(); + +private: + Game(); + virtual void paint_event(GUI::PaintEvent&) override; + virtual void timer_event(Core::TimerEvent&) override; + + void seed_universe(); + void update_universe(); + + Gfx::Color m_alive_color { Color::Green }; + Gfx::Color m_dead_color { Color::Black }; + int m_rows { 200 }; + int m_columns { 200 }; + int m_sleep { 100 }; + + bool m_universe[200][200]; +}; diff --git a/Games/Conway/main.cpp b/Games/Conway/main.cpp new file mode 100644 index 0000000000..133db22c5f --- /dev/null +++ b/Games/Conway/main.cpp @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2021, 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 +#include +#include +#include +#include +#include +#include + +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 shared_buffer accept", nullptr) < 0) { + perror("pledge"); + return 1; + } + + if (unveil("/res", "r") < 0) { + perror("unveil"); + return 1; + } + + if (unveil(nullptr, nullptr) < 0) { + perror("unveil"); + return 1; + } + + auto app_icon = GUI::Icon::default_icon("app-conway"); + + auto window = GUI::Window::construct(); + + window->set_title("Conway"); + window->resize(400, 400); + window->set_double_buffering_enabled(true); + window->set_icon(app_icon.bitmap_for_size(16)); + + auto& game = window->set_main_widget(); + + auto menubar = GUI::MenuBar::construct(); + + auto& app_menu = menubar->add_menu("Conway"); + + app_menu.add_action(GUI::Action::create("Reset", { Mod_None, Key_F2 }, [&](auto&) { + game.reset(); + })); + app_menu.add_separator(); + app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { + GUI::Application::the()->quit(); + })); + + auto& help_menu = menubar->add_menu("Help"); + help_menu.add_action(GUI::Action::create("About", [&](auto&) { + GUI::AboutDialog::show("Conway", app_icon.bitmap_for_size(32), window); + })); + + app->set_menubar(move(menubar)); + + window->show(); + + return app->exec(); +}