Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: simplifying enemy state logic

Browse source
This commit is contained in:
Sara Gerretsen 2026-02-01 16:26:12 +01:00
parent 603b3afcc2
commit 710e9c7bde
6 changed files with 148 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/wave_survival/enemy_body.h
View file

@ -4,8 +4,11 @@
#include "scene/3d/navigation/navigation_agent_3d.h"
#include "scene/3d/physics/character_body_3d.h"
#include "wave_survival/health_status.h"
#include "wave_survival/state.h"
#include "wave_survival/state_machine.h"
class NpcUnit;
class AnimationPlayer;
class PatrolPath;
class EnemyBody : public CharacterBody3D {
GDCLASS(EnemyBody, CharacterBody3D);
@ -14,15 +17,23 @@ class EnemyBody : public CharacterBody3D {
void ready();
void physics_process(double delta);
public:
protected:
void _notification(int what);
public:
void set_max_speed(float speed);
float get_max_speed() const;
void set_movement_direction(Vector2 direction);
void set_unit(NpcUnit *unit);
NpcUnit *get_unit() const;
HealthStatus *get_health() const;
NavigationAgent3D *get_nav() const;
AnimationPlayer *get_anim() const;
StateMachine *get_fsm() const;
void set_movement_speed(float value);
float get_movement_speed() const;
void set_unit_offset(Vector2 offset);
@ -30,6 +41,7 @@ public:
Vector3 get_unit_offset_3d() const;
private:
float max_speed{ 4.f };
float movement_speed{ 1.f };
Vector2 movement_direction{ 0, 0 };
@ -37,7 +49,40 @@ private:
NpcUnit *unit{ nullptr };
HealthStatus *health{ nullptr };
NavigationAgent3D *nav{ nullptr };
AnimationPlayer *anim{ nullptr };
Vector2 unit_offset{ 0, 0 };
};
class EnemyState : public State {
GDCLASS(EnemyState, State);
static void _bind_methods() {}
public:
void set_target(Node *node) override;
NpcUnit *get_unit() const;
NavigationAgent3D *get_nav() const;
AnimationPlayer *get_anim() const;
EnemyBody *get_body() const;
private:
EnemyBody *body{ nullptr };
};
class PatrolState : public EnemyState {
GDCLASS(PatrolState, EnemyState);
static void _bind_methods() {}
void set_patrol_target(Vector3 path_point);
void on_velocity_calculated(Vector3 direction);
public:
virtual void enter_state() override;
virtual void process(double delta) override;
virtual void exit_state() override;
private:
int path_point{ 0 };
PatrolPath *path{ nullptr };
Callable mp_on_velocity_calculated{ callable_mp(this, &self_type::on_velocity_calculated) };
};
#endif // !ENEMY_BODY_H