Ported the improvements to the NavigationPolygon from the aforementioned pull request.

modules/navigation/pandemonium_navigation_2d_server.cpp

@@ -159,7 +159,7 @@ ObjectID id_to_id(const ObjectID &id) {
 
 Ref<NavigationMesh> poly_to_mesh(Ref<NavigationPolygon> d) {
 	if (d.is_valid()) {
-		return d->get_mesh();
+		return d->get_navigation_mesh();
 	} else {
 		return Ref<NavigationMesh>();
 	}

scene/resources/navigation_polygon.cpp

@@ -83,13 +83,93 @@ bool NavigationPolygon::_edit_is_selected_on_click(const Point2 &p_point, double
 }
 #endif
 
-void NavigationPolygon::set_vertices(const PoolVector<Vector2> &p_vertices) {
+void NavigationPolygon::set_parsed_geometry_type(ParsedGeometryType p_value) {
-	{
+	ERR_FAIL_INDEX(p_value, PARSED_GEOMETRY_MAX);
-		MutexLock lock(navmesh_generation);
+	parsed_geometry_type = p_value;
-		navmesh.unref();
+	property_list_changed_notify();
+}
+
+NavigationPolygon::ParsedGeometryType NavigationPolygon::get_parsed_geometry_type() const {
+	return parsed_geometry_type;
+}
+
+void NavigationPolygon::set_collision_mask(uint32_t p_mask) {
+	collision_mask = p_mask;
+}
+
+uint32_t NavigationPolygon::get_collision_mask() const {
+	return collision_mask;
+}
+
+void NavigationPolygon::set_collision_mask_value(int p_layer_number, bool p_value) {
+	ERR_FAIL_COND_MSG(p_layer_number < 1, "Collision layer number must be between 1 and 32 inclusive.");
+	ERR_FAIL_COND_MSG(p_layer_number > 32, "Collision layer number must be between 1 and 32 inclusive.");
+	uint32_t mask = get_collision_mask();
+	if (p_value) {
+		mask |= 1 << (p_layer_number - 1);
+	} else {
+		mask &= ~(1 << (p_layer_number - 1));
 	}
+	set_collision_mask(mask);
+}
+
+bool NavigationPolygon::get_collision_mask_value(int p_layer_number) const {
+	ERR_FAIL_COND_V_MSG(p_layer_number < 1, false, "Collision layer number must be between 1 and 32 inclusive.");
+	ERR_FAIL_COND_V_MSG(p_layer_number > 32, false, "Collision layer number must be between 1 and 32 inclusive.");
+	return get_collision_mask() & (1 << (p_layer_number - 1));
+}
+
+void NavigationPolygon::set_source_geometry_mode(SourceGeometryMode p_geometry_mode) {
+	ERR_FAIL_INDEX(p_geometry_mode, SOURCE_GEOMETRY_MAX);
+	source_geometry_mode = p_geometry_mode;
+	property_list_changed_notify();
+}
+
+NavigationPolygon::SourceGeometryMode NavigationPolygon::get_source_geometry_mode() const {
+	return source_geometry_mode;
+}
+
+void NavigationPolygon::set_polygon_bake_fillrule(PolygonFillRule p_polygon_fillrule) {
+	ERR_FAIL_INDEX(p_polygon_fillrule, POLYGON_FILLRULE_MAX);
+	polygon_bake_fillrule = p_polygon_fillrule;
+	property_list_changed_notify();
+}
+
+NavigationPolygon::PolygonFillRule NavigationPolygon::get_polygon_bake_fillrule() const {
+	return polygon_bake_fillrule;
+}
+
+void NavigationPolygon::set_offsetting_jointype(OffsettingJoinType p_offsetting_jointype) {
+	ERR_FAIL_INDEX(p_offsetting_jointype, OFFSETTING_JOINTYPE_MAX);
+	offsetting_jointype = p_offsetting_jointype;
+	property_list_changed_notify();
+}
+
+NavigationPolygon::OffsettingJoinType NavigationPolygon::get_offsetting_jointype() const {
+	return offsetting_jointype;
+}
+
+void NavigationPolygon::set_source_group_name(StringName p_group_name) {
+	source_group_name = p_group_name;
+}
+
+StringName NavigationPolygon::get_source_group_name() const {
+	return source_group_name;
+}
+
+void NavigationPolygon::set_agent_radius(real_t p_value) {
+	ERR_FAIL_COND(p_value < 0);
+	agent_radius = p_value;
+}
+
+real_t NavigationPolygon::get_agent_radius() const {
+	return agent_radius;
+}
+
+void NavigationPolygon::set_vertices(const PoolVector<Vector2> &p_vertices) {
 	vertices = p_vertices;
 	rect_cache_dirty = true;
+	navigation_polygon_dirty = true;
 }
 
 PoolVector<Vector2> NavigationPolygon::get_vertices() const {
@@ -98,19 +178,7 @@ PoolVector<Vector2> NavigationPolygon::get_vertices() const {
 
 void NavigationPolygon::add_polygon(const Vector<int> &p_polygon) {
 	polygons.push_back(p_polygon);
-	{
+	navigation_mesh.unref();
-		MutexLock lock(navmesh_generation);
-		navmesh.unref();
-	}
-}
-
-void NavigationPolygon::add_outline_at_index(const PoolVector<Vector2> &p_outline, int p_index) {
-	outlines.insert(p_index, p_outline);
-	rect_cache_dirty = true;
-}
-
-int NavigationPolygon::get_polygon_count() const {
-	return polygons.size();
 }
 
 Vector<int> NavigationPolygon::get_polygon(int p_idx) {
@@ -118,38 +186,70 @@ Vector<int> NavigationPolygon::get_polygon(int p_idx) {
 	return polygons[p_idx];
 }
 
+int NavigationPolygon::get_polygon_count() const {
+	return polygons.size();
+}
+
 void NavigationPolygon::clear_polygons() {
 	polygons.clear();
-	{
+	navigation_mesh.unref();
-		MutexLock lock(navmesh_generation);
+}
-		navmesh.unref();
+void NavigationPolygon::clear_outlines() {
+	outlines.clear();
+	rect_cache_dirty = true;
+}
+void NavigationPolygon::clear_baked_outlines() {
+	baked_outlines.clear();
+	rect_cache_dirty = true;
+}
+
+void NavigationPolygon::clear() {
+	clear_outlines();
+	clear_polygons();
+	clear_baked_outlines();
+	vertices.clear();
+	navigation_polygon_dirty = true;
+}
+void NavigationPolygon::commit_changes() {
+	if (navigation_polygon_dirty) {
+		navigation_polygon_dirty = false;
+
+		PoolVector<Vector3> new_navigation_mesh_vertices;
+		Vector<Vector<int>> new_navigation_mesh_polygons;
+
+		new_navigation_mesh_vertices.resize(vertices.size());
+
+		PoolVector3Array::Write new_navigation_mesh_vertices_write = new_navigation_mesh_vertices.write();
+		Vector3 *new_navigation_mesh_vertices_ptrw = new_navigation_mesh_vertices_write.ptr();
+
+		PoolVector2Array::Read vertices_read = vertices.read();
+		const Vector2 *vertices_ptr = vertices_read.ptr();
+
+		for (int i = 0; i < vertices.size(); i++) {
+			new_navigation_mesh_vertices_ptrw[i] = Vector3(vertices_ptr[i].x, 0.0, vertices_ptr[i].y);
+		}
+
+		for (int i = 0; i < get_polygon_count(); i++) {
+			Vector<int> new_navigation_mesh_polygon = get_polygon(i);
+			new_navigation_mesh_polygons.push_back(new_navigation_mesh_polygon);
+			//OLD, remove:
+			navigation_mesh->add_polygon(get_polygon(i));
+		}
+
+		navigation_mesh->set_vertices(new_navigation_mesh_vertices);
+		// New, enable:
+		//navigation_mesh->set_polygons(new_navigation_mesh_polygons);
+		//navigation_mesh->commit_changes();
+
+		emit_changed();
 	}
 }
 
-Ref<NavigationMesh> NavigationPolygon::get_mesh() {
+Ref<NavigationMesh> NavigationPolygon::get_navigation_mesh() {
-	MutexLock lock(navmesh_generation);
+	if (navigation_polygon_dirty) {
-
+		commit_changes();
-	if (navmesh.is_null()) {
-		navmesh.instance();
-		PoolVector<Vector3> verts;
-		{
-			verts.resize(get_vertices().size());
-			PoolVector<Vector3>::Write w = verts.write();
-
-			PoolVector<Vector2>::Read r = get_vertices().read();
-
-			for (int i(0); i < get_vertices().size(); i++) {
-				w[i] = Vector3(r[i].x, 0.0, r[i].y);
-			}
-		}
-		navmesh->set_vertices(verts);
-
-		for (int i(0); i < get_polygon_count(); i++) {
-			navmesh->add_polygon(get_polygon(i));
-		}
 	}
-
+	return navigation_mesh;
-	return navmesh;
 }
 
 void NavigationPolygon::add_outline(const PoolVector<Vector2> &p_outline) {
@@ -157,6 +257,11 @@ void NavigationPolygon::add_outline(const PoolVector<Vector2> &p_outline) {
 	rect_cache_dirty = true;
 }
 
+void NavigationPolygon::add_outline_at_index(const PoolVector<Vector2> &p_outline, int p_index) {
+	outlines.insert(p_index, p_outline);
+	rect_cache_dirty = true;
+}
+
 int NavigationPolygon::get_outline_count() const {
 	return outlines.size();
 }
@@ -178,15 +283,9 @@ PoolVector<Vector2> NavigationPolygon::get_outline(int p_idx) const {
 	return outlines[p_idx];
 }
 
-void NavigationPolygon::clear_outlines() {
-	outlines.clear();
-	rect_cache_dirty = true;
-}
 void NavigationPolygon::make_polygons_from_outlines() {
-	{
+	navigation_mesh.unref();
-		MutexLock lock(navmesh_generation);
+
-		navmesh.unref();
-	}
 	List<TriangulatorPoly> in_poly, out_poly;
 
 	Vector2 outside_point(-1e10, -1e10);
@@ -285,7 +384,27 @@ void NavigationPolygon::make_polygons_from_outlines() {
 	emit_signal(CoreStringNames::get_singleton()->changed);
 }
 
+RID NavigationPolygon::get_rid() const {
+	if (navigation_mesh.is_valid()) {
+		navigation_mesh->get_rid();
+	}
+	return RID();
+}
+
 NavigationPolygon::NavigationPolygon() {
+	agent_radius = 10.0f;
+
+	parsed_geometry_type = PARSED_GEOMETRY_MESH_INSTANCES;
+	collision_mask = 0xFFFFFFFF;
+
+	source_geometry_mode = SOURCE_GEOMETRY_ROOT_NODE_CHILDREN;
+	source_group_name = "navigation_polygon_source_group";
+
+	polygon_bake_fillrule = POLYGON_FILLRULE_EVENODD;
+	offsetting_jointype = OFFSETTING_JOINTYPE_MITER;
+
+	navigation_polygon_dirty = true;
+
 	rect_cache_dirty = true;
 }
 
@@ -293,10 +412,8 @@ NavigationPolygon::~NavigationPolygon() {
 }
 
 void NavigationPolygon::_set_polygons(const Array &p_array) {
-	{
+	navigation_mesh.unref();
-		MutexLock lock(navmesh_generation);
+
-		navmesh.unref();
-	}
 	polygons.resize(p_array.size());
 	for (int i = 0; i < p_array.size(); i++) {
 		polygons.write[i] = p_array[i];
@@ -331,7 +448,65 @@ Array NavigationPolygon::_get_outlines() const {
 	return ret;
 }
 
+void NavigationPolygon::_set_baked_outlines(const Array &p_array) {
+	baked_outlines.resize(p_array.size());
+	for (int i = 0; i < p_array.size(); i++) {
+		baked_outlines.write[i] = p_array[i];
+	}
+	rect_cache_dirty = true;
+}
+
+Array NavigationPolygon::_get_baked_outlines() const {
+	Array ret;
+	ret.resize(baked_outlines.size());
+	for (int i = 0; i < ret.size(); i++) {
+		ret[i] = baked_outlines[i];
+	}
+
+	return ret;
+}
+
+void NavigationPolygon::_validate_property(PropertyInfo &p_property) const {
+	if (p_property.name == "geometry_collision_mask") {
+		if (parsed_geometry_type == PARSED_GEOMETRY_MESH_INSTANCES) {
+			p_property.usage = 0;
+			return;
+		}
+	}
+
+	if (p_property.name == "geometry_source_group_name") {
+		if (source_geometry_mode == SOURCE_GEOMETRY_ROOT_NODE_CHILDREN) {
+			p_property.usage = 0;
+			return;
+		}
+	}
+}
+
 void NavigationPolygon::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_parsed_geometry_type", "geometry_type"), &NavigationPolygon::set_parsed_geometry_type);
+	ClassDB::bind_method(D_METHOD("get_parsed_geometry_type"), &NavigationPolygon::get_parsed_geometry_type);
+
+	ClassDB::bind_method(D_METHOD("set_collision_mask", "mask"), &NavigationPolygon::set_collision_mask);
+	ClassDB::bind_method(D_METHOD("get_collision_mask"), &NavigationPolygon::get_collision_mask);
+
+	ClassDB::bind_method(D_METHOD("set_collision_mask_value", "layer_number", "value"), &NavigationPolygon::set_collision_mask_value);
+	ClassDB::bind_method(D_METHOD("get_collision_mask_value", "layer_number"), &NavigationPolygon::get_collision_mask_value);
+
+	ClassDB::bind_method(D_METHOD("set_source_geometry_mode", "mask"), &NavigationPolygon::set_source_geometry_mode);
+	ClassDB::bind_method(D_METHOD("get_source_geometry_mode"), &NavigationPolygon::get_source_geometry_mode);
+
+	ClassDB::bind_method(D_METHOD("set_source_group_name", "mask"), &NavigationPolygon::set_source_group_name);
+	ClassDB::bind_method(D_METHOD("get_source_group_name"), &NavigationPolygon::get_source_group_name);
+
+	ClassDB::bind_method(D_METHOD("set_polygon_bake_fillrule", "polygon_fillrule"), &NavigationPolygon::set_polygon_bake_fillrule);
+	ClassDB::bind_method(D_METHOD("get_polygon_bake_fillrule"), &NavigationPolygon::get_polygon_bake_fillrule);
+
+	ClassDB::bind_method(D_METHOD("set_offsetting_jointype", "offsetting_jointype"), &NavigationPolygon::set_offsetting_jointype);
+	ClassDB::bind_method(D_METHOD("get_offsetting_jointype"), &NavigationPolygon::get_offsetting_jointype);
+
+	ClassDB::bind_method(D_METHOD("set_agent_radius", "agent_radius"), &NavigationPolygon::set_agent_radius);
+	ClassDB::bind_method(D_METHOD("get_agent_radius"), &NavigationPolygon::get_agent_radius);
+
 	ClassDB::bind_method(D_METHOD("set_vertices", "vertices"), &NavigationPolygon::set_vertices);
 	ClassDB::bind_method(D_METHOD("get_vertices"), &NavigationPolygon::get_vertices);
 
@@ -339,7 +514,6 @@ void NavigationPolygon::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_polygon_count"), &NavigationPolygon::get_polygon_count);
 	ClassDB::bind_method(D_METHOD("get_polygon", "idx"), &NavigationPolygon::get_polygon);
 	ClassDB::bind_method(D_METHOD("clear_polygons"), &NavigationPolygon::clear_polygons);
-	ClassDB::bind_method(D_METHOD("get_mesh"), &NavigationPolygon::get_mesh);
 
 	ClassDB::bind_method(D_METHOD("add_outline", "outline"), &NavigationPolygon::add_outline);
 	ClassDB::bind_method(D_METHOD("add_outline_at_index", "outline", "index"), &NavigationPolygon::add_outline_at_index);
@@ -350,13 +524,56 @@ void NavigationPolygon::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear_outlines"), &NavigationPolygon::clear_outlines);
 	ClassDB::bind_method(D_METHOD("make_polygons_from_outlines"), &NavigationPolygon::make_polygons_from_outlines);
 
-	ClassDB::bind_method(D_METHOD("_set_polygons", "polygons"), &NavigationPolygon::_set_polygons);
+	ClassDB::bind_method(D_METHOD("commit_changes"), &NavigationPolygon::commit_changes);
-	ClassDB::bind_method(D_METHOD("_get_polygons"), &NavigationPolygon::_get_polygons);
 
-	ClassDB::bind_method(D_METHOD("_set_outlines", "outlines"), &NavigationPolygon::_set_outlines);
+	ClassDB::bind_method(D_METHOD("get_navigation_mesh"), &NavigationPolygon::get_navigation_mesh);
-	ClassDB::bind_method(D_METHOD("_get_outlines"), &NavigationPolygon::_get_outlines);
+
+	ClassDB::bind_method(D_METHOD("set_polygons", "polygons"), &NavigationPolygon::_set_polygons);
+	ClassDB::bind_method(D_METHOD("get_polygons"), &NavigationPolygon::_get_polygons);
+
+	ClassDB::bind_method(D_METHOD("set_outlines", "outlines"), &NavigationPolygon::_set_outlines);
+	ClassDB::bind_method(D_METHOD("get_outlines"), &NavigationPolygon::_get_outlines);
+
+	ClassDB::bind_method(D_METHOD("set_baked_outlines", "outlines"), &NavigationPolygon::_set_baked_outlines);
+	ClassDB::bind_method(D_METHOD("get_baked_outlines"), &NavigationPolygon::_get_baked_outlines);
 
 	ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "vertices", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_vertices", "get_vertices");
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "polygons", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_polygons", "_get_polygons");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "polygons", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_polygons", "get_polygons");
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "outlines", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_outlines", "_get_outlines");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "outlines", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_outlines", "get_outlines");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "baked_outlines", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_baked_outlines", "get_baked_outlines");
+
+	ADD_GROUP("Polygons", "polygon_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "polygon_bake_fillrule", PROPERTY_HINT_ENUM, "EvenOdd,NonZero,Positive,Negative"), "set_polygon_bake_fillrule", "get_polygon_bake_fillrule");
+	ADD_GROUP("Geometry", "geometry_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "geometry_parsed_geometry_type", PROPERTY_HINT_ENUM, "Mesh Instances,Static Colliders,Both"), "set_parsed_geometry_type", "get_parsed_geometry_type");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "geometry_collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
+	ADD_PROPERTY_DEFAULT("geometry_collision_mask", 0xFFFFFFFF);
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "geometry_source_geometry_mode", PROPERTY_HINT_ENUM, "Root Node Children,Group With Children,Group Explicit"), "set_source_geometry_mode", "get_source_geometry_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "geometry_source_group_name"), "set_source_group_name", "get_source_group_name");
+	ADD_PROPERTY_DEFAULT("geometry_source_group_name", StringName("navigation_polygon_source_group"));
+	ADD_GROUP("Agents", "agent_");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "agent_radius", PROPERTY_HINT_RANGE, "0.0,500.0,0.01,or_greater,suffix:px"), "set_agent_radius", "get_agent_radius");
+	ADD_GROUP("Offsetting", "offsetting_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "offsetting_jointype", PROPERTY_HINT_ENUM, "Square,Round,Miter"), "set_offsetting_jointype", "get_offsetting_jointype");
+
+	BIND_ENUM_CONSTANT(PARSED_GEOMETRY_MESH_INSTANCES);
+	BIND_ENUM_CONSTANT(PARSED_GEOMETRY_STATIC_COLLIDERS);
+	BIND_ENUM_CONSTANT(PARSED_GEOMETRY_BOTH);
+	BIND_ENUM_CONSTANT(PARSED_GEOMETRY_MAX);
+
+	BIND_ENUM_CONSTANT(SOURCE_GEOMETRY_ROOT_NODE_CHILDREN);
+	BIND_ENUM_CONSTANT(SOURCE_GEOMETRY_GROUPS_WITH_CHILDREN);
+	BIND_ENUM_CONSTANT(SOURCE_GEOMETRY_GROUPS_EXPLICIT);
+	BIND_ENUM_CONSTANT(SOURCE_GEOMETRY_MAX);
+
+	BIND_ENUM_CONSTANT(POLYGON_FILLRULE_EVENODD);
+	BIND_ENUM_CONSTANT(POLYGON_FILLRULE_NONZERO);
+	BIND_ENUM_CONSTANT(POLYGON_FILLRULE_POSITIVE);
+	BIND_ENUM_CONSTANT(POLYGON_FILLRULE_NEGATIVE);
+	BIND_ENUM_CONSTANT(POLYGON_FILLRULE_MAX);
+
+	BIND_ENUM_CONSTANT(OFFSETTING_JOINTYPE_SQUARE);
+	BIND_ENUM_CONSTANT(OFFSETTING_JOINTYPE_ROUND);
+	BIND_ENUM_CONSTANT(OFFSETTING_JOINTYPE_MITER);
+	BIND_ENUM_CONSTANT(OFFSETTING_JOINTYPE_MAX);
 }

scene/resources/navigation_polygon.h

@@ -38,18 +38,79 @@ class NavigationMesh;
 class NavigationPolygon : public Resource {
 	GDCLASS(NavigationPolygon, Resource);
 
+public:
+	enum ParsedGeometryType {
+		PARSED_GEOMETRY_MESH_INSTANCES = 0,
+		PARSED_GEOMETRY_STATIC_COLLIDERS,
+		PARSED_GEOMETRY_BOTH,
+		PARSED_GEOMETRY_MAX
+	};
+
+	enum SourceGeometryMode {
+		SOURCE_GEOMETRY_ROOT_NODE_CHILDREN = 0,
+		SOURCE_GEOMETRY_GROUPS_WITH_CHILDREN,
+		SOURCE_GEOMETRY_GROUPS_EXPLICIT,
+		SOURCE_GEOMETRY_MAX
+	};
+
+	enum PolygonFillRule {
+		POLYGON_FILLRULE_EVENODD = 0,
+		POLYGON_FILLRULE_NONZERO,
+		POLYGON_FILLRULE_POSITIVE,
+		POLYGON_FILLRULE_NEGATIVE,
+		POLYGON_FILLRULE_MAX
+	};
+
+	enum OffsettingJoinType {
+		OFFSETTING_JOINTYPE_SQUARE = 0,
+		OFFSETTING_JOINTYPE_ROUND,
+		OFFSETTING_JOINTYPE_MITER,
+		OFFSETTING_JOINTYPE_MAX
+	};
+
 public:
 #ifdef TOOLS_ENABLED
 	Rect2 _edit_get_rect() const;
 	bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
 #endif
 
+	void set_parsed_geometry_type(ParsedGeometryType p_value);
+	ParsedGeometryType get_parsed_geometry_type() const;
+
+	void set_collision_mask(uint32_t p_mask);
+	uint32_t get_collision_mask() const;
+
+	void set_collision_mask_value(int p_layer_number, bool p_value);
+	bool get_collision_mask_value(int p_layer_number) const;
+
+	void set_source_geometry_mode(SourceGeometryMode p_geometry_mode);
+	SourceGeometryMode get_source_geometry_mode() const;
+
+	void set_source_group_name(StringName p_group_name);
+	StringName get_source_group_name() const;
+
+	void set_polygon_bake_fillrule(PolygonFillRule p_polygon_fillrule);
+	PolygonFillRule get_polygon_bake_fillrule() const;
+
+	void set_offsetting_jointype(OffsettingJoinType p_offsetting_jointype);
+	OffsettingJoinType get_offsetting_jointype() const;
+
+	void set_agent_radius(real_t p_value);
+	real_t get_agent_radius() const;
+
 	void set_vertices(const PoolVector<Vector2> &p_vertices);
 	PoolVector<Vector2> get_vertices() const;
 
 	void add_polygon(const Vector<int> &p_polygon);
+	Vector<int> get_polygon(int p_idx);
 	int get_polygon_count() const;
 
+	void clear_polygons();
+	void clear_outlines();
+	void clear_baked_outlines();
+	void clear();
+	void commit_changes();
+
 	void add_outline(const PoolVector<Vector2> &p_outline);
 	void add_outline_at_index(const PoolVector<Vector2> &p_outline, int p_index);
 	void set_outline(int p_idx, const PoolVector<Vector2> &p_outline);
@@ -57,37 +118,67 @@ public:
 	void remove_outline(int p_idx);
 	int get_outline_count() const;
 
-	void clear_outlines();
 	void make_polygons_from_outlines();
 
-	Vector<int> get_polygon(int p_idx);
+	RID get_rid() const;
-	void clear_polygons();
 
-	Ref<NavigationMesh> get_mesh();
+	Ref<NavigationMesh> get_navigation_mesh();
 
-	NavigationPolygon();
+	void set_polygons(const Vector<Vector<int>> &p_array);
-	~NavigationPolygon();
+	Vector<Vector<int>> get_polygons() const;
+
+	void set_outlines(const Vector<PoolVector<Vector2>> &p_array);
+	Vector<PoolVector<Vector2>> get_outlines() const;
+
+	void set_baked_outlines(const Vector<PoolVector<Vector2>> &p_array);
+	Vector<PoolVector<Vector2>> get_baked_outlines() const;
 
-protected:
 	void _set_polygons(const Array &p_array);
 	Array _get_polygons() const;
 
 	void _set_outlines(const Array &p_array);
 	Array _get_outlines() const;
 
+	void _set_baked_outlines(const Array &p_array);
+	Array _get_baked_outlines() const;
+
+	NavigationPolygon();
+	~NavigationPolygon();
+
+protected:
+	void _validate_property(PropertyInfo &p_property) const;
 	static void _bind_methods();
 
 private:
+	RID navmesh_rid;
+
+	real_t agent_radius;
+
+	ParsedGeometryType parsed_geometry_type;
+	uint32_t collision_mask;
+
+	SourceGeometryMode source_geometry_mode;
+	StringName source_group_name;
+
+	PolygonFillRule polygon_bake_fillrule;
+	OffsettingJoinType offsetting_jointype;
+
+	bool navigation_polygon_dirty;
+
 	PoolVector<Vector2> vertices;
 	Vector<Vector<int>> polygons;
 	Vector<PoolVector<Vector2>> outlines;
+	Vector<PoolVector<Vector2>> baked_outlines;
 
 	mutable Rect2 item_rect;
 	mutable bool rect_cache_dirty;
 
-	Mutex navmesh_generation;
+	Ref<NavigationMesh> navigation_mesh;
-	// Navigation mesh
-	Ref<NavigationMesh> navmesh;
 };
 
+VARIANT_ENUM_CAST(NavigationPolygon::ParsedGeometryType);
+VARIANT_ENUM_CAST(NavigationPolygon::SourceGeometryMode);
+VARIANT_ENUM_CAST(NavigationPolygon::PolygonFillRule);
+VARIANT_ENUM_CAST(NavigationPolygon::OffsettingJoinType);
+
 #endif // NAVIGATIONPOLYGON_H