jan.mrna/pathfinding_demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-formatted files

Browse Source
This commit is contained in:
Jan Mrna
2025-10-30 15:10:00 +01:00
parent 193310f704
commit 9c1ec01ce0
28 changed files with 523 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cpp/src/camera.cpp
View File

@@ -1,45 +1,35 @@
#include "camera.hpp"
#include "math.hpp"
#include "log.hpp"
#include "math.hpp"
// for now only pass-through placeholder functions,
// since we draw the whole map
void Camera::Pan(const WorldPos &delta) { m_Pan += (delta / m_Zoom); }
void Camera::Pan(const WorldPos& delta)
{
m_Pan += (delta / m_Zoom);
}
void Camera::Zoom(float delta)
{
void Camera::Zoom(float delta) {
constexpr float ZOOM_SCALE = 0.1f;
m_Zoom += delta * ZOOM_SCALE;
LOG_DEBUG("Zoom: ", m_Zoom);
}
WindowPos Camera::WorldToWindow(WorldPos world) const
{
WindowPos Camera::WorldToWindow(WorldPos world) const {
const auto &v = world + m_Pan;
return WindowPos{v[0], v[1]} * m_Zoom;
}
WorldPos Camera::WindowToWorld(WindowPos window) const
{
WorldPos Camera::WindowToWorld(WindowPos window) const {
window /= m_Zoom;
return WorldPos{window[0], window[1]} - m_Pan;
}
WindowSize Camera::WorldToWindowSize(WorldSize world) const
{
WindowSize Camera::WorldToWindowSize(WorldSize world) const {
const auto &v = world;
// no zoom yet, just pass-through
return WindowSize{v[0], v[1]} * m_Zoom;
}
WorldSize Camera::WindowToWorldSize(WindowSize window) const
{
WorldSize Camera::WindowToWorldSize(WindowSize window) const {
window /= m_Zoom;
return WorldSize{window[0], window[1]};
}

3
cpp/src/camera.hpp
View File

@@ -2,8 +2,7 @@
#include "math.hpp"
class Camera
{
class Camera {
public:
void Pan(const WorldPos &delta);
void Zoom(float delta);

15
cpp/src/entities.cpp
View File

@@ -30,7 +30,8 @@ void Entity::ZeroActualVelocityInDirection(WorldPos direction) {
// q1 * e1 + q2 * e2 = v, from this follows:
auto &v = GetActualVelocity();
float q2 = (v.y() * e1.x() - v.x() * e1.y()) / (e2.y() * e1.x() - e2.x() * e1.y());
float q2 =
(v.y() * e1.x() - v.x() * e1.y()) / (e2.y() * e1.x() - e2.x() * e1.y());
float q1 = (v.x() - q2 * e2.x()) / e1.x();
// We then zero-out the q1, but only if it's positive - meaning
@@ -46,8 +47,7 @@ void Entity::Update(float time_delta) {
m_Position += m_ActualVelocity * time_delta;
}
std::optional<WorldPos> Entity::GetMoveTarget()
{
std::optional<WorldPos> Entity::GetMoveTarget() {
auto &path = GetPath();
if (path.empty()) {
return {};
@@ -68,8 +68,7 @@ std::optional<WorldPos> Entity::GetMoveTarget()
return {};
}
bool Entity::CollidesWith(const Entity& other) const
{
bool Entity::CollidesWith(const Entity &other) const {
const auto &A = *this;
const auto &B = other;
@@ -77,11 +76,9 @@ bool Entity::CollidesWith(const Entity& other) const
auto position_B = B.GetPosition();
auto distance_sq = position_A.DistanceSquared(position_B);
auto collision_distance_sq =
A.GetCollisionRadiusSquared() +
B.GetCollisionRadiusSquared() +
A.GetCollisionRadiusSquared() + B.GetCollisionRadiusSquared() +
2 * A.GetCollisionRadius() * B.GetCollisionRadius();
if (distance_sq < collision_distance_sq)
{
if (distance_sq < collision_distance_sq) {
return true;
}
return false;

4
cpp/src/entities.hpp
View File

@@ -4,13 +4,13 @@
#include <cstdint>
#include <iostream>
#include <memory>
#include <string_view>
#include <optional>
#include <string_view>
#include "log.hpp"
#include "math.hpp"
#include "sprite.hpp"
#include "pathfinder/base.hpp"
#include "sprite.hpp"
class Entity {
public:

32
cpp/src/gameloop.cpp
View File

@@ -21,18 +21,17 @@ void GameLoop::Draw() {
TilePos{static_cast<int32_t>(row), static_cast<int32_t>(col)}));
const auto &size = camera.WorldToWindowSize(map.GetTileSize());
// LOG_DEBUG("Drawing rect (", row, ", ", col, ")");
m_Window->DrawFilledRect(position, size, tiles[row][col]->R, tiles[row][col]->G,
tiles[row][col]->B, tiles[row][col]->A);
m_Window->DrawFilledRect(position, size, tiles[row][col]->R,
tiles[row][col]->G, tiles[row][col]->B,
tiles[row][col]->A);
}
}
// draw the path, if it exists
for (const auto& entity : m_Game->GetEntities())
{
for (const auto &entity : m_Game->GetEntities()) {
WorldPos start_pos = entity->GetPosition();
for (const auto &next_pos : entity->GetPath())
{
for (const auto &next_pos : entity->GetPath()) {
const auto &camera = m_Game->GetCamera();
m_Window->DrawLine(camera.WorldToWindow(start_pos),
camera.WorldToWindow(next_pos));
@@ -44,29 +43,24 @@ void GameLoop::Draw() {
for (auto &entity : m_Game->GetEntities()) {
const auto &camera = m_Game->GetCamera();
auto entity_pos = camera.WorldToWindow(entity->GetPosition());
m_Window->DrawSprite(entity_pos,
entity->GetSprite(),
camera.GetZoom());
if (entity->IsCollisionBoxVisible())
{
float collision_radius = camera.WorldToWindowSize(entity->GetCollisionRadius());
m_Window->DrawSprite(entity_pos, entity->GetSprite(), camera.GetZoom());
if (entity->IsCollisionBoxVisible()) {
float collision_radius =
camera.WorldToWindowSize(entity->GetCollisionRadius());
m_Window->DrawCircle(entity_pos, collision_radius, 255, 0, 0);
}
if (entity->IsSelected())
{
float collision_radius = camera.WorldToWindowSize(entity->GetCollisionRadius());
if (entity->IsSelected()) {
float collision_radius =
camera.WorldToWindowSize(entity->GetCollisionRadius());
m_Window->DrawCircle(entity_pos, collision_radius, 0, 255, 0);
}
}
// draw the selection box, if present
if (m_Game->IsSelectionBoxActive())
{
if (m_Game->IsSelectionBoxActive()) {
const auto &[corner_pos, size] = m_Game->GetSelectionBoxPosSize();
m_Window->DrawRect(corner_pos, size, 200, 20, 20);
}
}
// TODO rethink coupling and dependencies in the game loop class

6
cpp/src/gameloop.hpp
View File

@@ -3,8 +3,8 @@
#include <memory>
#include "pathfindingdemo.hpp"
#include "window.hpp"
#include "user_input.hpp"
#include "window.hpp"
class GameLoop {
public:
@@ -18,9 +18,7 @@ public:
void Run();
void SetGame(std::unique_ptr<PathFindingDemo> x) {
m_Game = std::move(x);
}
void SetGame(std::unique_ptr<PathFindingDemo> x) { m_Game = std::move(x); }
void SetWindow(std::unique_ptr<Window> x) { m_Window = std::move(x); }
void SetUserInput(std::unique_ptr<UserInput> x) {
m_UserInput = std::move(x);

41
cpp/src/map.cpp
View File

@@ -25,7 +25,8 @@ WorldPos Map::TileEdgeToWorld(TilePos p) const {
}
TilePos Map::WorldToTile(WorldPos p) const {
return TilePos{static_cast<int32_t>(p.x() / TILE_SIZE), static_cast<int32_t>(p.y() / TILE_SIZE)};
return TilePos{static_cast<int32_t>(p.x() / TILE_SIZE),
static_cast<int32_t>(p.y() / TILE_SIZE)};
}
WorldSize Map::GetTileSize() const { return WorldSize{TILE_SIZE, TILE_SIZE}; }
@@ -51,9 +52,7 @@ bool Map::IsTilePosValid(TilePos p) const {
return row < m_Tiles.size() && col < m_Tiles[0].size();
}
std::vector<TilePos> Map::GetNeighbors(TilePos center) const
{
std::vector<TilePos> Map::GetNeighbors(TilePos center) const {
std::vector<TilePos> neighbours;
neighbours.reserve(4);
@@ -71,20 +70,20 @@ std::vector<TilePos> Map::GetNeighbors(TilePos center) const
return neighbours;
}
void Map::PaintCircle(TilePos center, unsigned radius, TileType tile_type)
{
void Map::PaintCircle(TilePos center, unsigned radius, TileType tile_type) {
// get rectangle that wraps the circle
TilePos corner1 = TilePos{center.x() - static_cast<int32_t>(radius), center.y() - static_cast<int32_t>(radius)};
TilePos corner2 = TilePos{center.x() + static_cast<int32_t>(radius), center.y() + static_cast<int32_t>(radius)};
TilePos corner1 = TilePos{center.x() - static_cast<int32_t>(radius),
center.y() - static_cast<int32_t>(radius)};
TilePos corner2 = TilePos{center.x() + static_cast<int32_t>(radius),
center.y() + static_cast<int32_t>(radius)};
// iterate through all valid points, setting the type
const unsigned radius_squared = radius * radius;
for (int x = corner1.x(); x < corner2.x(); x++) {
for (int y = corner1.y(); y < corner2.y(); y++) {
TilePos current_tile = {x, y};
unsigned distance_squared = static_cast<unsigned>(center.DistanceTo(current_tile) * center.DistanceTo(current_tile));
if (IsTilePosValid(current_tile) && distance_squared < radius_squared)
{
unsigned distance_squared = static_cast<unsigned>(
center.DistanceTo(current_tile) * center.DistanceTo(current_tile));
if (IsTilePosValid(current_tile) && distance_squared < radius_squared) {
// y is row, x is col
m_Tiles[y][x] = &tile_types.at(tile_type);
}
@@ -92,10 +91,12 @@ void Map::PaintCircle(TilePos center, unsigned radius, TileType tile_type)
}
}
void Map::PaintLine(TilePos start_tile, TilePos stop_tile, double width, TileType tile_type)
{
const vec<double, 2> start{static_cast<double>(start_tile.x()), static_cast<double>(start_tile.y())};
const vec<double, 2> stop{static_cast<double>(stop_tile.x()), static_cast<double>(stop_tile.y())};
void Map::PaintLine(TilePos start_tile, TilePos stop_tile, double width,
TileType tile_type) {
const vec<double, 2> start{static_cast<double>(start_tile.x()),
static_cast<double>(start_tile.y())};
const vec<double, 2> stop{static_cast<double>(stop_tile.x()),
static_cast<double>(stop_tile.y())};
const double line_length = start.DistanceTo(stop);
const vec<double, 2> step = (stop - start) / line_length;
const vec<double, 2> ortho = step.GetOrthogonal();
@@ -104,7 +105,8 @@ void Map::PaintLine(TilePos start_tile, TilePos stop_tile, double width, TileTyp
for (double t = 0; t < line_length; t += 1.0) {
for (double ortho_t = 0; ortho_t < width; ortho_t += 0.1) {
auto tile_pos = start + step * t + ortho * ortho_t;
TilePos tile_pos_int{static_cast<int32_t>(tile_pos.x()), static_cast<int32_t>(tile_pos.y())};
TilePos tile_pos_int{static_cast<int32_t>(tile_pos.x()),
static_cast<int32_t>(tile_pos.y())};
if (IsTilePosValid(tile_pos_int)) {
size_t row = static_cast<size_t>(tile_pos.x());
size_t col = static_cast<size_t>(tile_pos.y());
@@ -114,9 +116,8 @@ void Map::PaintLine(TilePos start_tile, TilePos stop_tile, double width, TileTyp
}
}
void Map::PaintRectangle(TilePos first_corner, TilePos second_corner, TileType tile_type)
{
void Map::PaintRectangle(TilePos first_corner, TilePos second_corner,
TileType tile_type) {
std::initializer_list<int> xvals = {first_corner.x(), second_corner.x()};
std::initializer_list<int> yvals = {first_corner.y(), second_corner.y()};
for (int x = std::min(xvals); x < std::max(xvals); x++) {

3
cpp/src/map.hpp
View File

@@ -35,7 +35,8 @@ public:
// methods for drawing on the map
void PaintCircle(TilePos center, unsigned radius, TileType tile_type);
void PaintLine(TilePos start, TilePos stop, double width, TileType tile_type);
void PaintRectangle(TilePos first_corner, TilePos second_corner, TileType tile_type);
void PaintRectangle(TilePos first_corner, TilePos second_corner,
TileType tile_type);
std::vector<TilePos> GetNeighbors(TilePos center) const;
float GetCost(TilePos pos) const { return GetTileAt(pos)->cost; }

97
cpp/src/math.hpp
View File

@@ -4,12 +4,12 @@
#include <cassert>
#include <cmath>
#include <concepts>
#include <functional>
#include <initializer_list>
#include <iostream>
#include <numeric>
#include <ranges>
#include <utility>
#include <functional>
#ifdef _WIN32
#include <numbers>
@@ -39,8 +39,7 @@ struct Any {};
template <typename T, size_t N, typename Tag = Any> class vec {
// Friend declaration for move constructor from different tag types
template <typename U, size_t M, typename OtherTag>
friend class vec;
template <typename U, size_t M, typename OtherTag> friend class vec;
public:
vec() : m_Array{} {}
@@ -109,8 +108,7 @@ public:
return c;
}
friend vec operator+(const vec& a, T b)
{
friend vec operator+(const vec &a, T b) {
vec<T, N, Tag> c;
std::ranges::transform(a.m_Array, std::views::repeat(b), c.m_Array.begin(),
std::plus{});
@@ -124,8 +122,7 @@ public:
return c;
}
friend vec operator-(const vec& a, T b)
{
friend vec operator-(const vec &a, T b) {
vec<T, N, Tag> c;
std::ranges::transform(a.m_Array, std::views::repeat(b), c.m_Array.begin(),
std::minus{});
@@ -150,8 +147,8 @@ public:
friend vec operator/(const vec &a, const vec &b) {
vec<T, N, Tag> c;
std::ranges::transform(a.m_Array, b.m_Array,
c.m_Array.begin(), std::divides{});
std::ranges::transform(a.m_Array, b.m_Array, c.m_Array.begin(),
std::divides{});
return c;
}
@@ -173,12 +170,12 @@ public:
return a;
}
vec& operator/=(float scalar)
{
vec &operator/=(float scalar) {
vec &a = *this;
auto b = std::views::repeat(scalar);
std::ranges::transform(a.m_Array, b, a.m_Array.begin(), std::divides{});
// TODO check all of this, could be done better with views instead of ranges?
// TODO check all of this, could be done better with views instead of
// ranges?
return a;
}
@@ -203,7 +200,6 @@ public:
return (a - b).LengthSquared();
}
//
// In-place vector operations
//
@@ -237,15 +233,13 @@ public:
return tmp;
}
static T DotProduct(const vec& a, const vec& b)
{
return std::inner_product(
a.m_Array.begin(), a.m_Array.end(), b.m_Array.begin(),
T{}, std::plus{}, std::multiplies{});
static T DotProduct(const vec &a, const vec &b) {
return std::inner_product(a.m_Array.begin(), a.m_Array.end(),
b.m_Array.begin(), T{}, std::plus{},
std::multiplies{});
}
T DotProduct(const vec& b) const
{
T DotProduct(const vec &b) const {
const auto &a = *this;
return DotProduct(a, b);
}
@@ -290,15 +284,11 @@ public:
return m_Array[2];
}
template <typename TargetTag>
vec<T,N,TargetTag> ChangeTag() const &
{
template <typename TargetTag> vec<T, N, TargetTag> ChangeTag() const & {
return vec<T, N, TargetTag>(m_Array);
}
template <typename TargetTag>
vec<T,N,TargetTag> ChangeTag() &&
{
template <typename TargetTag> vec<T, N, TargetTag> ChangeTag() && {
return vec<T, N, TargetTag>(std::move(*this));
}
@@ -372,8 +362,7 @@ struct TilePosHash {
//
// Collumn major square matrix
template <typename T, size_t N, typename Tag = Any>
class Matrix {
template <typename T, size_t N, typename Tag = Any> class Matrix {
using vec_type = vec<T, N, Tag>;
@@ -383,11 +372,9 @@ public:
// Initialization using flat array of N*N elements
template <typename Tarr, size_t M>
requires(M == N * N && std::same_as<Tarr, T>)
Matrix(std::array<Tarr,M> array) : m_Array{}
{
Matrix(std::array<Tarr, M> array) : m_Array{} {
std::size_t idx = 0;
for (auto col : array | std::views::chunk(N))
{
for (auto col : array | std::views::chunk(N)) {
std::ranges::copy(col, m_Array[idx++].Data().begin());
}
}
@@ -395,8 +382,7 @@ public:
const vec_type &operator[](size_t index) const { return m_Array[index]; }
vec_type &operator[](size_t index) { return m_Array[index]; }
friend std::ostream &operator<<(std::ostream &os, const Matrix &obj)
{
friend std::ostream &operator<<(std::ostream &os, const Matrix &obj) {
os << "( ";
for (const auto &element : obj.m_Array) {
os << element << " ";
@@ -405,59 +391,51 @@ public:
return os;
}
friend Matrix operator+(const Matrix& A, const Matrix& B)
{
friend Matrix operator+(const Matrix &A, const Matrix &B) {
Matrix C;
std::ranges::transform(A.m_Array, B.m_Array, C.m_Array.begin(), std::plus{});
std::ranges::transform(A.m_Array, B.m_Array, C.m_Array.begin(),
std::plus{});
return C;
}
friend Matrix operator-(const Matrix& A, const Matrix& B)
{
friend Matrix operator-(const Matrix &A, const Matrix &B) {
Matrix C;
std::ranges::transform(A.m_Array, B.m_Array, C.m_Array.begin(), std::minus{});
std::ranges::transform(A.m_Array, B.m_Array, C.m_Array.begin(),
std::minus{});
return C;
}
friend Matrix operator*(const Matrix& A, const Matrix& B)
{
friend Matrix operator*(const Matrix &A, const Matrix &B) {
Matrix C;
for (size_t i = 0; i < N; i++)
{
for (size_t j = 0; j < N; j++)
{
for (size_t i = 0; i < N; i++) {
for (size_t j = 0; j < N; j++) {
T sum = 0;
for (size_t k = 0; k < N; ++k) sum += A[i][k] * B[k][j];
for (size_t k = 0; k < N; ++k)
sum += A[i][k] * B[k][j];
C[i][j] = sum;
}
}
return C;
}
friend vec_type operator*(const Matrix& A, const vec_type& b)
{
friend vec_type operator*(const Matrix &A, const vec_type &b) {
// we assume that b is row vector
vec_type c;
for (size_t i = 0; i < N; i++)
{
for (size_t i = 0; i < N; i++) {
c[i] = b.DotProduct(A[i]);
}
return c;
}
static constexpr Matrix Eye()
{
static constexpr Matrix Eye() {
Matrix E;
for (size_t i = 0; i < N; i++)
{
for (size_t i = 0; i < N; i++) {
E[i][i] = T{1};
}
return E;
}
private:
std::array<vec_type, N> m_Array;
};
@@ -471,7 +449,7 @@ namespace std {
struct tuple_element<I, vec<T, 2, Tag>> {
using type = T;
};
}
} // namespace std
// ADL-based get for structured bindings
template <size_t I, typename T, typename Tag>
@@ -479,7 +457,6 @@ const T& get(const vec<T, 2, Tag>& v) {
return v.template get<I>();
}
template<size_t I, typename T, typename Tag>
T& get(vec<T, 2, Tag>& v) {
template <size_t I, typename T, typename Tag> T &get(vec<T, 2, Tag> &v) {
return v.template get<I>();
}

7
cpp/src/pathfinder/base.cpp
View File

@@ -1,5 +1,5 @@
#include <memory>
#include <cassert>
#include <memory>
#include <queue>
#include "pathfinder/base.hpp"
@@ -13,10 +13,11 @@ PathFinderBase::PathFinderBase(const Map* map) : m_Map(map) {}
// LinearPathFinder also lives here, since it is too small to get it's
// own implementation file
Path LinearPathFinder::CalculatePath(WorldPos, WorldPos end) // first argument (start pos) not used
Path LinearPathFinder::CalculatePath(
WorldPos, WorldPos end) // first argument (start pos) not used
{
auto path = Path{end};
return path;
}
} // pathfinder namespace
} // namespace pathfinder

8
cpp/src/pathfinder/base.hpp
View File

@@ -1,11 +1,11 @@
#pragma once
#include <vector>
#include <memory>
#include <unordered_map>
#include <vector>
#include "math.hpp"
#include "map.hpp"
#include "math.hpp"
namespace pathfinder {
@@ -36,7 +36,6 @@ protected:
const Map *m_Map;
};
class LinearPathFinder : public PathFinderBase {
public:
@@ -48,5 +47,4 @@ private:
const std::string_view m_Name = "Linear Path";
};
} // pathfinder namespace
} // namespace pathfinder

5
cpp/src/pathfinder/bfs.cpp
View File

@@ -9,7 +9,8 @@
namespace pathfinder {
Path BFS::CalculatePath(WorldPos start_world, WorldPos end_world) {
if (m_Map == nullptr) return {};
if (m_Map == nullptr)
return {};
const TilePos start = m_Map->WorldToTile(start_world);
const TilePos end = m_Map->WorldToTile(end_world);
@@ -63,4 +64,4 @@ Path BFS::CalculatePath(WorldPos start_world, WorldPos end_world) {
return path;
}
} // pathfinder namespace
} // namespace pathfinder

2
cpp/src/pathfinder/bfs.hpp
View File

@@ -22,4 +22,4 @@ private:
std::unordered_map<TilePos, TilePos, TilePosHash> m_CameFrom;
};
}
} // namespace pathfinder

30
cpp/src/pathfinder/dijkstra.cpp
View File

@@ -3,49 +3,48 @@
#include "dijkstra.hpp"
#include "base.hpp"
#include "utils.hpp"
#include "math.hpp"
#include "map.hpp"
#include "math.hpp"
#include "utils.hpp"
namespace pathfinder {
Path Dijkstra::CalculatePath(WorldPos start_world, WorldPos end_world)
{
Path Dijkstra::CalculatePath(WorldPos start_world, WorldPos end_world) {
using QueueEntry = utils::QueueEntry;
if (!m_Map) return {};
if (!m_Map)
return {};
const TilePos start = m_Map->WorldToTile(start_world);
const TilePos end = m_Map->WorldToTile(end_world);
if (!m_Map->IsTilePosValid(start) || !m_Map->IsTilePosValid(end))
return {};
if (start == end) return {};
if (start == end)
return {};
// clear previous run
m_CameFrom.clear();
m_Cost.clear();
std::priority_queue<QueueEntry, std::vector<QueueEntry>, std::greater<>> frontier;
std::priority_queue<QueueEntry, std::vector<QueueEntry>, std::greater<>>
frontier;
frontier.push({0.0f, start});
m_CameFrom[start] = start; // sentinel
m_Cost[start] = 0.0f;
while (!frontier.empty())
{
while (!frontier.empty()) {
const QueueEntry current = frontier.top();
frontier.pop();
if (current.tile == end) // early exit
break;
for (TilePos next : m_Map->GetNeighbors(current.tile))
{
for (TilePos next : m_Map->GetNeighbors(current.tile)) {
// cost of moving to neighbour (uniform 1.0 matches original BFS)
const float newCost = m_Cost[current.tile] + m_Map->GetCost(next);
if (!m_Cost.count(next) || newCost < m_Cost[next])
{
if (!m_Cost.count(next) || newCost < m_Cost[next]) {
m_Cost[next] = newCost;
m_CameFrom[next] = current.tile;
frontier.push({newCost, next});
@@ -61,8 +60,7 @@ Path Dijkstra::CalculatePath(WorldPos start_world, WorldPos end_world)
TilePos cur = end;
path.push_back(m_Map->TileToWorld(cur));
while (cur != start)
{
while (cur != start) {
cur = m_CameFrom[cur];
path.push_back(m_Map->TileToWorld(cur));
}
@@ -70,4 +68,4 @@ Path Dijkstra::CalculatePath(WorldPos start_world, WorldPos end_world)
return path;
}
} // pathfinder namespace
} // namespace pathfinder

2
cpp/src/pathfinder/dijkstra.hpp
View File

@@ -23,4 +23,4 @@ private:
std::unordered_map<TilePos, TilePos, TilePosHash> m_CameFrom;
};
} // pathfinder namespace
} // namespace pathfinder

28
cpp/src/pathfinder/gbfs.cpp
View File

@@ -3,46 +3,45 @@
#include "gbfs.hpp"
#include "base.hpp"
#include "math.hpp"
#include "map.hpp"
#include "math.hpp"
#include "pathfinder/utils.hpp"
namespace pathfinder {
float GBFS::Heuristic(const TilePos& a, const TilePos& b)
{
float GBFS::Heuristic(const TilePos &a, const TilePos &b) {
return static_cast<float>(std::abs(a.x() - b.x()) + std::abs(a.y() - b.y()));
}
Path GBFS::CalculatePath(WorldPos start_world, WorldPos end_world)
{
Path GBFS::CalculatePath(WorldPos start_world, WorldPos end_world) {
using QueueEntry = pathfinder::utils::QueueEntry;
if (!m_Map) return {};
if (!m_Map)
return {};
const TilePos start = m_Map->WorldToTile(start_world);
const TilePos end = m_Map->WorldToTile(end_world);
if (!m_Map->IsTilePosValid(start) || !m_Map->IsTilePosValid(end))
return {};
if (start == end) return {};
if (start == end)
return {};
m_CameFrom.clear();
std::priority_queue<QueueEntry, std::vector<QueueEntry>, std::greater<>> frontier;
std::priority_queue<QueueEntry, std::vector<QueueEntry>, std::greater<>>
frontier;
frontier.push({Heuristic(start, end), start});
m_CameFrom[start] = start; // sentinel
while (!frontier.empty())
{
while (!frontier.empty()) {
const QueueEntry current = frontier.top();
frontier.pop();
if (current.tile == end) // early exit
break;
for (TilePos next : m_Map->GetNeighbors(current.tile))
{
for (TilePos next : m_Map->GetNeighbors(current.tile)) {
if (!m_CameFrom.count(next)) // not visited
{
m_CameFrom[next] = current.tile;
@@ -59,8 +58,7 @@ Path GBFS::CalculatePath(WorldPos start_world, WorldPos end_world)
TilePos cur = end;
path.push_back(m_Map->TileToWorld(cur));
while (cur != start)
{
while (cur != start) {
cur = m_CameFrom[cur];
path.push_back(m_Map->TileToWorld(cur));
}
@@ -68,4 +66,4 @@ Path GBFS::CalculatePath(WorldPos start_world, WorldPos end_world)
return path;
}
} // pathfinder namespace
} // namespace pathfinder

2
cpp/src/pathfinder/gbfs.hpp
View File

@@ -23,4 +23,4 @@ private:
std::unordered_map<TilePos, TilePos, TilePosHash> m_CameFrom;
};
} // pathfinder namespace
} // namespace pathfinder

6
cpp/src/pathfinder/utils.cpp
View File

@@ -3,9 +3,9 @@
#include "utils.hpp"
#include "base.hpp"
#include "log.hpp"
#include "map.hpp"
#include "math.hpp"
#include "log.hpp"
#include "pathfinder/bfs.hpp"
#include "pathfinder/dijkstra.hpp"
#include "pathfinder/gbfs.hpp"
@@ -31,5 +31,5 @@ std::unique_ptr<PathFinderBase> create(PathFinderType type, const Map* map) {
return nullptr;
}
} // utils namespace
} // pathfinding namespace
} // namespace utils
} // namespace pathfinder

10
cpp/src/pathfinder/utils.hpp
View File

@@ -10,8 +10,7 @@
namespace pathfinder {
namespace utils {
struct QueueEntry
{
struct QueueEntry {
float cost;
TilePos tile;
@@ -19,7 +18,8 @@ struct QueueEntry
bool operator>(const QueueEntry &o) const noexcept { return cost > o.cost; }
};
std::unique_ptr<pathfinder::PathFinderBase> create(pathfinder::PathFinderType type, const Map* map);
std::unique_ptr<pathfinder::PathFinderBase>
create(pathfinder::PathFinderType type, const Map *map);
} // utils namespace
} // pathfinding namespace
} // namespace utils
} // namespace pathfinder

121
cpp/src/pathfindingdemo.cpp
View File

@@ -8,17 +8,16 @@
#include "entities.hpp"
#include "log.hpp"
#include "map.hpp"
#include "user_input.hpp"
#include "pathfinder/base.hpp"
#include "pathfinder/utils.hpp"
#include "tile.hpp"
#include "user_input.hpp"
PathFindingDemo::PathFindingDemo(int width, int height) :
m_Map(width, height)
{
PathFindingDemo::PathFindingDemo(int width, int height) : m_Map(width, height) {
LOG_DEBUG(".");
// set default pathfinder method
m_PathFinder = pathfinder::utils::create(pathfinder::PathFinderType::DIJKSTRA, (const Map*)&m_Map);
m_PathFinder = pathfinder::utils::create(pathfinder::PathFinderType::DIJKSTRA,
(const Map *)&m_Map);
}
PathFindingDemo::~PathFindingDemo() { LOG_DEBUG("."); }
@@ -65,10 +64,8 @@ void PathFindingDemo::CreateMap() {
player2->SetPosition(m_Map.TileToWorld(TilePos{50, 20}));
AddEntity(player2);
for (int i = 0; i < 1; i++)
{
for (int j = 0; j < 10; j++)
{
for (int i = 0; i < 1; i++) {
for (int j = 0; j < 10; j++) {
auto p = std::make_shared<Player>();
p->SetPosition(m_Map.TileToWorld(TilePos{10 + 5 * i, 40 + 5 * j}));
AddEntity(p);
@@ -76,8 +73,7 @@ void PathFindingDemo::CreateMap() {
}
// select everything - TODO this is just temporary for testing
for (const auto& entity : m_Entities)
{
for (const auto &entity : m_Entities) {
m_SelectedEntities.push_back(entity);
}
}
@@ -86,23 +82,17 @@ WorldPos PathFindingDemo::GetRandomPosition() const {
return WorldPos{0.0f, 0.0f}; // totally random!
}
const std::vector<Collision>& PathFindingDemo::GetEntityCollisions()
{
const std::vector<Collision> &PathFindingDemo::GetEntityCollisions() {
static std::vector<Collision> m_Collisions;
m_Collisions.clear();
for (const auto &entity_A : m_Entities)
{
for (const auto &entity_B : m_Entities)
{
for (const auto &entity_A : m_Entities) {
for (const auto &entity_B : m_Entities) {
if (entity_A == entity_B)
continue;
if (!entity_A->IsCollidable() || !entity_B->IsCollidable())
continue;
if (entity_A->CollidesWith(*entity_B))
{
if (entity_A->CollidesWith(*entity_B)) {
// handle collision logic
m_Collisions.emplace_back(Collision(entity_A, entity_B));
}
@@ -111,21 +101,18 @@ const std::vector<Collision>& PathFindingDemo::GetEntityCollisions()
return m_Collisions;
}
// Update entity positions, handle collisions
void PathFindingDemo::UpdateWorld() {
float time_delta = 1.0f;
for (auto& entity : m_Entities)
{
for (auto &entity : m_Entities) {
// calculate the velocity
auto current_pos = entity->GetPosition();
double tile_velocity_coeff = m_Map.GetTileVelocityCoeff(current_pos);
auto next_pos = entity->GetMoveTarget();
WorldPos velocity = WorldPos{};
if (next_pos)
{
if (next_pos) {
velocity = next_pos.value() - current_pos;
velocity.Normalize();
// LOG_DEBUG("I want to move to: ", next_pos.value(),
@@ -133,15 +120,14 @@ void PathFindingDemo::UpdateWorld() {
}
entity->SetActualVelocity(velocity * tile_velocity_coeff);
for (const auto& collision : GetEntityCollisions())
{
// TODO this loop is quite "hot", is it good idea to use weak_ptr and promote it?
for (const auto &collision : GetEntityCollisions()) {
// TODO this loop is quite "hot", is it good idea to use weak_ptr and
// promote it?
auto weak_A = std::get<0>(collision);
auto weak_B = std::get<1>(collision);
auto A = weak_A.lock();
auto B = weak_B.lock();
if (A == nullptr || B == nullptr)
{
if (A == nullptr || B == nullptr) {
continue;
}
if (!A->IsMovable())
@@ -159,58 +145,43 @@ void PathFindingDemo::UpdateWorld() {
}
}
void PathFindingDemo::HandleActions(const std::vector<UserAction> &actions)
{
for (const auto &action : actions)
{
if (action.type == UserAction::Type::EXIT)
{
void PathFindingDemo::HandleActions(const std::vector<UserAction> &actions) {
for (const auto &action : actions) {
if (action.type == UserAction::Type::EXIT) {
LOG_INFO("Exit requested");
m_ExitRequested = true;
}
else if (action.type == UserAction::Type::SET_MOVE_TARGET)
{
} else if (action.type == UserAction::Type::SET_MOVE_TARGET) {
WorldPos target_pos = m_Camera.WindowToWorld(action.Argument.position);
for (auto& selected_entity : m_SelectedEntities)
{
for (auto &selected_entity : m_SelectedEntities) {
LOG_INFO("Calculating path to target: ", target_pos);
if (auto sp = selected_entity.lock())
{
auto path = m_PathFinder->CalculatePath(sp->GetPosition(), target_pos);
if (auto sp = selected_entity.lock()) {
auto path =
m_PathFinder->CalculatePath(sp->GetPosition(), target_pos);
sp->SetPath(path);
LOG_INFO("Done, path node count: ", path.size());
} else {
LOG_INFO("Cannot calculate path for destroyed entity (weak_ptr.lock() failed)");
LOG_INFO("Cannot calculate path for destroyed entity "
"(weak_ptr.lock() failed)");
}
}
}
else if (action.type == UserAction::Type::SELECT_PATHFINDER)
{
} else if (action.type == UserAction::Type::SELECT_PATHFINDER) {
using namespace pathfinder;
PathFinderType type = static_cast<PathFinderType>(action.Argument.number);
m_PathFinder = pathfinder::utils::create(type, (const Map *)&m_Map);
LOG_INFO("Switched to path finding method: ", m_PathFinder->GetName());
}
else if (action.type == UserAction::Type::CAMERA_PAN)
{
} else if (action.type == UserAction::Type::CAMERA_PAN) {
const auto &window_pan = action.Argument.position;
WorldPos world_pan{window_pan.x(), window_pan.y()};
m_Camera.Pan(world_pan);
LOG_INFO("Camera pan delta: ", world_pan);
}
else if (action.type == UserAction::Type::CAMERA_ZOOM)
{
} else if (action.type == UserAction::Type::CAMERA_ZOOM) {
m_Camera.Zoom(action.Argument.float_number);
LOG_INFO("Camera zoom: ", action.Argument.float_number);
}
else if (action.type == UserAction::Type::SELECTION_START)
{
} else if (action.type == UserAction::Type::SELECTION_START) {
m_SelectionBox.active = true;
m_SelectionBox.start = action.Argument.position;
m_SelectionBox.end = action.Argument.position;
}
else if (action.type == UserAction::Type::SELECTION_END)
{
} else if (action.type == UserAction::Type::SELECTION_END) {
m_SelectionBox.end = action.Argument.position;
m_SelectionBox.active = false;
auto diff = m_SelectionBox.end - m_SelectionBox.start;
@@ -219,9 +190,7 @@ void PathFindingDemo::HandleActions(const std::vector<UserAction> &actions)
WorldPos start = m_Camera.WindowToWorld(m_SelectionBox.start);
WorldPos end = m_Camera.WindowToWorld(m_SelectionBox.end);
SelectEntitiesInRectangle(start, end);
}
else if (action.type == UserAction::Type::SELECTION_CHANGE)
{
} else if (action.type == UserAction::Type::SELECTION_CHANGE) {
m_SelectionBox.end = action.Argument.position;
auto diff = m_SelectionBox.end - m_SelectionBox.start;
m_SelectionBox.size = diff.ChangeTag<WindowSizeTag>();
@@ -229,30 +198,25 @@ void PathFindingDemo::HandleActions(const std::vector<UserAction> &actions)
};
}
void PathFindingDemo::DeselectEntities()
{
std::for_each(m_SelectedEntities.begin(), m_SelectedEntities.end(), [](auto& x)
{
void PathFindingDemo::DeselectEntities() {
std::for_each(m_SelectedEntities.begin(), m_SelectedEntities.end(),
[](auto &x) {
if (auto entity = x.lock())
entity->Deselect();
}
);
});
m_SelectedEntities.clear();
}
void PathFindingDemo::SelectEntitiesInRectangle(WorldPos A, WorldPos B)
{
void PathFindingDemo::SelectEntitiesInRectangle(WorldPos A, WorldPos B) {
DeselectEntities();
// TODO use colliders for this
auto [x_min, x_max] = std::minmax(A.x(), B.x());
auto [y_min, y_max] = std::minmax(A.y(), B.y());
for (const auto& entity : m_Entities)
{
for (const auto &entity : m_Entities) {
const auto &pos = entity->GetPosition();
bool x_in_range = x_min < pos.x() && pos.x() < x_max;
bool y_in_range = y_min < pos.y() && pos.y() < y_max;
if (x_in_range && y_in_range)
{
if (x_in_range && y_in_range) {
m_SelectedEntities.push_back(std::weak_ptr(entity));
entity->Select();
}
@@ -260,12 +224,9 @@ void PathFindingDemo::SelectEntitiesInRectangle(WorldPos A, WorldPos B)
LOG_INFO("Selected ", m_SelectedEntities.size(), " entities");
}
std::pair<WindowPos, WindowSize> PathFindingDemo::GetSelectionBoxPosSize()
{
std::pair<WindowPos, WindowSize> PathFindingDemo::GetSelectionBoxPosSize() {
const auto &pos = m_SelectionBox.start;
WindowPos size_pos = m_SelectionBox.end - m_SelectionBox.start;
WindowSize size = size_pos.ChangeTag<WindowSizeTag>();
return std::pair(pos, size);
}

11
cpp/src/pathfindingdemo.hpp
View File

@@ -5,17 +5,16 @@
#include <queue>
#include <vector>
#include "camera.hpp"
#include "entities.hpp"
#include "log.hpp"
#include "map.hpp"
#include "user_input.hpp"
#include "pathfinder/base.hpp"
#include "camera.hpp"
#include "user_input.hpp"
using Collision = std::pair<std::weak_ptr<Entity>, std::weak_ptr<Entity>>;
struct SelectionBox
{
struct SelectionBox {
WindowPos start, end;
WindowSize size;
bool active;
@@ -46,7 +45,9 @@ public:
void DeselectEntities();
bool IsSelectionBoxActive() const { return m_SelectionBox.active; }
std::pair<WindowPos, WindowSize> GetSelectionBoxPosSize();
std::vector<std::weak_ptr<Entity>> GetSelectedEntities() { return m_SelectedEntities; }
std::vector<std::weak_ptr<Entity>> GetSelectedEntities() {
return m_SelectedEntities;
}
private:
const std::vector<Collision> &GetEntityCollisions();

2
cpp/src/tile.hpp
View File

@@ -1,9 +1,9 @@
#pragma once
#include <array>
#include <cstdint>
#include <map>
#include <string_view>
#include <array>
#include <unordered_map>
struct Tile {

69
cpp/src/user_input.cpp
View File

@@ -2,8 +2,8 @@
#include <expected>
#include <map>
#include <string>
#include <vector>
#include <unordered_set>
#include <vector>
#include "user_input.hpp"
@@ -20,70 +20,52 @@ UserInput::~UserInput() { LOG_DEBUG("."); };
std::expected<void, std::string> UserInput::Init() { return {}; }
void UserInput::GetActions_mouse(const SDL_Event& event)
{
void UserInput::GetActions_mouse(const SDL_Event &event) {
static bool mouse_pan = false;
SDL_MouseButtonEvent mouse_event = event.button;
MouseButton button = static_cast<MouseButton>(mouse_event.button);
if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
{
if (button == MouseButton::LEFT)
{
if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN) {
if (button == MouseButton::LEFT) {
LOG_DEBUG("Selection start at ", mouse_event.x, ", ", mouse_event.y);
m_SelectionActive = true;
m_Actions.emplace_back(UserAction::Type::SELECTION_START,
WindowPos{mouse_event.x, mouse_event.y});
}
else if (button == MouseButton::RIGHT)
{
} else if (button == MouseButton::RIGHT) {
LOG_DEBUG("Set move target to: ", mouse_event.x, ", ", mouse_event.y);
m_Actions.emplace_back(UserAction::Type::SET_MOVE_TARGET,
WindowPos{mouse_event.x, mouse_event.y});
}
else if (button == MouseButton::MIDDLE)
{
} else if (button == MouseButton::MIDDLE) {
mouse_pan = true;
}
}
else if (event.type == SDL_EVENT_MOUSE_BUTTON_UP)
{
if (button == MouseButton::LEFT)
{
} else if (event.type == SDL_EVENT_MOUSE_BUTTON_UP) {
if (button == MouseButton::LEFT) {
LOG_DEBUG("Selection end at ", mouse_event.x, ", ", mouse_event.y);
m_SelectionActive = false;
m_Actions.emplace_back(UserAction::Type::SELECTION_END,
WindowPos{mouse_event.x, mouse_event.y});
}
if (button == MouseButton::MIDDLE)
{
if (button == MouseButton::MIDDLE) {
mouse_pan = false;
}
}
else if (event.type == SDL_EVENT_MOUSE_MOTION)
{
} else if (event.type == SDL_EVENT_MOUSE_MOTION) {
SDL_MouseMotionEvent motion_event = event.motion;
if (mouse_pan)
{
if (mouse_pan) {
m_Actions.emplace_back(UserAction::Type::CAMERA_PAN,
WindowPos{motion_event.xrel, motion_event.yrel});
}
if (m_SelectionActive)
{
if (m_SelectionActive) {
m_Actions.emplace_back(UserAction::Type::SELECTION_CHANGE,
WindowPos{mouse_event.x, mouse_event.y});
}
}
else if(event.type == SDL_EVENT_MOUSE_WHEEL)
{
} else if (event.type == SDL_EVENT_MOUSE_WHEEL) {
SDL_MouseWheelEvent mouse_wheel = event.wheel;
m_Actions.emplace_back(UserAction::Type::CAMERA_ZOOM, mouse_wheel.y);
}
}
void UserInput::GetActions_keyboard(const SDL_Event& event)
{
void UserInput::GetActions_keyboard(const SDL_Event &event) {
bool key_down = event.type == SDL_EVENT_KEY_DOWN ? true : false;
SDL_KeyboardEvent kbd_event = event.key;
if (kbd_event.repeat) {
@@ -116,12 +98,9 @@ void UserInput::GetActions_keyboard(const SDL_Event& event)
const std::vector<UserAction> &UserInput::GetActions() {
static std::unordered_set<uint32_t> mouse_events = {
SDL_EVENT_MOUSE_MOTION,
SDL_EVENT_MOUSE_BUTTON_DOWN,
SDL_EVENT_MOUSE_BUTTON_UP,
SDL_EVENT_MOUSE_WHEEL,
SDL_EVENT_MOUSE_ADDED,
SDL_EVENT_MOUSE_REMOVED,
SDL_EVENT_MOUSE_MOTION, SDL_EVENT_MOUSE_BUTTON_DOWN,
SDL_EVENT_MOUSE_BUTTON_UP, SDL_EVENT_MOUSE_WHEEL,
SDL_EVENT_MOUSE_ADDED, SDL_EVENT_MOUSE_REMOVED,
};
static std::unordered_set<uint32_t> keyboard_events = {
@@ -132,18 +111,12 @@ const std::vector<UserAction>& UserInput::GetActions() {
SDL_Event event;
m_Actions.clear();
while (SDL_PollEvent(&event))
{
if (keyboard_events.contains(event.type))
{
while (SDL_PollEvent(&event)) {
if (keyboard_events.contains(event.type)) {
GetActions_keyboard(event);
}
else if (mouse_events.contains(event.type))
{
} else if (mouse_events.contains(event.type)) {
GetActions_mouse(event);
}
else
{
} else {
// TODO uncomment, for now too much noise
// LOG_WARNING("Action not processed");
}

4
cpp/src/user_input.hpp
View File

@@ -12,9 +12,7 @@ enum class MouseButton { LEFT = 1, MIDDLE, RIGHT };
class UserAction {
public:
enum class Type
{
enum class Type {
NONE,
EXIT,
SET_MOVE_TARGET,

18
cpp/src/window.cpp
View File

@@ -79,19 +79,20 @@ Window::~Window() {
void Window::DrawSprite(const WindowPos &position, Sprite &s, float scale) {
WorldSize size = s.GetSize() * scale;
WorldPos img_center = s.GetCenter() * scale;
SDL_FRect rect = {position.x() - img_center.x(), position.y() - img_center.y(),
size.x(), size.y()};
SDL_FRect rect = {position.x() - img_center.x(),
position.y() - img_center.y(), size.x(), size.y()};
SDL_RenderTexture(m_Renderer.get(), s.GetTexture(), nullptr, &rect);
}
void Window::DrawFilledRect(const WindowPos &position, const WindowSize size, uint8_t R,
uint8_t G, uint8_t B, uint8_t A) {
void Window::DrawFilledRect(const WindowPos &position, const WindowSize size,
uint8_t R, uint8_t G, uint8_t B, uint8_t A) {
SDL_FRect rect = {position.x(), position.y(), size.x(), size.y()};
SDL_SetRenderDrawColor(m_Renderer.get(), R, G, B, A);
SDL_RenderFillRect(m_Renderer.get(), &rect);
}
void Window::DrawRect(const WindowPos &position, const WindowSize size, uint8_t R, uint8_t G, uint8_t B) {
void Window::DrawRect(const WindowPos &position, const WindowSize size,
uint8_t R, uint8_t G, uint8_t B) {
SDL_FRect rect = {position.x(), position.y(), size.x(), size.y()};
SDL_SetRenderDrawColor(m_Renderer.get(), R, G, B, 255);
SDL_RenderRect(m_Renderer.get(), &rect);
@@ -105,7 +106,8 @@ void Window::ClearWindow() {
void Window::Flush() { SDL_RenderPresent(m_Renderer.get()); }
// TODO use some struct for color
void Window::DrawCircle(const WindowPos &position, float radius, uint8_t R, uint8_t G, uint8_t B) {
void Window::DrawCircle(const WindowPos &position, float radius, uint8_t R,
uint8_t G, uint8_t B) {
int cx = static_cast<int>(position.x());
int cy = static_cast<int>(position.y());
SDL_SetRenderDrawColor(m_Renderer.get(), R, G, B, 255);
@@ -117,9 +119,7 @@ void Window::DrawCircle(const WindowPos &position, float radius, uint8_t R, uint
}
}
void Window::DrawLine(const WindowPos &A, const WindowPos &B)
{
void Window::DrawLine(const WindowPos &A, const WindowPos &B) {
SDL_SetRenderDrawColor(m_Renderer.get(), 255, 0, 0, 255);
SDL_RenderLine(m_Renderer.get(), A.x(), A.y(), B.x(), B.y());
}

11
cpp/src/window.hpp
View File

@@ -23,12 +23,14 @@ public:
std::expected<void, std::string> Init();
void DrawSprite(const WindowPos &position, Sprite &s, float scale = 1.0f);
void DrawFilledRect(const WindowPos &position, const WindowSize size, uint8_t R,
uint8_t G, uint8_t B, uint8_t A);
void DrawRect(const WindowPos &position, const WindowSize size, uint8_t R, uint8_t G, uint8_t B);
void DrawFilledRect(const WindowPos &position, const WindowSize size,
uint8_t R, uint8_t G, uint8_t B, uint8_t A);
void DrawRect(const WindowPos &position, const WindowSize size, uint8_t R,
uint8_t G, uint8_t B);
void ClearWindow();
void Flush();
void DrawCircle(const WindowPos &position, float radius, uint8_t R, uint8_t G, uint8_t B);
void DrawCircle(const WindowPos &position, float radius, uint8_t R, uint8_t G,
uint8_t B);
void DrawLine(const WindowPos &A, const WindowPos &B);
private:
@@ -37,5 +39,4 @@ private:
std::shared_ptr<SDL_Renderer> m_Renderer = nullptr;
SDL_Window *m_Window;
SDL_GLContext m_Context;
};