Skip to content
GitLab

drawing games, Pacman and food!

Merged Ушкова Диана Петровна requested to merge drawable into main
Compare
and
27 files
+ 226
− 170
source/application/App/Application.h
+ 1
− 1
@@ -12,7 +12,7 @@ public:
int run();
private:
void set_next_state(std::unique_ptr<IState>&& ptr_state);
void set_next_state(std::unique_ptr<IState>&& ptr_state) override;
void apply_deffer_state_change() noexcept;
private:
source/application/BobBuilder/BobBuilderDirector.cpp
+ 4
− 2
#include "BobBuilderDirector.h"
#include <utility>
GameBuilderDirector::GameBuilderDirector(std::unique_ptr<IGameBuilder> &&ptr_builder,
sf::VideoMode mode,
const std::string &window_title,
std::string window_title,
float dynamic_objects_ratio) :
m_dynamic_object_ratio(dynamic_objects_ratio),
m_window_title(window_title),
m_window_title(std::move(window_title)),
m_mode(mode),
m_ptr_builder(std::move(ptr_builder)) {
}
source/application/BobBuilder/BobBuilderDirector.h
+ 1
− 1
@@ -3,7 +3,7 @@
class GameBuilderDirector {
public:
GameBuilderDirector(std::unique_ptr<IGameBuilder>&& ptr_builder, sf::VideoMode mode, const std::string& window_title, float dynamic_objects_ratio);
GameBuilderDirector(std::unique_ptr<IGameBuilder>&& ptr_builder, sf::VideoMode mode, std::string window_title, float dynamic_objects_ratio);
std::unique_ptr<GameState> build(IStateManager& state_manager);
private:
source/application/BobBuilder/GameBuilders.cpp
+ 70
− 69
#include "GameBuilders.h"
#include <random>
CommonBuilder::CommonBuilder(float width, float height, float room_size) :
m_width(width), m_height(height), m_room_size(room_size){
}
void CommonBuilder::create_context(float dynamic_objects_ratio) {
// GameContext context;
// std::vector<Room*> buffer;
// //проходимся по комнатам, если она пустая то добавляем в buffer
// for (auto& row : m_rooms) {
// for (auto& room : row) {
// if (room != nullptr)
// buffer.emplace_back(room);
// }
// }
//
// int id = rand() % buffer.size();
// //помещаем пакмана в рандомную комнату и удаляем ее из буфера
// m_context.pacman.set_location(buffer[id]);
// auto it = buffer.begin();
// for (int i = 0; i < id; i++, it++);
// buffer.erase(it);
//
// for (auto it = buffer.begin(); it != buffer.end(); it++) {
// auto food = std::make_unique<Food>();
//// food->set_location();
// context.static_objects.emplace_back(std::move(food));
// }
//
// buffer.clear();
// m_context = std::move(context);
GameContext context;
std::vector<Room*> empty_rooms_buffer;
for (auto& row : m_rooms)
for (auto& room : row)
empty_rooms_buffer.emplace_back(room);
float id = std::rand() % empty_rooms_buffer.size();
context.pacman.set_location(empty_rooms_buffer[id]);
auto it = std::next(empty_rooms_buffer.begin(), id);
empty_rooms_buffer.erase(it);
for (auto it : empty_rooms_buffer) {
auto food = std::make_unique<Food>();
food->set_location(it);
context.static_objects.emplace_back(std::move(food));
}
empty_rooms_buffer.clear();
m_context = std::move(context);
}
void CommonBuilder::create_state(IStateManager &state_manager, sf::VideoMode &mode, std::string &window_title) {
void CommonBuilder::create_state(IStateManager &state_manager, const sf::VideoMode &mode, const std::string &window_title) {
m_game_state = std::make_unique<GameState>(state_manager, mode, window_title);
}
void CommonBuilder::set_all_to_state() {
std::vector<std::unique_ptr<Room>> rooms;
std::vector<Room*> rooms;
for (auto& row : m_rooms)
for (auto& col : row)
rooms.emplace_back(std::move(col));
m_game_state->set_maze(Maze(std::move(rooms)));
rooms.push_back(col);
Maze maze(rooms);
m_game_state->set_maze(std::move(maze));
m_game_state->set_context(std::move(m_context));
}
@@ -45,53 +46,53 @@ std::unique_ptr<GameState> CommonBuilder::get_game() {
return std::move(m_game_state);
}
void SimpleBuilder::create_context(float dynamic_objects_ratio) {
GameContext context;
std::vector<Room*> buffer;
//проходимся по комнатам, если она пустая то добавляем в buffer
for (auto& row : m_rooms) {
for (auto& room : row) {
if (room != nullptr)
buffer.emplace_back(room);
}
}
int id = rand() % buffer.size();
//помещаем пакмана в рандомную комнату и удаляем ее из буфера
m_context.pacman.set_location(buffer[id]);
auto it = buffer.begin();
for (int i = 0; i < id; i++, it++);
buffer.erase(it);
for (auto it = buffer.begin(); it != buffer.end(); it++) {
auto food = std::make_unique<Food>();
food->set_location(buffer[id]);
context.static_objects.emplace_back(std::move(food));
}
buffer.clear();
m_context = std::move(context);
}
void SimpleBuilder::create_rooms() {
size_t room_col = m_width / m_room_size;
size_t room_row = m_height / m_room_size;
size_t rows = m_height / m_room_size;
size_t cols = m_width / m_room_size;
int room_size = static_cast<int>(m_room_size);
auto starting_point = sf::Vector2f{(m_width - m_room_size*room_col)/2 + m_room_size/2, (m_height - m_room_size*room_row)/2 + + m_room_size/2};
for (int row = 0; row < room_row * room_size; row += room_size) {
std::vector<Room*> vector_row;
for (int col = 0; col < room_col * room_size; col += room_size) {
auto room = new Room(m_room_size);
room->set_position(sf::Vector2f {(col + starting_point.x), (row + starting_point.y)});
vector_row.emplace_back(room);
sf::Vector2f left_pos = sf::Vector2f{ (m_width - m_room_size * cols + m_room_size)/2, (m_height - m_room_size * rows + m_room_size)/2};
for (int row = 0; row < rows * room_size; row += room_size) {
std::vector<Room*> row_vec;
for (size_t col = 0; col < cols * room_size; col += room_size) {
Room* room = new Room(m_room_size);
room->set_position(sf::Vector2f {col + left_pos.x, row + left_pos.y});
row_vec.push_back(std::move(room));
}
m_rooms.emplace_back(std::move(vector_row));
m_rooms.push_back(std::move(row_vec));
}
}
void SimpleBuilder::set_rooms_sides() {
for (size_t i = 0; i < m_rooms.size(); i++) {
for (size_t j = 0; j < m_rooms.begin()->size(); j++) {
if (i == 0) {
auto up_wall = std::make_shared<Wall>(*m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::UP, std::move(up_wall));
}
else {
auto pass = std::make_shared<Pass>(*m_rooms[i - 1][j], *m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::UP, pass);
m_rooms[i - 1][j]->set_side(Room::DOWN, pass);
}
if (j == 0) {
auto left_wall = std::make_shared<Wall>(*m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::LEFT, std::move(left_wall));
}
else {
auto pass = std::make_shared<Pass>(*m_rooms[i][j - 1], *m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::LEFT, pass);
m_rooms[i][j - 1]->set_side(Room::RIGHT, pass);
}
if (i == m_rooms.size() - 1) {
auto down_wall = std::make_shared<Wall>(*m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::DOWN, std::move(down_wall));
}
if (j == m_rooms.begin()->size() - 1) {
auto right_wall = std::make_shared<Wall>(*m_rooms[i][j]);
m_rooms[i][j]->set_side(Room::RIGHT, std::move(right_wall));
}
}
}
}
source/application/BobBuilder/GameBuilders.h
+ 6
− 12
@@ -5,9 +5,10 @@
class CommonBuilder : public IGameBuilder {
public:
void create_context(float dynamic_objects_ratio);
void create_state(IStateManager& state_manager, sf::VideoMode& mode, std::string& window_title);
void set_all_to_state();
CommonBuilder(float width, float height, float room_size);
void create_context(float dynamic_objects_ratio) override;
void create_state(IStateManager& state_manager, const sf::VideoMode& mode, const std::string& window_title) override;
void set_all_to_state() override;
std::unique_ptr<GameState> get_game() override;
protected:
@@ -21,21 +22,14 @@ protected:
class SimpleBuilder : public CommonBuilder {
public:
void create_context(float dynamic_objects_ratio);
SimpleBuilder(float width, float height, float room_size) : m_width(width), m_height(height), m_room_size(room_size) {};
using CommonBuilder::CommonBuilder;
void create_rooms() override;
void set_rooms_sides() override;
private:
float m_width;
float m_height;
float m_room_size;
std::vector<std::vector<Room*>> m_rooms;
GameContext m_context;
std::unique_ptr<GameState> m_game_state;
};
class ComplexBuilder : public CommonBuilder {
public:
using CommonBuilder::CommonBuilder;
void create_rooms() override;
void set_rooms_sides() override;
};
\ No newline at end of file