feat: Bogenparameter nachträglich bearbeiten

- Auswahlmodus mit Start-, End- und Bogen-Griff
- Bogen-Griff ändert Tiefe und Seite, Endpunkte verschieben die Kurve
- Bogen-Metadaten (Template, Tiefe, Seite) am PathSegment gespeichert
- ArcGeometry als eigenständige, headless testbare Geometrie
- Ghost-Sections bleiben nicht interaktiv
- Tests auf 203 Assertions erweitert
This commit is contained in:
torsten 2026-10-30 07:42:43 +01:00
parent 36e25aa559
commit c609f065dd
9 changed files with 803 additions and 130 deletions

View file

@ -7,6 +7,7 @@ extends SceneTree
const CanvasTransformModel := preload("res://src/whiteboard/view/canvas_transform.gd")
const RinkDimensionsModel := preload("res://src/core/model/rink_dimensions.gd")
const ArcGeometryModel := preload("res://src/core/model/arc_geometry.gd")
var _assertions: int = 0
var _failures: PackedStringArray = PackedStringArray()
@ -20,6 +21,7 @@ func _init() -> void:
_test_pan()
_test_visible_rect()
_test_rink_outline()
_test_arc_geometry()
_finish()
@ -112,6 +114,55 @@ func _test_rink_outline() -> void:
_check(rink.contains_point(corner_point), "corner arc lies on the rink surface")
func _test_arc_geometry() -> void:
var rink: RinkDimensions = RinkDimensionsModel.new()
var start := Vector2(-10.0, 0.0)
var end := Vector2(10.0, 0.0)
var left := ArcGeometryModel.build_points(start, end, true, 0.4, rink)
_check(left.size() > 2, "arc geometry returns a sampled curve")
_check_vec(left[0], start, "arc keeps the start point")
_check_vec(left[left.size() - 1], end, "arc keeps the end point")
_check(left[left.size() / 2].y > 1.0, "left arc bulges left of the chord")
var right := ArcGeometryModel.build_points(start, end, false, 0.4, rink)
_check(right[right.size() / 2].y < -1.0, "right arc bulges right of the chord")
var shallow := ArcGeometryModel.build_points(start, end, true, 0.15, rink)
var deep := ArcGeometryModel.build_points(start, end, true, 0.45, rink)
_check(
absf(deep[deep.size() / 2].y) > absf(shallow[shallow.size() / 2].y),
"larger depth ratio produces a deeper arc"
)
var near_board := ArcGeometryModel.build_points(
Vector2(-10.0, 10.0),
Vector2(10.0, 10.0),
true,
0.4,
rink
)
for point: Vector2 in near_board:
_check(
rink.contains_point(point),
"arc near the board is flattened: %s" % point
)
_check_approx(
ArcGeometryModel.depth_ratio_for_point(start, end, Vector2(0.0, 8.0)),
0.4,
"depth ratio is derived from the point distance"
)
_check(
ArcGeometryModel.is_left_of_chord(start, end, Vector2(0.0, 8.0)),
"point above the chord reports as left"
)
_check(
not ArcGeometryModel.is_left_of_chord(start, end, Vector2(0.0, -8.0)),
"point below the chord reports as right"
)
func _check(condition: bool, message: String) -> void:
_assertions += 1
if not condition:

View file

@ -110,6 +110,20 @@ func _test_segment_timing() -> void:
"segment with length but no duration is invalid"
)
var arc_segment: PathSegment = PathSegmentModel.new()
arc_segment.segment_id = "seg-arc"
arc_segment.curve = _make_curve(Vector2(-5.0, 0.0), Vector2(5.0, 0.0))
arc_segment.duration_seconds = 2.0
arc_segment.template = PathSegment.Template.ARC
arc_segment.arc_depth_ratio = 0.4
_check(arc_segment.is_arc(), "arc template reports as arc")
_check(arc_segment.is_valid(), "arc with a valid depth ratio is valid")
arc_segment.arc_depth_ratio = 0.5
_check(
not arc_segment.is_valid(),
"arc depth ratio at or above 0.5 is invalid"
)
func _test_section_aggregation() -> void:
var section: RoutineSection = RoutineSectionModel.new()

View file

@ -232,21 +232,111 @@ func _run() -> void:
"dragged left arc bulges below its chord"
)
var count_before_navigate := section.segments.size()
var origin_before_navigate: Vector2 = view.origin_px
controller.set_tool(WhiteboardController.Tool.NAVIGATE)
var pan_start := view.model_to_screen(Vector2(0.0, 0.0))
# Selection and handle editing.
controller.set_tool(WhiteboardController.Tool.SELECT)
var apex_before := arc_left.curve.sample_baked(arc_left.get_length_m() * 0.5)
_mouse_button(canvas, view.model_to_screen(apex_before), true)
_mouse_button(canvas, view.model_to_screen(apex_before), false)
_check(
controller.get_selected_segment() == arc_left,
"clicking an arc selects it"
)
_check(
canvas.get_selected_segment_id() == arc_left.segment_id,
"canvas keeps the selection in sync"
)
_check(
controller.status_label.text.contains("Auswahl: Bogen"),
"status bar reports the selected arc"
)
var selected_start := arc_left.curve.get_point_position(0)
var new_start := Vector2(-12.0, -2.0)
_mouse_button(canvas, view.model_to_screen(selected_start), true)
_mouse_motion(canvas, view.model_to_screen(new_start))
_mouse_button(canvas, view.model_to_screen(new_start), false)
_check_vec(
arc_left.curve.get_point_position(0),
new_start,
"start handle moves the arc start"
)
_check(
arc_left.template == PathSegment.Template.ARC,
"editing endpoints keeps the arc template"
)
var start_now := arc_left.curve.get_point_position(0)
var end_now := arc_left.curve.get_point_position(arc_left.curve.point_count - 1)
var chord_now := end_now - start_now
var mid_now := (start_now + end_now) * 0.5
var normal_now := Vector2(-chord_now.y, chord_now.x).normalized()
var deeper := mid_now + normal_now * (0.46 * chord_now.length())
var apex_now := arc_left.curve.sample_baked(arc_left.get_length_m() * 0.5)
_mouse_button(canvas, view.model_to_screen(apex_now), true)
_mouse_motion(canvas, view.model_to_screen(deeper))
_mouse_button(canvas, view.model_to_screen(deeper), false)
_check(
arc_left.arc_depth_ratio > 0.43,
"bulge handle increases the arc depth"
)
_check(
arc_left.arc_bulge_left,
"bulge stays left while dragged on the left side"
)
var apex_flip := arc_left.curve.sample_baked(arc_left.get_length_m() * 0.5)
var flipped := mid_now - normal_now * (0.3 * chord_now.length())
_mouse_button(canvas, view.model_to_screen(apex_flip), true)
_mouse_motion(canvas, view.model_to_screen(flipped))
_mouse_button(canvas, view.model_to_screen(flipped), false)
_check(
not arc_left.arc_bulge_left,
"bulge handle can flip the arc side"
)
var apex_after_flip := arc_left.curve.sample_baked(arc_left.get_length_m() * 0.5)
_check(
(apex_after_flip - mid_now).dot(normal_now) < 0.0,
"flipped arc lies on the other side of the chord"
)
controller.set_tool(WhiteboardController.Tool.LINE)
_check(
controller.get_selected_segment() == null,
"switching to a draw tool clears the selection"
)
_check(
canvas.get_selected_segment_id().is_empty(),
"canvas selection is cleared with the tool"
)
controller.set_tool(WhiteboardController.Tool.SELECT)
controller.select_segment(arc_left.segment_id)
_check(
controller.get_selected_segment() == arc_left,
"select_segment selects programmatically"
)
var empty_point := Vector2(25.0, -12.0)
_mouse_button(canvas, view.model_to_screen(empty_point), true)
_mouse_button(canvas, view.model_to_screen(empty_point), false)
_check(
controller.get_selected_segment() == null,
"clicking empty ice clears the selection"
)
var count_before_pan := section.segments.size()
var origin_before_pan: Vector2 = view.origin_px
var pan_start := view.model_to_screen(empty_point)
var pan_delta := Vector2(40.0, 0.0)
_mouse_button(canvas, pan_start, true)
_mouse_motion(canvas, pan_start + pan_delta, pan_delta)
_mouse_button(canvas, pan_start + pan_delta, false)
_check(
section.segments.size() == count_before_navigate,
"navigate mode does not create segments"
section.segments.size() == count_before_pan,
"select mode does not create segments"
)
_check(
view.origin_px != origin_before_navigate,
"navigate mode pans with a left drag"
view.origin_px != origin_before_pan,
"select mode pans on empty ice"
)
controller.set_tool(WhiteboardController.Tool.LINE)