diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-06 11:40:48 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-06 11:40:48 -0500 |
commit | 478bc11eec70e6127161ff360cd77d6893a81c42 (patch) | |
tree | 0b9dee46b3f2111acce17475f309487fc8759cb4 /src/transform_system.h | |
parent | 64ad64ae11a9497f36258e1c83d23f7964bbf885 (diff) | |
download | tanetane-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.h | 13 |
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 | ||
10 | class Game; | 11 | class Game; |
11 | 12 | ||
13 | struct AxisResult { | ||
14 | Direction dir; | ||
15 | bool blocked = false; | ||
16 | }; | ||
17 | |||
18 | struct CollisionResult { | ||
19 | AxisResult horiz; | ||
20 | AxisResult vert; | ||
21 | }; | ||
22 | |||
12 | class TransformSystem : public System { | 23 | class TransformSystem : public System { |
13 | public: | 24 | public: |
14 | 25 | ||
@@ -26,6 +37,8 @@ public: | |||
26 | }); | 37 | }); |
27 | } | 38 | } |
28 | 39 | ||
40 | CollisionResult checkCollision(int spriteId, vec2i newLoc, Direction dir); | ||
41 | |||
29 | private: | 42 | private: |
30 | 43 | ||
31 | Game& game_; | 44 | Game& game_; |