Add baked auto-connectors and navmesh compatibility coverage

Introduce bake-time auto-connectors generated from paint-layer height boundaries, including dock settings, persisted level state, and a new HFAutoConnector generator integrated into HFBakeSystem post-processing.

Scope connector generation out of selection-only bakes, preserve navmesh baking in that path, and harden navmesh parsed-geometry configuration behind a version-safe helper that supports both geometry_parsed_geometry_type and parsed_geometry_type.

Expand automated coverage with dedicated auto-connector tests plus bake-system integration tests for connector generation, collision creation, navmesh settings propagation, parsed-geometry configuration, and helper branch behavior. Update docs and project changelog/roadmap entries to describe the feature and validation.

Author: Shane Wall

CHANGELOG.md

@@ -5,6 +5,31 @@ The format is based on Keep a Changelog, and this project follows semantic versi
 
 ## [Unreleased]
 ### Added
+- **Better Terrain Integration — Auto Connectors** (Apr 2026): Auto-generate ramps or stairs between
+  height levels during bake. `HFAutoConnector` class (`paint/hf_auto_connector.gd`) scans all paint
+  layer pairs, detects cross-layer height boundaries (adjacent cells where one layer's filled cell
+  neighbours another layer's filled cell at a different height, threshold ≥0.1 world units), groups
+  contiguous boundary edges by direction, and generates connector meshes via the existing
+  `HFConnectorTool`. Three modes: **Ramp** (smooth slope), **Stairs** (stepped with configurable step
+  height), and **Auto** (picks stairs when height diff ≥ threshold, ramp otherwise). Connector width
+  configurable in cells. Deduplication uses canonical 6-part key (both layer indices + both cell coords)
+  so corner and T-junction edges are never dropped. Integrated into `HFBakeSystem.postprocess_bake()` —
+  connectors generate before navmesh bake so `PARSED_GEOMETRY_STATIC_COLLIDERS` mode picks up connector
+  collision shapes. Selection bakes (`bake_selected`) skip auto-connectors to avoid pulling in
+  unrelated geometry. 4 new export properties on LevelRoot: `bake_auto_connectors`, `bake_connector_mode`,
+  `bake_connector_stair_height`, `bake_connector_width`. Dock UI: "Auto Connectors" checkbox, Mode
+  dropdown (Ramp/Stairs/Auto), Step Height and Width spinboxes in Manage tab Bake section. Full state
+  persistence in `.hflevel` via `hf_state_system.gd` and dock settings export/import.
+  27 tests in `test_auto_connector.gd` + 13 integration tests in `test_bake_system.gd`.
+  Total: **1270 tests across 72 files**.
+### Fixed
+- **NavigationMesh parsed_geometry_type property name** (Apr 2026): `bake_navmesh()` unconditionally
+  assigned `nav_mesh.parsed_geometry_type`, which was renamed to `geometry_parsed_geometry_type` in
+  Godot 4.6. Every navmesh bake logged `Invalid assignment of property or key 'parsed_geometry_type'`
+  and silently failed to set collider-only parse mode. Extracted to version-safe
+  `_set_parsed_geometry_type(target, value)` static helper that probes both property names via `in`.
+  4 unit tests exercise both branches (new-name, legacy-name via mock, both-names priority, neither-name
+  fallback).
 - **Merge Tool** (Apr 2026): Combine 2+ selected brushes into a single CUSTOM brush before baking.
   `HFBrushSystem.merge_brushes_by_ids()` collects all faces from source brushes and transforms
   their `local_verts` and normals through the full `Transform3D` pipeline (source local → world →

DEVELOPMENT.md

@@ -91,7 +91,7 @@ addons/hammerforge/
     hf_entity_system.gd    Entity definitions, placement, Entity I/O connections
     hf_brush_system.gd     Brush CRUD, cuts, materials, picking, hollow, clip, merge, tie/untie
     hf_drag_system.gd      Drag lifecycle, preview, axis locking
-    hf_bake_system.gd      Bake orchestration (single/chunked/selected/dirty), preview modes (Full/Wireframe/Proxy), time estimate
+    hf_bake_system.gd      Bake orchestration (single/chunked/selected/dirty), preview modes (Full/Wireframe/Proxy), time estimate, auto-connectors
     hf_paint_system.gd     Floor + surface paint, layer CRUD
     hf_state_system.gd     State capture/restore, settings, transactions
     hf_file_system.gd      .hflevel/.map/.glTF I/O, threaded writes, autosave failure reporting
@@ -119,7 +119,8 @@ addons/hammerforge/
     hf_reconciler.gd       Stable-ID reconciliation (floors, walls, heightmap floors)
     hf_generated_model.gd  Data model (FloorRect, WallSeg, HeightmapFloor)
     hf_stroke.gd           Stroke types (brush/erase/rect/line/bucket/blend/sculpt_raise/lower/smooth/flatten)
-    hf_connector_tool.gd   Ramp/stair mesh generation between layers
+    hf_connector_tool.gd   Ramp/stair mesh generation between layers (manual connector defs)
+    hf_auto_connector.gd   Auto-detect height boundaries + generate connectors during bake
     hf_foliage_populator.gd MultiMeshInstance3D procedural scatter (height/slope filtering)
     hf_brush_to_heightmap.gd Convert selected brushes to heightmap paint layer (rasterize top faces)
     hf_scatter_brush.gd    Interactive scatter/foliage brush (circle/spline, density preview, commit)

README.md

@@ -9,7 +9,7 @@
   <img src="https://img.shields.io/badge/Godot-4.6%2B-478cbf?logo=godot-engine&logoColor=white" alt="Godot 4.6+">
   <img src="https://img.shields.io/badge/License-MIT-green" alt="MIT License">
   <img src="https://img.shields.io/badge/Status-Early%20Alpha-red" alt="Early Alpha">
-  <img src="https://img.shields.io/badge/Tests-1226%20passing-brightgreen" alt="1226 tests passing">
+  <img src="https://img.shields.io/badge/Tests-1270%20passing-brightgreen" alt="1270 tests passing">
   <img src="https://img.shields.io/badge/GDScript-25k%2B%20lines-blueviolet" alt="25k+ lines">
 </p>
 
@@ -40,7 +40,7 @@ HammerForge is a single `addons/` folder. No external tools, no custom builds, n
 
 | | |
 |---|---|
-| **21 subsystems** + coordinator architecture | **1226 unit + integration tests** with CI on every push |
+| **21 subsystems** + coordinator architecture | **1270 unit + integration tests** with CI on every push |
 | **15 brush shapes** (box through dodecahedron) | **150 built-in prototype textures** for instant greyboxing |
 | **Quake `.map`** + **glTF `.glb`** export | **.hflevel** native format with threaded I/O |
 | **Customizable keymaps** (JSON) | **Plugin API** for custom tools |
@@ -120,7 +120,7 @@ Grid-based paint layers with chunked storage for large worlds:
 - **Displacement surfaces:** Source-style subdivided face grids (power 2-4) with Raise/Lower/Smooth/Noise/Alpha paint modes, sew adjacent displacements, elevation scale
 - **Convert Selection to Heightmap:** select brushes → rasterize top faces → create sculptable terrain layer
 - **Material blending:** four-slot shader with per-cell blend weights painted directly on the grid
-- **Auto-connectors:** ramp and stair mesh generation between layers at different heights
+- **Auto-connectors:** ramp and stair mesh generation between layers at different heights, auto-generated during bake with mode selection (Ramp/Stairs/Auto), configurable step height and width
 - **Foliage & Scatter brush:** circle/spline shapes, density preview via MultiMesh (Dots/Wireframe/Full), slope/height filtering, align-to-normal, commit as permanent MultiMeshInstance3D
 - **Region streaming:** sparse chunk loading for open worlds
 

ROADMAP.md

@@ -1,6 +1,6 @@
 # Roadmap
 
-Last updated: April 6, 2026
+Last updated: April 8, 2026
 
 This roadmap is a directional plan. Items may change based on user feedback.
 Priorities are informed by a Hammer Editor gap analysis — see GAP_ANALYSIS.md for details.
@@ -233,11 +233,21 @@ Priorities are informed by a Hammer Editor gap analysis — see GAP_ANALYSIS.md
 - **Plugin displacement paint input**: raycast plane intersection constrained by convex polygon bounds check. Paint gated behind paint mode enabled + Displacement section expanded.
 - 55 new tests across 2 files (test_displacement 40, test_bevel 15). Total: **1172 tests across 69 files**.
 
-## Next (Wave 2c remaining)
-- Material atlasing for large scenes.
+## Done (Material Atlasing — Draw-Call Reduction)
+- **Material atlas** (`HFMaterialAtlas`): shelf bin-packing of albedo textures into single atlas (up to 4096x4096). 2px gutter padding with edge-pixel extension. Half-texel UV inset. Per-face tiling detection splits hardware-repeat faces into separate surfaces. Baker `bake_from_faces()` integration with `remap_uv()`. `bake_use_atlas` LevelRoot property + dock checkbox + state persistence.
+- 26 new tests. Total: **1203 tests across 70 files**.
+
+## Done (Merge Tool — Brush Combination)
+- **Merge brushes** (`HFBrushSystem.merge_brushes_by_ids()`): combine 2+ selected brushes into one CUSTOM brush. Full Transform3D pipeline (local→world→merged local), per-brush material_override as per-face material_idx. Ctrl+Shift+M keybinding, context toolbar Mrg button, command palette entry.
+- 23 new tests. Total: **1226 tests across 71 files**.
+
+## Done (Better Terrain Integration — Auto-Connectors)
+- **Auto-connector system** (`hf_auto_connector.gd`): auto-detect cross-layer height boundaries during bake. 4-directional neighbor scan, 6-part canonical dedupe key (handles corners/T-junctions), flood-fill grouping, ramp/stairs/auto mode selection. Connectors include CollisionShape3D for navmesh parsing. Selection-only bakes skip connectors.
+- **Bake pipeline integration**: `postprocess_bake()` with `selection_only` flag. `_append_auto_connectors()` creates meshes + collision shapes. Version-safe `_set_parsed_geometry_type()` static helper for Godot 4.6 navmesh property rename.
+- **Dock UI**: Auto Connectors checkbox, Mode dropdown (Ramp/Stairs/Auto), Step H and Width spinboxes in Manage tab Bake section.
+- 44 new tests (27 auto_connector + 17 bake_system integration). Total: **1270 tests across 73 files**.
 
 ## Future (Wave 3 -- Polish)
-- Merge tool (combine two adjacent brushes into one convex brush).
 - Multiple simultaneous cordons.
 - Multi-tool presets for common workflows.
 - Additional bake pipelines (merge strategies, export helpers).

addons/hammerforge/dock.gd

@@ -163,6 +163,10 @@ var bake_chunk_size_spin: SpinBox = null
 var bake_visible_only_check: CheckBox = null
 var bake_use_multimesh_check: CheckBox = null
 var bake_use_atlas_check: CheckBox = null
+var bake_auto_connectors_check: CheckBox = null
+var bake_connector_mode_opt: OptionButton = null
+var bake_connector_stair_height_spin: SpinBox = null
+var bake_connector_width_spin: SpinBox = null
 # -- Quick Play mode controls --
 var quick_play_camera_btn: Button = null
 var quick_play_area_btn: Button = null
@@ -521,6 +525,7 @@ func _connect_setting_signals() -> void:
 		[bake_visible_only_check, "bake_visible_only"],
 		[bake_use_multimesh_check, "bake_use_multimesh"],
 		[bake_use_atlas_check, "bake_use_atlas"],
+		[bake_auto_connectors_check, "bake_auto_connectors"],
 		[commit_freeze, "commit_freeze"],
 		[autosave_enabled, "hflevel_autosave_enabled"],
 		[show_grid, "grid_visible"],
@@ -539,6 +544,7 @@ func _connect_setting_signals() -> void:
 		[bake_navmesh_cell_height, "bake_navmesh_cell_height"],
 		[bake_navmesh_agent_height, "bake_navmesh_agent_height"],
 		[bake_navmesh_agent_radius, "bake_navmesh_agent_radius"],
+		[bake_connector_stair_height_spin, "bake_connector_stair_height"],
 	]
 	for binding in float_bindings:
 		var ctrl: SpinBox = binding[0] as SpinBox
@@ -549,12 +555,20 @@ func _connect_setting_signals() -> void:
 	var int_bindings: Array = [
 		[autosave_minutes, "hflevel_autosave_minutes"],
 		[autosave_keep, "hflevel_autosave_keep"],
+		[bake_connector_width_spin, "bake_connector_width"],
 	]
 	for binding in int_bindings:
 		var ctrl: SpinBox = binding[0] as SpinBox
 		var prop: String = binding[1]
 		if ctrl:
 			ctrl.value_changed.connect(_on_setting_int_changed.bind(prop))
+	# OptionButton → int property
+	if bake_connector_mode_opt:
+		bake_connector_mode_opt.item_selected.connect(
+			func(idx: int) -> void:
+				if level_root and _root_has_property("bake_connector_mode"):
+					level_root.set("bake_connector_mode", idx)
+		)
 	# Debug checkbox (special — also sets local debug_enabled bool)
 	if debug_logs:
 		debug_logs.toggled.connect(_on_debug_toggled)
@@ -573,6 +587,7 @@ func _apply_ui_state_to_root() -> void:
 		[bake_visible_only_check, "bake_visible_only"],
 		[bake_use_multimesh_check, "bake_use_multimesh"],
 		[bake_use_atlas_check, "bake_use_atlas"],
+		[bake_auto_connectors_check, "bake_auto_connectors"],
 		[commit_freeze, "commit_freeze"],
 		[autosave_enabled, "hflevel_autosave_enabled"],
 		[show_grid, "grid_visible"],
@@ -590,6 +605,7 @@ func _apply_ui_state_to_root() -> void:
 		[bake_navmesh_cell_height, "bake_navmesh_cell_height"],
 		[bake_navmesh_agent_height, "bake_navmesh_agent_height"],
 		[bake_navmesh_agent_radius, "bake_navmesh_agent_radius"],
+		[bake_connector_stair_height_spin, "bake_connector_stair_height"],
 	]
 	for pair in float_pairs:
 		var ctrl: SpinBox = pair[0] as SpinBox
@@ -599,12 +615,15 @@ func _apply_ui_state_to_root() -> void:
 	var int_pairs: Array = [
 		[autosave_minutes, "hflevel_autosave_minutes"],
 		[autosave_keep, "hflevel_autosave_keep"],
+		[bake_connector_width_spin, "bake_connector_width"],
 	]
 	for pair in int_pairs:
 		var ctrl: SpinBox = pair[0] as SpinBox
 		var prop: String = pair[1]
 		if ctrl and _root_has_property(prop):
 			level_root.set(prop, int(ctrl.value))
+	if bake_connector_mode_opt and _root_has_property("bake_connector_mode"):
+		level_root.set("bake_connector_mode", bake_connector_mode_opt.get_selected_id())
 	if _root_has_property("debug_logging"):
 		level_root.set("debug_logging", debug_enabled)
 
@@ -997,6 +1016,13 @@ func _apply_all_tooltips() -> void:
 	_set_tooltip(bake_navmesh_cell_height, "Navigation mesh cell height (Y)")
 	_set_tooltip(bake_navmesh_agent_height, "Navigation agent height")
 	_set_tooltip(bake_navmesh_agent_radius, "Navigation agent radius")
+	_set_tooltip(
+		bake_auto_connectors_check,
+		(
+			"Auto-generate ramps or stairs between height levels during bake"
+			+ "\nRequires at least 2 paint layers at different heights"
+		)
+	)
 	# FloorPaint tab
 	_set_tooltip(
 		paint_tool_select,
@@ -3555,6 +3581,14 @@ func _sync_grid_settings_from_root() -> void:
 		bake_use_multimesh_check.button_pressed = bool(connected_root.get("bake_use_multimesh"))
 	if bake_use_atlas_check and _root_has_property("bake_use_atlas"):
 		bake_use_atlas_check.button_pressed = bool(connected_root.get("bake_use_atlas"))
+	if bake_auto_connectors_check and _root_has_property("bake_auto_connectors"):
+		bake_auto_connectors_check.button_pressed = bool(connected_root.get("bake_auto_connectors"))
+	if bake_connector_mode_opt and _root_has_property("bake_connector_mode"):
+		bake_connector_mode_opt.select(int(connected_root.get("bake_connector_mode")))
+	if bake_connector_stair_height_spin and _root_has_property("bake_connector_stair_height"):
+		bake_connector_stair_height_spin.value = float(connected_root.get("bake_connector_stair_height"))
+	if bake_connector_width_spin and _root_has_property("bake_connector_width"):
+		bake_connector_width_spin.value = int(connected_root.get("bake_connector_width"))
 	if bake_chunk_size_spin and _root_has_property("bake_chunk_size"):
 		bake_chunk_size_spin.value = float(connected_root.get("bake_chunk_size"))
 	if bake_navmesh and _root_has_property("bake_navmesh"):
@@ -5772,6 +5806,14 @@ func _collect_editor_settings() -> Dictionary:
 		bake_settings["use_multimesh"] = bake_use_multimesh_check.button_pressed
 	if bake_use_atlas_check:
 		bake_settings["use_atlas"] = bake_use_atlas_check.button_pressed
+	if bake_auto_connectors_check:
+		bake_settings["auto_connectors"] = bake_auto_connectors_check.button_pressed
+	if bake_connector_mode_opt:
+		bake_settings["connector_mode"] = bake_connector_mode_opt.get_selected_id()
+	if bake_connector_stair_height_spin:
+		bake_settings["connector_stair_height"] = float(bake_connector_stair_height_spin.value)
+	if bake_connector_width_spin:
+		bake_settings["connector_width"] = int(bake_connector_width_spin.value)
 	return {
 		"version": 1,
 		"saved_at": Time.get_datetime_string_from_system(),
@@ -5854,6 +5896,14 @@ func _apply_editor_settings(data: Dictionary) -> void:
 			bake_use_multimesh_check.button_pressed = bool(bake.get("use_multimesh", false))
 		if bake_use_atlas_check and bake.has("use_atlas"):
 			bake_use_atlas_check.button_pressed = bool(bake.get("use_atlas", false))
+		if bake_auto_connectors_check and bake.has("auto_connectors"):
+			bake_auto_connectors_check.button_pressed = bool(bake.get("auto_connectors", false))
+		if bake_connector_mode_opt and bake.has("connector_mode"):
+			bake_connector_mode_opt.select(int(bake.get("connector_mode", 0)))
+		if bake_connector_stair_height_spin and bake.has("connector_stair_height"):
+			bake_connector_stair_height_spin.value = float(bake.get("connector_stair_height", 0.25))
+		if bake_connector_width_spin and bake.has("connector_width"):
+			bake_connector_width_spin.value = int(bake.get("connector_width", 2))
 		_sync_bake_option_visibility()
 
 

addons/hammerforge/level_root.gd

@@ -21,6 +21,7 @@ const HFGeometrySynth = preload("paint/hf_geometry_synth.gd")
 const HFGeneratedReconciler = preload("paint/hf_reconciler.gd")
 const HFStroke = preload("paint/hf_stroke.gd")
 const HFHeightmapSynth = preload("paint/hf_heightmap_synth.gd")
+const HFAutoConnectorType = preload("paint/hf_auto_connector.gd")
 const HFHeightmapIO = preload("paint/hf_heightmap_io.gd")
 const HFExtrudeToolType = preload("hf_extrude_tool.gd")
 const HFInputStateType = preload("input_state.gd")
@@ -98,6 +99,10 @@ var _grid_snap: float = 16.0
 @export var bake_visible_only: bool = false
 @export var bake_use_multimesh: bool = false
 @export var bake_use_atlas: bool = false
+@export var bake_auto_connectors: bool = false
+@export var bake_connector_mode: int = 0  # HFAutoConnector.ConnectorMode (RAMP=0, STAIRS=1, AUTO=2)
+@export var bake_connector_stair_height: float = 0.25
+@export var bake_connector_width: int = 2
 @export var bake_use_thread_pool: bool = true
 var _hflevel_autosave_enabled: bool = true
 @export var hflevel_autosave_enabled: bool = true: