summary refs log tree commit diff stats
path: root/src/transform_system.h
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-06 11:40:48 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-06 11:40:48 -0500
commit478bc11eec70e6127161ff360cd77d6893a81c42 (patch)
tree0b9dee46b3f2111acce17475f309487fc8759cb4 /src/transform_system.h
parent64ad64ae11a9497f36258e1c83d23f7964bbf885 (diff)
downloadtanetane-478bc11eec70e6127161ff360cd77d6893a81c42.tar.gz
tanetane-478bc11eec70e6127161ff360cd77d6893a81c42.tar.bz2
tanetane-478bc11eec70e6127161ff360cd77d6893a81c42.zip
Moved some collision stuff into the TransformSystem
Diffstat (limited to 'src/transform_system.h')
-rw-r--r--src/transform_system.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/transform_system.h b/src/transform_system.h index 290d518..eb1a95b 100644 --- a/src/transform_system.h +++ b/src/transform_system.h
@@ -4,11 +4,22 @@
4#include <range/v3/all.hpp> 4#include <range/v3/all.hpp>
5#include <set> 5#include <set>
6#include <tuple> 6#include <tuple>
7#include "direction.h"
7#include "system.h" 8#include "system.h"
8#include "vector.h" 9#include "vector.h"
9 10
10class Game; 11class Game;
11 12
13struct AxisResult {
14 Direction dir;
15 bool blocked = false;
16};
17
18struct CollisionResult {
19 AxisResult horiz;
20 AxisResult vert;
21};
22
12class TransformSystem : public System { 23class TransformSystem : public System {
13public: 24public:
14 25
@@ -26,6 +37,8 @@ public:
26 }); 37 });
27 } 38 }
28 39
40 CollisionResult checkCollision(int spriteId, vec2i newLoc, Direction dir);
41
29private: 42private:
30 43
31 Game& game_; 44 Game& game_;