Compare commits
4 Commits
win_build
...
bf7c1ab2a7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf7c1ab2a7 | ||
|
|
9913d5b938 | ||
|
|
83d18443c3 | ||
|
|
bdac14c6cb |
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -1,9 +0,0 @@
|
|||||||
[submodule "vs/SDL"]
|
|
||||||
path = vs/SDL
|
|
||||||
url = https://github.com/libsdl-org/SDL.git
|
|
||||||
[submodule "vs/glew"]
|
|
||||||
path = vs/glew
|
|
||||||
url = gitea@gitea.veleslabs.org:jan.mrna/glew.git
|
|
||||||
[submodule "vs/SDL_image"]
|
|
||||||
path = vs/SDL_image
|
|
||||||
url = https://github.com/libsdl-org/SDL_image.git
|
|
||||||
@@ -48,6 +48,6 @@ Alternatively (or if you want to edit the file), you can use the [Jupyeter Lab o
|
|||||||
- [x] drawing tiles
|
- [x] drawing tiles
|
||||||
- [x] add "terrain tiles" with different costs
|
- [x] add "terrain tiles" with different costs
|
||||||
- [x] add mouse-click action
|
- [x] add mouse-click action
|
||||||
- [ ] add direct movement (through mouse click action, no pathfinding)
|
- [x] add direct movement (through mouse click action, no pathfinding)
|
||||||
- [ ] implement pathfinding
|
- [ ] implement pathfinding
|
||||||
- [ ] windows build?
|
- [ ] windows build?
|
||||||
|
|||||||
@@ -2,21 +2,13 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#if defined(__GNUC__) || defined(__clang__)
|
#define LOG_CRITICAL(...) Log::critical(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
# define PRETTY_FUNC __PRETTY_FUNCTION__
|
#define LOG_ERROR(...) Log::error(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
#elif defined(_MSC_VER)
|
#define LOG_WARNING(...) Log::warning(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
# define PRETTY_FUNC __FUNCTION__
|
#define LOG_INFO(...) Log::info(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
#else
|
#define LOG_DEBUG(...) Log::debug(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
# define PRETTY_FUNC __func__
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define LOG_CRITICAL(...) Log::critical(PRETTY_FUNC, ": ", __VA_ARGS__)
|
|
||||||
#define LOG_ERROR(...) Log::error(PRETTY_FUNC, ": ", __VA_ARGS__)
|
|
||||||
#define LOG_WARNING(...) Log::warning(PRETTY_FUNC, ": ", __VA_ARGS__)
|
|
||||||
#define LOG_INFO(...) Log::info(PRETTY_FUNC, ": ", __VA_ARGS__)
|
|
||||||
#define LOG_DEBUG(...) Log::debug(PRETTY_FUNC, ": ", __VA_ARGS__)
|
|
||||||
#define LOG_PROFILING_DEBUG(...) \
|
#define LOG_PROFILING_DEBUG(...) \
|
||||||
Log::profiling_debug(PRETTY_FUNC, ": ", __VA_ARGS__)
|
Log::profiling_debug(__PRETTY_FUNCTION__, ": ", __VA_ARGS__)
|
||||||
|
|
||||||
namespace Log {
|
namespace Log {
|
||||||
enum class LevelTypes {
|
enum class LevelTypes {
|
||||||
|
|||||||
254
cpp/src/main.cpp
254
cpp/src/main.cpp
@@ -1,4 +1,5 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <queue>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
@@ -13,18 +14,14 @@
|
|||||||
#include "array.hpp"
|
#include "array.hpp"
|
||||||
#include "log.hpp"
|
#include "log.hpp"
|
||||||
#include "math.hpp"
|
#include "math.hpp"
|
||||||
|
#include "pathfinder.hpp"
|
||||||
|
|
||||||
//
|
//
|
||||||
// Utils
|
// Utils
|
||||||
//
|
//
|
||||||
|
|
||||||
//
|
|
||||||
// Math stuff
|
|
||||||
//
|
|
||||||
|
|
||||||
// Forward declarations
|
// Forward declarations
|
||||||
class Sprite;
|
class Sprite;
|
||||||
class Sound;
|
|
||||||
class UserAction;
|
class UserAction;
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -37,29 +34,6 @@ class UserAction;
|
|||||||
#include <SDL3/SDL.h>
|
#include <SDL3/SDL.h>
|
||||||
#include <SDL3_image/SDL_image.h>
|
#include <SDL3_image/SDL_image.h>
|
||||||
|
|
||||||
class Sound {
|
|
||||||
public:
|
|
||||||
Sound() { LOG_DEBUG("."); }
|
|
||||||
Sound(const Sound &x) { LOG_DEBUG("."); }
|
|
||||||
Sound(Sound &&x) noexcept { LOG_DEBUG("."); }
|
|
||||||
~Sound() { LOG_DEBUG("."); }
|
|
||||||
};
|
|
||||||
|
|
||||||
class AudioOutput {
|
|
||||||
public:
|
|
||||||
AudioOutput() { LOG_DEBUG("."); }
|
|
||||||
AudioOutput(const AudioOutput &x) = delete;
|
|
||||||
AudioOutput(AudioOutput &&x) = delete;
|
|
||||||
~AudioOutput() { LOG_DEBUG("."); }
|
|
||||||
|
|
||||||
std::expected<void, std::string> Init() {
|
|
||||||
LOG_INFO("Initialing audio output");
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
void PlaySound(Sound &s);
|
|
||||||
};
|
|
||||||
|
|
||||||
class Sprite {
|
class Sprite {
|
||||||
public:
|
public:
|
||||||
Sprite() : m_Texture(nullptr, SDL_DestroyTexture) {}
|
Sprite() : m_Texture(nullptr, SDL_DestroyTexture) {}
|
||||||
@@ -375,10 +349,6 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual Sprite &GetSprite() = 0;
|
virtual Sprite &GetSprite() = 0;
|
||||||
virtual constexpr float GetCollisionRadius() const = 0;
|
|
||||||
virtual constexpr float GetCollisionRadiusSquared() {
|
|
||||||
return GetCollisionRadius() * GetCollisionRadius();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual constexpr Type GetType() const = 0;
|
virtual constexpr Type GetType() const = 0;
|
||||||
void SetFlagExpired() { m_FlagExpired = true; }
|
void SetFlagExpired() { m_FlagExpired = true; }
|
||||||
@@ -398,34 +368,10 @@ public:
|
|||||||
m_RequestedVelocity = new_velocity;
|
m_RequestedVelocity = new_velocity;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ZeroActualVelocityInDirection(Vec2D<float> direction) {
|
|
||||||
// Vectors e1, e2 form the basis for a local coord system,
|
|
||||||
// where e1 is formed by the direction where we want to zero-out
|
|
||||||
// the velocity, and e2 is the orthogonal vector.
|
|
||||||
// Scalars q1, q2 are coordinates for e1, e2 basis.
|
|
||||||
Vec2D<float> e1 = direction.normalized();
|
|
||||||
Vec2D<float> e2 = e1.orthogonal();
|
|
||||||
|
|
||||||
// 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 q1 = (v.x - q2 * e2.x) / e1.x;
|
|
||||||
|
|
||||||
// We then zero-out the q1, but only if it's positive - meaning
|
|
||||||
// it is aiming in the direction of "direction", not out.
|
|
||||||
// (otherwise we're not able to move out from collision with
|
|
||||||
// another object)
|
|
||||||
if (q1 > 0.0f) {
|
|
||||||
SetActualVelocity(q2 * e2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void Update(float time_delta) {
|
virtual void Update(float time_delta) {
|
||||||
m_Position += m_ActualVelocity * time_delta;
|
m_Position += m_ActualVelocity * time_delta;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool IsMovable() const = 0;
|
|
||||||
virtual bool IsCollidable() const = 0;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Vec2D<float> m_Position;
|
Vec2D<float> m_Position;
|
||||||
@@ -434,7 +380,6 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_FlagExpired = false;
|
bool m_FlagExpired = false;
|
||||||
static constexpr float m_CollisionRadiusSq = 1000.0f;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class Wall final : public Entity {
|
class Wall final : public Entity {
|
||||||
@@ -453,9 +398,6 @@ public:
|
|||||||
return *m_Sprite;
|
return *m_Sprite;
|
||||||
}
|
}
|
||||||
constexpr Entity::Type GetType() const override { return Entity::Type::WALL; }
|
constexpr Entity::Type GetType() const override { return Entity::Type::WALL; }
|
||||||
constexpr float GetCollisionRadius() const override { return 50.0f; }
|
|
||||||
bool IsMovable() const override { return false; }
|
|
||||||
bool IsCollidable() const override { return true; }
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadResources() {
|
void LoadResources() {
|
||||||
@@ -485,9 +427,6 @@ public:
|
|||||||
constexpr Entity::Type GetType() const override {
|
constexpr Entity::Type GetType() const override {
|
||||||
return Entity::Type::PLAYER;
|
return Entity::Type::PLAYER;
|
||||||
}
|
}
|
||||||
constexpr float GetCollisionRadius() const override { return 50.0f; }
|
|
||||||
bool IsMovable() const override { return true; }
|
|
||||||
bool IsCollidable() const override { return true; }
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadResources() {
|
void LoadResources() {
|
||||||
@@ -499,7 +438,6 @@ private:
|
|||||||
|
|
||||||
std::unique_ptr<Sprite> Player::m_Sprite;
|
std::unique_ptr<Sprite> Player::m_Sprite;
|
||||||
|
|
||||||
using Collision = std::pair<std::shared_ptr<Entity>, std::shared_ptr<Entity>>;
|
|
||||||
|
|
||||||
struct Tile {
|
struct Tile {
|
||||||
float cost;
|
float cost;
|
||||||
@@ -513,8 +451,6 @@ static const std::map<std::string_view, Tile> tile_types = {
|
|||||||
{"Water", {10.0, 0, 50, 200, 255}},
|
{"Water", {10.0, 0, 50, 200, 255}},
|
||||||
};
|
};
|
||||||
|
|
||||||
using TilePos = Vec2D<int>;
|
|
||||||
using WorldPos = Vec2D<float>;
|
|
||||||
|
|
||||||
class Map {
|
class Map {
|
||||||
|
|
||||||
@@ -523,17 +459,17 @@ class Map {
|
|||||||
public:
|
public:
|
||||||
static constexpr float TILE_SIZE = 100.0f; // tile size in world
|
static constexpr float TILE_SIZE = 100.0f; // tile size in world
|
||||||
|
|
||||||
Map(int width, int height) : m_Width(width), m_Height(height) {
|
Map(int rows, int cols) : m_Cols(cols), m_Rows(rows) {
|
||||||
bool sw = true;
|
bool sw = true;
|
||||||
LOG_DEBUG("width = ", width, " height = ", height);
|
LOG_DEBUG("cols = ", cols, " rows = ", rows);
|
||||||
m_Tiles = std::vector<std::vector<const Tile *>>{};
|
m_Tiles = std::vector<std::vector<const Tile *>>{};
|
||||||
for (int i = 0; i < m_Width; i++) {
|
for (size_t row = 0; row < m_Rows; row++) {
|
||||||
m_Tiles.push_back(std::vector<const Tile *>{});
|
m_Tiles.push_back(std::vector<const Tile *>{});
|
||||||
for (int j = 0; j < m_Height; j++) {
|
for (size_t col = 0; col < m_Cols; col++) {
|
||||||
if (sw)
|
if (sw)
|
||||||
m_Tiles[i].push_back(&tile_types.at("Grass"));
|
m_Tiles[row].push_back(&tile_types.at("Grass"));
|
||||||
else
|
else
|
||||||
m_Tiles[i].push_back(&tile_types.at("Water"));
|
m_Tiles[row].push_back(&tile_types.at("Road"));
|
||||||
sw = !sw;
|
sw = !sw;
|
||||||
}
|
}
|
||||||
sw = !sw;
|
sw = !sw;
|
||||||
@@ -557,11 +493,36 @@ public:
|
|||||||
return Vec2D<float>{TILE_SIZE, TILE_SIZE};
|
return Vec2D<float>{TILE_SIZE, TILE_SIZE};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const Tile* GetTileAt(TilePos p) const {
|
||||||
|
assert(IsTilePosValid(p));
|
||||||
|
size_t row = p.x;
|
||||||
|
size_t col = p.y;
|
||||||
|
|
||||||
|
return m_Tiles[row][col];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
const Tile* GetTileAt(WorldPos p) const {
|
||||||
|
return GetTileAt(WorldToTile(p));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsTilePosValid(TilePos p) const {
|
||||||
|
size_t row = p.x;
|
||||||
|
size_t col = p.y;
|
||||||
|
|
||||||
|
return row < m_Tiles.size() && col < m_Tiles[0].size();
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
double GetTileVelocityCoeff(T p) const {
|
||||||
|
return 1.0 / GetTileAt(p)->cost;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// std::vector<std::vector<const Tile*>> m_Tiles;
|
// std::vector<std::vector<const Tile*>> m_Tiles;
|
||||||
std::vector<std::vector<const Tile *>> m_Tiles;
|
std::vector<std::vector<const Tile *>> m_Tiles;
|
||||||
int m_Width = 0;
|
size_t m_Cols = 0;
|
||||||
int m_Height = 0;
|
size_t m_Rows = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
class PathFindingDemo {
|
class PathFindingDemo {
|
||||||
@@ -595,85 +556,41 @@ public:
|
|||||||
|
|
||||||
std::vector<std::shared_ptr<Entity>> &GetEntities() { return m_Entities; }
|
std::vector<std::shared_ptr<Entity>> &GetEntities() { return m_Entities; }
|
||||||
|
|
||||||
void UpdateEntities() {
|
std::optional<WorldPos> GetMoveTarget() {
|
||||||
|
WorldPos current_player_pos = GetPlayer()->GetPosition();
|
||||||
|
|
||||||
|
if (m_MoveQueue.empty()) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
WorldPos next_player_pos = m_MoveQueue.front();
|
||||||
|
|
||||||
|
if (current_player_pos.distance(next_player_pos) > 10.0) {
|
||||||
|
// target not reached yet
|
||||||
|
return next_player_pos;
|
||||||
|
}
|
||||||
|
// target reached, pop it
|
||||||
|
m_MoveQueue.pop();
|
||||||
|
// return nothing - we'll get the next value in the next iteration
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void UpdatePlayerVelocity()
|
||||||
|
{
|
||||||
|
auto player = GetPlayer();
|
||||||
|
auto current_pos = player->GetPosition();
|
||||||
|
double tile_velocity_coeff = m_Map.GetTileVelocityCoeff(current_pos);
|
||||||
|
auto next_pos = GetMoveTarget();
|
||||||
|
auto velocity = WorldPos{};
|
||||||
|
if (next_pos) {
|
||||||
|
velocity = next_pos.value() - current_pos;
|
||||||
|
velocity.normalize();
|
||||||
|
LOG_DEBUG("I want to move to: ", next_pos.value(), ", velocity: ", velocity);
|
||||||
|
}
|
||||||
|
player->SetActualVelocity(velocity * tile_velocity_coeff);
|
||||||
float time_delta = 1.0f;
|
float time_delta = 1.0f;
|
||||||
|
player->Update(time_delta);
|
||||||
// Remove entities marked as expired and handle expiry logic (e.g. bomb
|
|
||||||
// exploding); for all other entities, reset the actual velocity to the
|
|
||||||
// requested; actual velocity will be updated later with collisions
|
|
||||||
for (auto &entity : m_Entities) {
|
|
||||||
if (entity->IsFlaggedExpired()) {
|
|
||||||
ExpiryGameLogic(*entity);
|
|
||||||
auto it = std::find(m_Entities.begin(), m_Entities.end(), entity);
|
|
||||||
if (it != m_Entities.end()) {
|
|
||||||
std::swap(*it, m_Entities.back());
|
|
||||||
m_Entities.pop_back();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Actual velocity might be changed later by collisions
|
|
||||||
entity->SetActualVelocity(entity->GetRequestedVelocity());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle collisions:
|
|
||||||
// - update actual velocity for colliding objects
|
|
||||||
// - handle collision logic
|
|
||||||
auto &collisions = GetEntityCollisions();
|
|
||||||
// LOG_DEBUG("number of collisions: ", collisions.size());
|
|
||||||
for (auto &collision : collisions) {
|
|
||||||
Entity &A = *std::get<0>(collision);
|
|
||||||
Entity &B = *std::get<1>(collision);
|
|
||||||
if (!A.IsMovable())
|
|
||||||
continue;
|
|
||||||
// modify actual speed
|
|
||||||
// LOG_DEBUG("Collision: A is ", A, ", B is ", B);
|
|
||||||
Vec2D<float> AB = B.GetPosition() - A.GetPosition();
|
|
||||||
A.ZeroActualVelocityInDirection(AB);
|
|
||||||
// handle logic
|
|
||||||
CollisionGameLogic(A, B);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update entities: this advances animations,
|
|
||||||
// internal timers, and updates positions (with velocity
|
|
||||||
// modified by the collision handling)
|
|
||||||
for (auto &entity : m_Entities) {
|
|
||||||
entity->Update(time_delta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void CollisionGameLogic(Entity &A, Entity &B) {
|
|
||||||
// not used for path finding demo
|
|
||||||
}
|
|
||||||
|
|
||||||
void ExpiryGameLogic(Entity &entity) {
|
|
||||||
// not used for path finding demo
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::vector<Collision> &GetEntityCollisions() {
|
|
||||||
static std::vector<Collision> m_Collisions;
|
|
||||||
|
|
||||||
m_Collisions.clear();
|
|
||||||
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;
|
|
||||||
// check distance of player to given entity
|
|
||||||
auto position_A = entity_A->GetPosition();
|
|
||||||
auto position_B = entity_B->GetPosition();
|
|
||||||
auto distance_sq = position_A.distance_squared(position_B);
|
|
||||||
auto collision_distance_sq =
|
|
||||||
entity_A->GetCollisionRadiusSquared() +
|
|
||||||
entity_B->GetCollisionRadiusSquared() +
|
|
||||||
2 * entity_A->GetCollisionRadius() * entity_B->GetCollisionRadius();
|
|
||||||
// TODO use vector instructions
|
|
||||||
if (distance_sq < collision_distance_sq) {
|
|
||||||
m_Collisions.emplace_back(Collision(entity_A, entity_B));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return m_Collisions;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HandleActions(const std::vector<UserAction> &actions) {
|
void HandleActions(const std::vector<UserAction> &actions) {
|
||||||
@@ -688,25 +605,27 @@ public:
|
|||||||
LOG_INFO("Move direction ", action.Argument.position);
|
LOG_INFO("Move direction ", action.Argument.position);
|
||||||
m_Player->SetRequestedVelocity(action.Argument.position * 4.0f);
|
m_Player->SetRequestedVelocity(action.Argument.position * 4.0f);
|
||||||
} else if (action.type == UserAction::Type::MOVE_TARGET) {
|
} else if (action.type == UserAction::Type::MOVE_TARGET) {
|
||||||
TilePos p = m_Map.WorldToTile(action.Argument.position);
|
WorldPos wp = action.Argument.position;
|
||||||
LOG_INFO("Move target: ", action.Argument.position, ", tile pos: ", p);
|
TilePos p = m_Map.WorldToTile(wp);
|
||||||
// TODO move
|
LOG_INFO("Clearing current move queue and inserting new target: ", wp);
|
||||||
|
std::queue<WorldPos> empty;
|
||||||
|
std::swap(empty, m_MoveQueue);
|
||||||
|
m_MoveQueue.push(wp);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const Map &GetMap() const { return m_Map; }
|
const Map &GetMap() const { return m_Map; }
|
||||||
|
|
||||||
bool IsCollisionBoxVisible() const { return m_DrawCollisionBox; }
|
|
||||||
bool IsExitRequested() const { return m_ExitRequested; }
|
bool IsExitRequested() const { return m_ExitRequested; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int m_Width;
|
int m_Width;
|
||||||
int m_Height;
|
int m_Height;
|
||||||
bool m_ExitRequested = false;
|
bool m_ExitRequested = false;
|
||||||
bool m_DrawCollisionBox = true;
|
|
||||||
std::vector<std::shared_ptr<Entity>> m_Entities;
|
std::vector<std::shared_ptr<Entity>> m_Entities;
|
||||||
std::shared_ptr<Player> m_Player;
|
std::shared_ptr<Player> m_Player;
|
||||||
|
std::queue<WorldPos> m_MoveQueue;
|
||||||
Map m_Map;
|
Map m_Map;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -721,15 +640,15 @@ public:
|
|||||||
LOG_INFO("Running the game");
|
LOG_INFO("Running the game");
|
||||||
while (!m_Game->IsExitRequested()) {
|
while (!m_Game->IsExitRequested()) {
|
||||||
m_Game->HandleActions(m_UserInput->GetActions());
|
m_Game->HandleActions(m_UserInput->GetActions());
|
||||||
m_Game->UpdateEntities();
|
m_Game->UpdatePlayerVelocity();
|
||||||
|
|
||||||
m_Window->ClearWindow();
|
m_Window->ClearWindow();
|
||||||
|
|
||||||
// draw the map (terrain tiles)
|
// draw the map (terrain tiles)
|
||||||
const Map &map = m_Game->GetMap();
|
const Map &map = m_Game->GetMap();
|
||||||
const auto &tiles = map.GetMapTiles();
|
const auto &tiles = map.GetMapTiles();
|
||||||
for (int row = 0; row < tiles.size(); row++) {
|
for (size_t row = 0; row < tiles.size(); row++) {
|
||||||
for (int col = 0; col < tiles[row].size(); col++) {
|
for (size_t col = 0; col < tiles[row].size(); col++) {
|
||||||
// LOG_DEBUG("Drawing rect (", row, ", ", col, ")");
|
// LOG_DEBUG("Drawing rect (", row, ", ", col, ")");
|
||||||
m_Window->DrawRect(
|
m_Window->DrawRect(
|
||||||
map.TileToWorld(TilePos{row, col}),
|
map.TileToWorld(TilePos{row, col}),
|
||||||
@@ -741,10 +660,6 @@ public:
|
|||||||
// draw all the entities (player etc)
|
// draw all the entities (player etc)
|
||||||
for (auto &entity : m_Game->GetEntities()) {
|
for (auto &entity : m_Game->GetEntities()) {
|
||||||
m_Window->DrawSprite(entity->GetPosition(), entity->GetSprite());
|
m_Window->DrawSprite(entity->GetPosition(), entity->GetSprite());
|
||||||
if (m_Game->IsCollisionBoxVisible()) {
|
|
||||||
m_Window->DrawCircle(entity->GetPosition(),
|
|
||||||
entity->GetCollisionRadius());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_Window->Flush();
|
m_Window->Flush();
|
||||||
@@ -760,15 +675,11 @@ public:
|
|||||||
inline void SetUserInput(std::unique_ptr<UserInput> x) {
|
inline void SetUserInput(std::unique_ptr<UserInput> x) {
|
||||||
m_UserInput = std::move(x);
|
m_UserInput = std::move(x);
|
||||||
}
|
}
|
||||||
inline void SetAudioOutput(std::unique_ptr<AudioOutput> x) {
|
|
||||||
m_AudioOutput = std::move(x);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<PathFindingDemo> m_Game;
|
std::unique_ptr<PathFindingDemo> m_Game;
|
||||||
std::unique_ptr<Window> m_Window;
|
std::unique_ptr<Window> m_Window;
|
||||||
std::unique_ptr<UserInput> m_UserInput;
|
std::unique_ptr<UserInput> m_UserInput;
|
||||||
std::unique_ptr<AudioOutput> m_AudioOutput;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
@@ -791,12 +702,6 @@ int main(int argc, char **argv) {
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto audio_output = std::make_unique<AudioOutput>();
|
|
||||||
if (auto initialized = audio_output->Init(); !initialized) {
|
|
||||||
LOG_ERROR(initialized.error());
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the map and run the pathfinding demo
|
* Initialize the map and run the pathfinding demo
|
||||||
*/
|
*/
|
||||||
@@ -807,7 +712,6 @@ int main(int argc, char **argv) {
|
|||||||
auto game_loop = GameLoop{};
|
auto game_loop = GameLoop{};
|
||||||
game_loop.SetWindow(std::move(window));
|
game_loop.SetWindow(std::move(window));
|
||||||
game_loop.SetUserInput(std::move(user_input));
|
game_loop.SetUserInput(std::move(user_input));
|
||||||
game_loop.SetAudioOutput(std::move(audio_output));
|
|
||||||
game_loop.SetGame(std::move(demo));
|
game_loop.SetGame(std::move(demo));
|
||||||
game_loop.Run();
|
game_loop.Run();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,6 @@
|
|||||||
#include <concepts>
|
#include <concepts>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <numbers>
|
|
||||||
#define M_PI std::numbers::pi
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T> struct Vec2D {
|
template <typename T> struct Vec2D {
|
||||||
public:
|
public:
|
||||||
Vec2D() = default;
|
Vec2D() = default;
|
||||||
@@ -91,3 +86,6 @@ public:
|
|||||||
return os;
|
return os;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
using TilePos = Vec2D<int>;
|
||||||
|
using WorldPos = Vec2D<float>;
|
||||||
|
|||||||
12
cpp/src/pathfinder.hpp
Normal file
12
cpp/src/pathfinder.hpp
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "math.hpp"
|
||||||
|
|
||||||
|
namespace pathfinder {
|
||||||
|
|
||||||
|
using Path = std::vector<TilePos>;
|
||||||
|
|
||||||
|
class PathFinderBase {
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
1
vs/SDL
1
vs/SDL
Submodule vs/SDL deleted from 3e9e22f17d
Submodule vs/SDL_image deleted from eeae8a64df
1
vs/glew
1
vs/glew
Submodule vs/glew deleted from 02505d6cc1
@@ -1,61 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.9.34622.214
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathfinding_demo", "pathfinding_demo.vcxproj", "{E14D159C-08E1-46E4-BD63-6157EDBC70DC}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "..\SDL\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "..\glew\build\vc15\glew_static.vcxproj", "{664E6F0D-6784-4760-9565-D54F8EB1EDF4}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_image", "..\SDL_image\VisualC\SDL_image.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|x64 = Debug|x64
|
|
||||||
Debug|x86 = Debug|x86
|
|
||||||
Release|x64 = Release|x64
|
|
||||||
Release|x86 = Release|x86
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Release|x64.Build.0 = Release|x64
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Release|x86.ActiveCfg = Release|Win32
|
|
||||||
{E14D159C-08E1-46E4-BD63-6157EDBC70DC}.Release|x86.Build.0 = Release|Win32
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.ActiveCfg = Release|Win32
|
|
||||||
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.Build.0 = Release|Win32
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x86.ActiveCfg = Release|Win32
|
|
||||||
{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x86.Build.0 = Release|Win32
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x86.ActiveCfg = Release|Win32
|
|
||||||
{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x86.Build.0 = Release|Win32
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {7CCA451E-D4BA-48B4-AAD0-8AC02333FD9D}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug|x64">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|x64">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\..\cpp\src\main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\..\cpp\src\array.hpp" />
|
|
||||||
<ClInclude Include="..\..\cpp\src\log.hpp" />
|
|
||||||
<ClInclude Include="..\..\cpp\src\math.hpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\glew\build\vc15\glew_static.vcxproj">
|
|
||||||
<Project>{664e6f0d-6784-4760-9565-d54f8eb1edf4}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\SDL\VisualC\SDL\SDL.vcxproj">
|
|
||||||
<Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\SDL_image\VisualC\SDL_image.vcxproj">
|
|
||||||
<Project>{2bd5534e-00e2-4bea-ac96-d9a92ea24696}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<VCProjectVersion>17.0</VCProjectVersion>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<ProjectGuid>{e14d159c-08e1-46e4-bd63-6157edbc70dc}</ProjectGuid>
|
|
||||||
<RootNamespace>pathfindingdemo</RootNamespace>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="Shared">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>GLEW_STATIC</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
<LanguageStandard>stdcpplatest</LanguageStandard>
|
|
||||||
<AdditionalIncludeDirectories>..\glew\include;..\SDL\include;..\SDL_image\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>..\glew\lib\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>opengl32.lib;glu32.lib;glew32sd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>GLEW_STATIC</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
<LanguageStandard>stdcpplatest</LanguageStandard>
|
|
||||||
<AdditionalIncludeDirectories>..\glew\include;..\SDL\include;..\SDL_image\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>..\glew\lib\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>opengl32.lib;glu32.lib;glew32sd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>GLEW_STATIC</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
<LanguageStandard>stdcpplatest</LanguageStandard>
|
|
||||||
<AdditionalIncludeDirectories>..\glew\include;..\SDL\include;..\SDL_image\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>..\glew\lib\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>opengl32.lib;glu32.lib;glew32sd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<PreprocessorDefinitions>GLEW_STATIC</PreprocessorDefinitions>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
<LanguageStandard>stdcpplatest</LanguageStandard>
|
|
||||||
<AdditionalIncludeDirectories>..\glew\include;..\SDL\include;..\SDL_image\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>..\glew\lib\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>opengl32.lib;glu32.lib;glew32sd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Source Files">
|
|
||||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
|
||||||
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Header Files">
|
|
||||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
|
||||||
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\..\cpp\src\main.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\..\cpp\src\array.hpp">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\cpp\src\log.hpp">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\cpp\src\math.hpp">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\cpp</LocalDebuggerWorkingDirectory>
|
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\cpp</LocalDebuggerWorkingDirectory>
|
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\cpp</LocalDebuggerWorkingDirectory>
|
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\cpp</LocalDebuggerWorkingDirectory>
|
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
Reference in New Issue
Block a user