des
/
pacman
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make board a static double std::array

This commit is contained in:
Patricia Aas 2021-07-01 14:33:59 +02:00
parent da5800849d
commit 0e72ff8be5
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Board.cpp
View File

@ -8,7 +8,7 @@
// 4 - superpower
// 5 - pen doors
static const uint8_t board[ROWS][COLUMNS] = {
std::array<std::array<int, COLUMNS>, ROWS> Board::board = {{
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 0
{ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 }, // 1
@ -41,73 +41,67 @@ static const uint8_t board[ROWS][COLUMNS] = {
{ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 }, // 28
{ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 }, // 29
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 30
};
}};
Board::Board() {
for (uint8_t row = 0; row < ROWS; row++)
for (uint8_t column = 0; column < COLUMNS; column++)
board_state[row][column] = board[row][column];
}
bool Board::isWalkableForPacMan(Position point, float d, Direction direction) const {
bool Board::isWalkableForPacMan(Position point, float d, Direction direction) {
return isWalkable(point, d, direction, true);
}
bool Board::isWalkableForGhost(Position point, float d, Direction direction) const {
bool Board::isWalkableForGhost(Position point, float d, Direction direction) {
return isWalkable(point, d, direction, false);
}
bool Board::isWalkable(Position point) const {
return board_state[int(point.y)][int(point.x)] != uint8_t(Cell::wall);
bool Board::isWalkable(Position point) {
return board[int(point.y)][int(point.x)] != int(Cell::wall);
}
bool Board::isWalkableForGost(Position point, Position origin, bool isEyes) const {
bool Board::isWalkableForGost(Position point, Position origin, bool isEyes) {
return isWalkable(point) && (isEyes || (isInPen(origin) || !isInPen(point)));
}
bool Board::isInPen(Position point) const {
return board_state[int(point.y)][int(point.x)] == uint8_t(Cell::pen);
bool Board::isInPen(Position point) {
return board[int(point.y)][int(point.x)] == int(Cell::pen);
}
bool Board::isWalkable(Position point, float position_delta, Direction direction, bool pacman) const {
bool Board::isWalkable(Position point, float position_delta, Direction direction, bool pacman) {
if (point.x <= 0 || point.x >= COLUMNS - 1)
return true;
auto cellAtPosition = [&](Position point, float position_delta, Direction direction) {
switch (direction) {
case Direction::LEFT:
return board_state[int(point.y)][int(point.x - position_delta)];
return board[int(point.y)][int(point.x - position_delta)];
case Direction::RIGHT:
return board_state[int(point.y)][int(point.x) + 1];
return board[int(point.y)][int(point.x) + 1];
case Direction::UP:
return board_state[int(point.y - position_delta)][int(point.x)];
return board[int(point.y - position_delta)][int(point.x)];
case Direction::DOWN:
return board_state[int(point.y) + 1][int(point.x)];
return board[int(point.y) + 1][int(point.x)];
case Direction::NONE:
default:
return uint8_t(Cell::wall);
return int(Cell::wall);
}
};
Cell cell = Cell(cellAtPosition(point, position_delta, direction));
return pacman ? cell != Cell::wall : cell != Cell::wall && cell != Cell::pen;
}
std::vector<PositionInt> Board::initialPelletPositions() const {
std::vector<PositionInt> Board::initialPelletPositions() {
std::vector<PositionInt> positions;
for (uint8_t row = 0; row < ROWS; row++) {
for (uint8_t column = 0; column < COLUMNS; column++) {
if (board_state[row][column] == uint8_t(Cell::pellet))
for (int row = 0; row < ROWS; row++) {
for (int column = 0; column < COLUMNS; column++) {
if (board[row][column] == int(Cell::pellet))
positions.push_back({ column, row });
}
}
return positions;
}
std::vector<PositionInt> Board::initialSuperPelletPositions() const {
std::vector<PositionInt> Board::initialSuperPelletPositions() {
std::vector<PositionInt> positions;
for (uint8_t row = 0; row < ROWS; row++) {
for (uint8_t column = 0; column < COLUMNS; column++) {
if (board_state[row][column] == uint8_t(Cell::power_pellet))
for (int row = 0; row < ROWS; row++) {
for (int column = 0; column < COLUMNS; column++) {
if (board[row][column] == int(Cell::power_pellet))
positions.push_back({ column, row });
}
}

28
lib/Board.hpp
View File

@ -4,11 +4,12 @@
#include "Direction.hpp"
#include "Position.hpp"
#include <array>
#include <cstdint>
#include <vector>
const uint8_t ROWS = 31;
const uint8_t COLUMNS = 28;
const std::size_t ROWS = 31;
const std::size_t COLUMNS = 28;
class Board {
public:
@ -21,18 +22,16 @@ public:
pen = 5,
};
Board();
[[nodiscard]] static bool isWalkableForPacMan(Position point, float d, Direction direction) ;
[[nodiscard]] static bool isWalkableForGhost(Position point, float d, Direction direction) ;
[[nodiscard]] bool isWalkableForPacMan(Position point, float d, Direction direction) const;
[[nodiscard]] bool isWalkableForGhost(Position point, float d, Direction direction) const;
[[nodiscard]] static bool isWalkableForGost(Position point, Position origin, bool isEyes) ;
[[nodiscard]] static bool isWalkable(Position point) ;
[[nodiscard]] static bool isInPen(Position point) ;
[[nodiscard]] bool isWalkableForGost(Position point, Position origin, bool isEyes) const;
[[nodiscard]] bool isWalkable(Position point) const;
[[nodiscard]] bool isInPen(Position point) const;
[[nodiscard]] static std::vector<PositionInt> initialPelletPositions() ;
[[nodiscard]] std::vector<PositionInt> initialPelletPositions() const;
[[nodiscard]] std::vector<PositionInt> initialSuperPelletPositions() const;
[[nodiscard]] static std::vector<PositionInt> initialSuperPelletPositions() ;
static Position initialPacManPosition() { return { 13.5, 23 }; }
@ -51,6 +50,9 @@ public:
static Position clydeScatterTarget() { return { 0, 30 }; }
private:
[[nodiscard]] bool isWalkable(Position point, float d, Direction direction, bool pacman) const;
uint8_t board_state[ROWS][COLUMNS]{};
[[nodiscard]] static bool isWalkable(Position point, float d, Direction direction, bool pacman) ;
static std::array<
std::array<int, COLUMNS>,
ROWS>
board;
};