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

fix: patrol navigation now first targets the closest point on the path

Browse source
This commit is contained in:
Sara 2025-07-21 15:50:26 +02:00
parent 9517588415
commit c05d3aa28f
4 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/wave_survival/enemies/enemy_wretched.cpp
View file

@ -52,8 +52,8 @@ void WretchedPatrolState::enter_state() {
float const max_speed{ get_unit()->get_patrol_speed() };
get_target()->set_movement_speed(max_speed);
get_nav()->set_max_speed(max_speed);
this->path_point = this->path->get_closest_point(get_target()->get_global_position());
get_nav()->set_target_position(this->path->point_at(this->path_point));
Vector3 const nav_target{ this->path->get_closest_point(get_target()->get_global_position(), &this->path_point) };
get_nav()->set_target_position(nav_target);
}
void WretchedPatrolState::process(double delta) {

18
modules/wave_survival/patrol_path.cpp
View file

@ -45,20 +45,26 @@ Vector3 PatrolPath::point_at_unchecked(int const index) const {
return this->path.get(index)->get_global_position();
}
int PatrolPath::get_closest_point(Vector3 global_position) {
Vector3 PatrolPath::get_closest_point(Vector3 global_position, int *idx) {
int best_choice_idx{ -1 };
float best_choice_distance{ Math::INF };
Vector3 point{ 0, 0, 0 };
for (int i{ 0 }; i < point_count(); ++i) {
int const next_idx{ (i + 1) % point_count() };
Vector3 const current{ point_at(i) };
Vector3 const next{ point_at_unchecked(next_idx) };
Vector3 const path_direction{ (next - current).normalized() };
Vector3 const direction{ (global_position - current).normalized() };
float const distance{ global_position.distance_squared_to(next) };
if (path_direction.dot(direction) > 1.0 && distance < best_choice_distance) {
best_choice_idx = next_idx;
Vector3 const difference{ global_position - current };
Vector3 const closest{ current + path_direction.dot(difference) * path_direction };
float const distance{ global_position.distance_squared_to(closest) };
if (distance < best_choice_distance) {
best_choice_idx = i;
best_choice_distance = distance;
point = closest;
}
}
return best_choice_idx;
if (idx) {
*idx = best_choice_idx;
}
return point;
}

2
modules/wave_survival/patrol_path.h
View file

@ -17,7 +17,7 @@ public:
int point_count() const;
Vector3 point_at(int &index) const;
Vector3 point_at_unchecked(int const index) const;
int get_closest_point(Vector3 global_position);
Vector3 get_closest_point(Vector3 global_position, int *idx);
private:
Vector<Node3D *> path{};

10
project/maps/testmap.tscn
View file

@ -394,23 +394,23 @@ transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -
shadow_enabled = true
[node name="PlayerBody" parent="." instance=ExtResource("1_6t4yh")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0500376, 2.38419e-07, -0.0317376)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.039836764, -0.0014820099, 0.5135803)
slide_on_ceiling = false
[node name="NpcUnit" type="NpcUnit" parent="." node_paths=PackedStringArray("patrol_path")]
patrol_path = NodePath("../PatrolPath")
[node name="EnemyWretched" parent="NpcUnit" instance=ExtResource("3_7ng1a")]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.017590523, 0.023196908, 3.073964)
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.68063784, 0.023195954, 3.1014705)
[node name="EnemyWretched2" parent="NpcUnit" instance=ExtResource("3_7ng1a")]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.0904664, 0.023196908, 1.6584808)
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.2873832, 0.023196908, 3.055359)
[node name="EnemyWretched3" parent="NpcUnit" instance=ExtResource("3_7ng1a")]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.1613213, 0.023196908, 1.513694)
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.2727146, 0.023196908, 4.665185)
[node name="EnemyWretched4" parent="NpcUnit" instance=ExtResource("3_7ng1a")]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.977286, 0.023196908, 4.202239)
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5723263, 0.023197861, 4.477292)
[node name="PatrolPath" type="PatrolPath" parent="."]