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

GameOfLife: Switch from single indexed vector to rows+columns

Browse source 
This is not only easier to comprehend code-wise and avoids some function
overloads, but also makes resizing the board while preserving game state
*a lot* easier. We now no longer have to allocate a new board on every
resize, we just grow/shrink the individual row vectors.
Also fixes a crash when clicking the board widget outside of the drawn
board area.
This commit is contained in:
Linus Groh 2021-05-16 21:32:39 +01:00 • committed by Andreas Kling
parent 00bfcef5be
commit f89eb0e4ce
5 changed files with 109 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Games/GameOfLife/BoardWidget.h
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Andres Crucitti <dasc495@gmail.com>
* Copyright (c) 2021, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -7,6 +8,10 @@
#pragma once
#include "Board.h"
#include <AK/Function.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/Optional.h>
#include <AK/RefPtr.h>
#include <LibCore/Timer.h>
#include <LibGUI/Widget.h>
@ -23,29 +28,24 @@ public:
{
m_toggling_cells = toggling;
if (!toggling)
m_last_cell_toggled = m_board->total_size();
m_last_cell_toggled = { m_board->rows(), m_board->columns() };
}
size_t last_toggled() const { return m_last_cell_toggled; }
bool is_toggling() const { return m_toggling_cells; }
void toggle_cell(size_t index);
void toggle_cell(size_t row, size_t column);
void clear_cells() { m_board->clear(); }
void randomize_cells() { m_board->randomize(); }
int get_cell_size() const;
Gfx::IntSize get_board_offset() const;
size_t get_index_for_point(int x, int y) const;
Optional<Board::RowAndColumn> get_row_and_column_for_point(int x, int y) const;
void update_board(size_t rows, size_t columns);
void resize_board(size_t rows, size_t columns);
const Board* board() const { return m_board.ptr(); }
bool is_running() const { return m_running; }
void set_running(bool r);
void set_toolbar_enabled(bool);
void run_generation();
int running_timer_interval() const { return m_running_timer_interval; }
@ -53,15 +53,15 @@ public:
Function<void()> on_running_state_change;
Function<void()> on_stall;
Function<void(Board*, size_t)> on_cell_toggled;
Function<void(Board*, size_t row, size_t column)> on_cell_toggled;
private:
BoardWidget(size_t rows, size_t columns);
bool m_toggling_cells { false };
size_t m_last_cell_toggled { 0 };
Board::RowAndColumn m_last_cell_toggled {};
OwnPtr<Board> m_board { nullptr };
NonnullOwnPtr<Board> m_board;
bool m_running { false };