From 3854633a1945e98c0731ea88e3967a15749cff5b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 7 Jun 2019 21:38:15 +0800 Subject: [PATCH] add movement.* --- server/gameserver/bullet.h | 5 ----- server/gameserver/movement.cc | 0 server/gameserver/movement.h | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 server/gameserver/movement.cc create mode 100644 server/gameserver/movement.h diff --git a/server/gameserver/bullet.h b/server/gameserver/bullet.h index bef7760..052635c 100644 --- a/server/gameserver/bullet.h +++ b/server/gameserver/bullet.h @@ -23,10 +23,6 @@ class Bullet : public Entity Vector2D born_pos; Vector2D born_dir; float fly_distance = 0.0f; -#ifdef RAY_DETECTION - float target_distance = 0.0f; - Vector2D target_point; -#endif Bullet(); virtual ~Bullet() override; @@ -50,5 +46,4 @@ class Bullet : public Entity private: CircleCollider* self_collider_ = nullptr; - }; diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc new file mode 100644 index 0000000..e69de29 diff --git a/server/gameserver/movement.h b/server/gameserver/movement.h new file mode 100644 index 0000000..71606b7 --- /dev/null +++ b/server/gameserver/movement.h @@ -0,0 +1,14 @@ +#pragma once + +class Entity; +class MovementComponent +{ + public: + Entity* owner = nullptr; +#ifdef RAY_DETECTION + float target_distance = 0.0f; + Vector2D target_point; + std::set detection_objects; +#endif + +};