Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-29 23:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backported from godot4: Add navigation map synchronization warnings.

Browse Source 
- smix8
fef7b4efdc
This commit is contained in:
Relintai 2023-09-02 13:05:19 +02:00
parent 2d5a8a2b93
commit 6db8d89ab7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/navigation/nav_map.cpp
View File

@ -122,6 +122,8 @@ gd::PointKey NavMap::get_point_key(const Vector3 &p_pos) const {
} }
Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers, Vector<int32_t> *r_path_types, Array *r_path_rids, Vector<uint64_t> *r_path_owners) const { Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers, Vector<int32_t> *r_path_types, Array *r_path_rids, Vector<uint64_t> *r_path_owners) const {
ERR_FAIL_COND_V_MSG(map_update_id == 0, Vector<Vector3>(), "NavigationServer map query failed because it was made before first map synchronization.");
// Clear metadata outputs. // Clear metadata outputs.
if (r_path_types) { if (r_path_types) {
r_path_types->clear(); r_path_types->clear();
@ -502,6 +504,8 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
} }
Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const { Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
ERR_FAIL_COND_V_MSG(map_update_id == 0, Vector3(), "NavigationServer map query failed because it was made before first map synchronization.");
bool use_collision = p_use_collision; bool use_collision = p_use_collision;
Vector3 closest_point; Vector3 closest_point;
real_t closest_point_d = FLT_MAX; real_t closest_point_d = FLT_MAX;
@ -551,16 +555,22 @@ Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector
} }
Vector3 NavMap::get_closest_point(const Vector3 &p_point) const { Vector3 NavMap::get_closest_point(const Vector3 &p_point) const {
ERR_FAIL_COND_V_MSG(map_update_id == 0, Vector3(), "NavigationServer map query failed because it was made before first map synchronization.");
gd::ClosestPointQueryResult cp = get_closest_point_info(p_point); gd::ClosestPointQueryResult cp = get_closest_point_info(p_point);
return cp.point; return cp.point;
} }
Vector3 NavMap::get_closest_point_normal(const Vector3 &p_point) const { Vector3 NavMap::get_closest_point_normal(const Vector3 &p_point) const {
ERR_FAIL_COND_V_MSG(map_update_id == 0, Vector3(), "NavigationServer map query failed because it was made before first map synchronization.");
gd::ClosestPointQueryResult cp = get_closest_point_info(p_point); gd::ClosestPointQueryResult cp = get_closest_point_info(p_point);
return cp.normal; return cp.normal;
} }
RID NavMap::get_closest_point_owner(const Vector3 &p_point) const { RID NavMap::get_closest_point_owner(const Vector3 &p_point) const {
ERR_FAIL_COND_V_MSG(map_update_id == 0, RID(), "NavigationServer map query failed because it was made before first map synchronization.");
gd::ClosestPointQueryResult cp = get_closest_point_info(p_point); gd::ClosestPointQueryResult cp = get_closest_point_info(p_point);
return cp.owner; return cp.owner;
} }