Refactor initial baking

source/match/AirNavigation.gd

@@ -19,8 +19,15 @@ func _ready():
 	_reference_mesh.global_transform.origin.y = Constants.Match.Air.Y
 
 
-func rebake(map):
-	find_child("ReferenceMesh").mesh = map.find_child("Terrain").mesh
+func bake(map):
+	assert(
+		_navigation_region.navigation_mesh.get_polygon_count() == 0,
+		"bake() should be called exactly once - during runtime"
+	)
+	var plane_mesh = PlaneMesh.new()
+	plane_mesh.size = map.size
+	plane_mesh.center_offset = Vector3(map.size.x, 0, map.size.y) / 2.0
+	_reference_mesh.mesh = plane_mesh
 	_navigation_region.bake_navigation_mesh(false)
 
 

source/match/Match.gd

@@ -82,7 +82,7 @@ func _setup_subsystems_dependent_on_map():
 	_terrain.update_shape(map.find_child("Terrain").mesh)
 	fog_of_war.resize(map.size)
 	_recalculate_camera_bounding_planes(map.size)
-	navigation.rebake(map)
+	navigation.setup(map)
 
 
 func _recalculate_camera_bounding_planes(map_size: Vector2):

source/match/Match.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=45 format=3 uid="uid://camns8fqod8d4"]
+[gd_scene load_steps=44 format=3 uid="uid://camns8fqod8d4"]
 
 [ext_resource type="Script" path="res://source/match/Match.gd" id="1_1555u"]
 [ext_resource type="Script" path="res://source/match/IsometricCamera3D.gd" id="1_qb2ry"]
@@ -83,10 +83,6 @@ shader_parameter/world_visibility_texture = SubResource("ViewportTexture_7yqgo")
 flip_faces = true
 size = Vector2(2, 2)
 
-[sub_resource type="PlaneMesh" id="PlaneMesh_g1mtu"]
-size = Vector2(50, 50)
-center_offset = Vector3(25, 0, 25)
-
 [sub_resource type="NavigationMesh" id="NavigationMesh_8emvl"]
 geometry_source_geometry_mode = 2
 geometry_source_group_name = &"air_navigation_input"
@@ -224,7 +220,6 @@ script = ExtResource("16_ravsv")
 [node name="ReferenceMesh" type="MeshInstance3D" parent="Navigation/Air" groups=["air_navigation_input"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
 visible = false
-mesh = SubResource("PlaneMesh_g1mtu")
 
 [node name="NavigationRegion3D" type="NavigationRegion3D" parent="Navigation/Air"]
 navigation_mesh = SubResource("NavigationMesh_8emvl")

source/match/Navigation.gd

@@ -20,19 +20,13 @@ func get_navigation_map_rid_by_domain(domain):
 	}[domain]
 
 
-func rebake(map):
-	air.rebake(map)
-	terrain.rebake()
-	_clear_static_obstacles()
+func setup(map):
+	assert(_static_obstacles.is_empty())
+	air.bake(map)
+	terrain.bake()
 	_setup_static_obstacles()
 
 
-func _clear_static_obstacles():
-	for static_obstacle in _static_obstacles:
-		NavigationServer3D.free_rid(static_obstacle)
-	_static_obstacles = []
-
-
 func _setup_static_obstacles():
 	if not _static_obstacles.is_empty():
 		return

source/match/TerrainNavigation.gd

@@ -34,7 +34,11 @@ func _process(_delta):
 		_navigation_region.bake_navigation_mesh(true)
 
 
-func rebake():
+func bake():
+	assert(
+		_navigation_region.navigation_mesh.get_polygon_count() == 0,
+		"bake() should be called exactly once - during runtime"
+	)
 	_navigation_region.bake_navigation_mesh(false)
 
 

tests/manual/TestNonQuadraticMap.tscn

@@ -12,7 +12,6 @@
 script = ExtResource("3_eliam")
 color = Color(0.4, 0.694118, 1, 1)
 controller = 1
-spawn_index = -1
 spawn_index_offset = 0
 
 [sub_resource type="Resource" id="Resource_qgn77"]