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

Fix non tools build.

Browse Source
This commit is contained in:
Relintai 2023-06-06 13:51:33 +02:00
parent 27ee583bb8
commit 316a53bfbf
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/2d/navigation_polygon_instance.cpp
View File

@ -58,7 +58,9 @@ void NavigationPolygonInstance::set_enabled(bool p_enabled) {
if (!enabled) { if (!enabled) {
Navigation2DServer::get_singleton()->region_set_map(region, RID()); Navigation2DServer::get_singleton()->region_set_map(region, RID());
#ifdef DEBUG_ENABLED
Navigation2DServer::get_singleton_mut()->disconnect("map_changed", this, "_navigation_map_changed"); Navigation2DServer::get_singleton_mut()->disconnect("map_changed", this, "_navigation_map_changed");
#endif
} else { } else {
if (navigation != nullptr) { if (navigation != nullptr) {
Navigation2DServer::get_singleton()->region_set_map(region, navigation->get_rid()); Navigation2DServer::get_singleton()->region_set_map(region, navigation->get_rid());
@ -69,7 +71,9 @@ void NavigationPolygonInstance::set_enabled(bool p_enabled) {
Navigation2DServer::get_singleton()->region_set_map(region, get_world_2d()->get_navigation_map()); Navigation2DServer::get_singleton()->region_set_map(region, get_world_2d()->get_navigation_map());
} }
} }
#ifdef DEBUG_ENABLED
Navigation2DServer::get_singleton_mut()->connect("map_changed", this, "_navigation_map_changed"); Navigation2DServer::get_singleton_mut()->connect("map_changed", this, "_navigation_map_changed");
#endif
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -162,9 +166,12 @@ void NavigationPolygonInstance::_notification(int p_what) {
Navigation2DServer::get_singleton()->region_set_map(region, get_world_2d()->get_navigation_map()); Navigation2DServer::get_singleton()->region_set_map(region, get_world_2d()->get_navigation_map());
} }
} }
#ifdef DEBUG_ENABLED
if (enabled) { if (enabled) {
Navigation2DServer::get_singleton_mut()->connect("map_changed", this, "_navigation_map_changed"); Navigation2DServer::get_singleton_mut()->connect("map_changed", this, "_navigation_map_changed");
} }
#endif
} break; } break;
case NOTIFICATION_TRANSFORM_CHANGED: { case NOTIFICATION_TRANSFORM_CHANGED: {
Navigation2DServer::get_singleton()->region_set_transform(region, get_global_transform()); Navigation2DServer::get_singleton()->region_set_transform(region, get_global_transform());
@ -175,9 +182,11 @@ void NavigationPolygonInstance::_notification(int p_what) {
} }
navigation = nullptr; navigation = nullptr;
#ifdef DEBUG_ENABLED
if (enabled) { if (enabled) {
Navigation2DServer::get_singleton_mut()->disconnect("map_changed", this, "_navigation_map_changed"); Navigation2DServer::get_singleton_mut()->disconnect("map_changed", this, "_navigation_map_changed");
} }
#endif
} break; } break;
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -275,15 +284,15 @@ void NavigationPolygonInstance::_navpoly_changed() {
update_configuration_warning(); update_configuration_warning();
} }
void NavigationPolygonInstance::_navigation_map_changed(RID p_map) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
void NavigationPolygonInstance::_navigation_map_changed(RID p_map) {
if (navigation != nullptr && enabled && (navigation->get_rid() == p_map)) { if (navigation != nullptr && enabled && (navigation->get_rid() == p_map)) {
update(); update();
} else if (is_inside_tree() && enabled && (get_world_2d()->get_navigation_map() == p_map)) { } else if (is_inside_tree() && enabled && (get_world_2d()->get_navigation_map() == p_map)) {
update(); update();
} }
#endif // DEBUG_ENABLED
} }
#endif // DEBUG_ENABLED
String NavigationPolygonInstance::get_configuration_warning() const { String NavigationPolygonInstance::get_configuration_warning() const {
if (!is_visible_in_tree() || !is_inside_tree()) { if (!is_visible_in_tree() || !is_inside_tree()) {
@ -331,7 +340,9 @@ void NavigationPolygonInstance::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "enter_cost"), "set_enter_cost", "get_enter_cost"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "enter_cost"), "set_enter_cost", "get_enter_cost");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "travel_cost"), "set_travel_cost", "get_travel_cost"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "travel_cost"), "set_travel_cost", "get_travel_cost");
#ifdef DEBUG_ENABLED
ClassDB::bind_method(D_METHOD("_navigation_map_changed"), &NavigationPolygonInstance::_navigation_map_changed); ClassDB::bind_method(D_METHOD("_navigation_map_changed"), &NavigationPolygonInstance::_navigation_map_changed);
#endif
ClassDB::bind_method(D_METHOD("_navpoly_changed"), &NavigationPolygonInstance::_navpoly_changed); ClassDB::bind_method(D_METHOD("_navpoly_changed"), &NavigationPolygonInstance::_navpoly_changed);
ADD_SIGNAL(MethodInfo("navigation_polygon_changed")); ADD_SIGNAL(MethodInfo("navigation_polygon_changed"));