|
@@ -165,13 +165,17 @@ void _bake_navigation_mesh(void *p_user_data) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void NavigationRegion3D::bake_navigation_mesh() {
|
|
|
+void NavigationRegion3D::bake_navigation_mesh(bool p_on_thread) {
|
|
|
ERR_FAIL_COND_MSG(bake_thread.is_started(), "Unable to start another bake request. The navigation mesh bake thread is already baking a navigation mesh.");
|
|
|
|
|
|
BakeThreadsArgs *args = memnew(BakeThreadsArgs);
|
|
|
args->nav_region = this;
|
|
|
|
|
|
- bake_thread.start(_bake_navigation_mesh, args);
|
|
|
+ if (p_on_thread) {
|
|
|
+ bake_thread.start(_bake_navigation_mesh, args);
|
|
|
+ } else {
|
|
|
+ _bake_navigation_mesh(args);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void NavigationRegion3D::_bake_finished(Ref<NavigationMesh> p_nav_mesh) {
|
|
@@ -204,7 +208,7 @@ void NavigationRegion3D::_bind_methods() {
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("get_region_rid"), &NavigationRegion3D::get_region_rid);
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("bake_navigation_mesh"), &NavigationRegion3D::bake_navigation_mesh);
|
|
|
+ ClassDB::bind_method(D_METHOD("bake_navigation_mesh", "on_thread"), &NavigationRegion3D::bake_navigation_mesh, DEFVAL(true));
|
|
|
ClassDB::bind_method(D_METHOD("_bake_finished", "nav_mesh"), &NavigationRegion3D::_bake_finished);
|
|
|
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navmesh", PROPERTY_HINT_RESOURCE_TYPE, "NavigationMesh"), "set_navigation_mesh", "get_navigation_mesh");
|