|
|
@@ -370,7 +370,7 @@ NavigationPolygon::~NavigationPolygon() {
|
|
|
memdelete(navmesh_generation);
|
|
|
}
|
|
|
|
|
|
-void NavigationPolygonInstance::set_enabled(bool p_enabled) {
|
|
|
+void NavigationRegion2D::set_enabled(bool p_enabled) {
|
|
|
|
|
|
if (enabled == p_enabled)
|
|
|
return;
|
|
|
@@ -394,25 +394,25 @@ void NavigationPolygonInstance::set_enabled(bool p_enabled) {
|
|
|
update();
|
|
|
}
|
|
|
|
|
|
-bool NavigationPolygonInstance::is_enabled() const {
|
|
|
+bool NavigationRegion2D::is_enabled() const {
|
|
|
|
|
|
return enabled;
|
|
|
}
|
|
|
|
|
|
/////////////////////////////
|
|
|
#ifdef TOOLS_ENABLED
|
|
|
-Rect2 NavigationPolygonInstance::_edit_get_rect() const {
|
|
|
+Rect2 NavigationRegion2D::_edit_get_rect() const {
|
|
|
|
|
|
return navpoly.is_valid() ? navpoly->_edit_get_rect() : Rect2();
|
|
|
}
|
|
|
|
|
|
-bool NavigationPolygonInstance::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
|
|
|
+bool NavigationRegion2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
|
|
|
|
|
|
return navpoly.is_valid() ? navpoly->_edit_is_selected_on_click(p_point, p_tolerance) : false;
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-void NavigationPolygonInstance::_notification(int p_what) {
|
|
|
+void NavigationRegion2D::_notification(int p_what) {
|
|
|
|
|
|
switch (p_what) {
|
|
|
case NOTIFICATION_ENTER_TREE: {
|
|
|
@@ -496,7 +496,7 @@ void NavigationPolygonInstance::_notification(int p_what) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void NavigationPolygonInstance::set_navigation_polygon(const Ref<NavigationPolygon> &p_navpoly) {
|
|
|
+void NavigationRegion2D::set_navigation_polygon(const Ref<NavigationPolygon> &p_navpoly) {
|
|
|
|
|
|
if (p_navpoly == navpoly) {
|
|
|
return;
|
|
|
@@ -518,18 +518,18 @@ void NavigationPolygonInstance::set_navigation_polygon(const Ref<NavigationPolyg
|
|
|
update_configuration_warning();
|
|
|
}
|
|
|
|
|
|
-Ref<NavigationPolygon> NavigationPolygonInstance::get_navigation_polygon() const {
|
|
|
+Ref<NavigationPolygon> NavigationRegion2D::get_navigation_polygon() const {
|
|
|
|
|
|
return navpoly;
|
|
|
}
|
|
|
|
|
|
-void NavigationPolygonInstance::_navpoly_changed() {
|
|
|
+void NavigationRegion2D::_navpoly_changed() {
|
|
|
|
|
|
if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || get_tree()->is_debugging_navigation_hint()))
|
|
|
update();
|
|
|
}
|
|
|
|
|
|
-String NavigationPolygonInstance::get_configuration_warning() const {
|
|
|
+String NavigationRegion2D::get_configuration_warning() const {
|
|
|
|
|
|
if (!is_visible_in_tree() || !is_inside_tree())
|
|
|
return String();
|
|
|
@@ -547,24 +547,24 @@ String NavigationPolygonInstance::get_configuration_warning() const {
|
|
|
c = Object::cast_to<Node2D>(c->get_parent());
|
|
|
}
|
|
|
|
|
|
- return TTR("NavigationPolygonInstance must be a child or grandchild to a Navigation2D node. It only provides navigation data.");
|
|
|
+ return TTR("NavigationRegion2D must be a child or grandchild to a Navigation2D node. It only provides navigation data.");
|
|
|
}
|
|
|
|
|
|
-void NavigationPolygonInstance::_bind_methods() {
|
|
|
+void NavigationRegion2D::_bind_methods() {
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("set_navigation_polygon", "navpoly"), &NavigationPolygonInstance::set_navigation_polygon);
|
|
|
- ClassDB::bind_method(D_METHOD("get_navigation_polygon"), &NavigationPolygonInstance::get_navigation_polygon);
|
|
|
+ ClassDB::bind_method(D_METHOD("set_navigation_polygon", "navpoly"), &NavigationRegion2D::set_navigation_polygon);
|
|
|
+ ClassDB::bind_method(D_METHOD("get_navigation_polygon"), &NavigationRegion2D::get_navigation_polygon);
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("set_enabled", "enabled"), &NavigationPolygonInstance::set_enabled);
|
|
|
- ClassDB::bind_method(D_METHOD("is_enabled"), &NavigationPolygonInstance::is_enabled);
|
|
|
+ ClassDB::bind_method(D_METHOD("set_enabled", "enabled"), &NavigationRegion2D::set_enabled);
|
|
|
+ ClassDB::bind_method(D_METHOD("is_enabled"), &NavigationRegion2D::is_enabled);
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("_navpoly_changed"), &NavigationPolygonInstance::_navpoly_changed);
|
|
|
+ ClassDB::bind_method(D_METHOD("_navpoly_changed"), &NavigationRegion2D::_navpoly_changed);
|
|
|
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navpoly", PROPERTY_HINT_RESOURCE_TYPE, "NavigationPolygon"), "set_navigation_polygon", "get_navigation_polygon");
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
|
|
|
}
|
|
|
|
|
|
-NavigationPolygonInstance::NavigationPolygonInstance() {
|
|
|
+NavigationRegion2D::NavigationRegion2D() {
|
|
|
|
|
|
enabled = true;
|
|
|
set_notify_transform(true);
|
|
|
@@ -573,6 +573,6 @@ NavigationPolygonInstance::NavigationPolygonInstance() {
|
|
|
navigation = NULL;
|
|
|
}
|
|
|
|
|
|
-NavigationPolygonInstance::~NavigationPolygonInstance() {
|
|
|
+NavigationRegion2D::~NavigationRegion2D() {
|
|
|
Navigation2DServer::get_singleton()->free(region);
|
|
|
}
|
Andrea Catania
