diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-08 21:09:36 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-09 17:59:13 -0400 |
| commit | 5c82f052c26303318e81ddd76475c1d188cc74f4 (patch) | |
| tree | 3204ef94f2861224a380aa566728c02b4acd1fd9 /src/components/automatable.h | |
| parent | 96e6f3231aed9919d660a06944f1d96dc8241f8e (diff) | |
| download | therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.tar.gz therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.tar.bz2 therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.zip | |
Simplified positions/sizes with vectors
Positions and sizes are now stored as vectors (of doubles and ints, respectively). This allows for at least minor code simplification in many places, and cleans up the CollisionParams code in PonderingSystem quite a bit.
Diffstat (limited to 'src/components/automatable.h')
| -rw-r--r-- | src/components/automatable.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/components/automatable.h b/src/components/automatable.h index b37945f..c1fd1a3 100644 --- a/src/components/automatable.h +++ b/src/components/automatable.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include "component.h" | 4 | #include "component.h" |
| 5 | #include <vector> | 5 | #include <vector> |
| 6 | #include <random> | 6 | #include <random> |
| 7 | #include "vector.h" | ||
| 7 | 8 | ||
| 8 | class AutomatableComponent : public Component { | 9 | class AutomatableComponent : public Component { |
| 9 | public: | 10 | public: |
| @@ -18,8 +19,7 @@ public: | |||
| 18 | * The horizontal and vertical speed, in pixels/sec, that the entity should | 19 | * The horizontal and vertical speed, in pixels/sec, that the entity should |
| 19 | * move at. | 20 | * move at. |
| 20 | */ | 21 | */ |
| 21 | double speedX; | 22 | vec2d speed; |
| 22 | double speedY; | ||
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * The duration of the action in seconds. | 25 | * The duration of the action in seconds. |