feat: Kufenspur mit Richtungsfarbe in der 3D-Vorschau
- zwei verblassende Ribbons an den Kufen (tuerkis vorwaerts, orange rueckwaerts) - Alterung ueber Playback-Zeit, Reset bei Spruengen/Scrubbing - 3/4-Folgekamera macht die Spur sichtbar - Legende im 3D-Bild - 52 Praesentations-Assertions (1181 gesamt) - Doku, Architektur (D16) und Roadmap aktualisiert
This commit is contained in:
parent
7f35162966
commit
1530914814
13 changed files with 478 additions and 15 deletions
|
|
@ -3,8 +3,8 @@
|
||||||
Stand: 2026-10-31
|
Stand: 2026-10-31
|
||||||
Grundlage: `rinkplanner/rinkplanner_definition_agent_guidelines.md`
|
Grundlage: `rinkplanner/rinkplanner_definition_agent_guidelines.md`
|
||||||
Übergeordnete Reihenfolge: `docs/roadmap.md`
|
Übergeordnete Reihenfolge: `docs/roadmap.md`
|
||||||
Letzte Session: `docs/findings-2026-10-31-rotoscoping.md`
|
Letzte Session: `docs/findings-2026-10-31-kufenspur.md`
|
||||||
(Session davor: `docs/findings-2026-10-31-3d-vorschau.md`)
|
(Session davor: `docs/findings-2026-10-31-rotoscoping.md`)
|
||||||
|
|
||||||
## 1. Leitentscheidung
|
## 1. Leitentscheidung
|
||||||
|
|
||||||
|
|
@ -212,6 +212,14 @@ Arbeitsdateien bleiben im Workbench-Archiv. Godot kennt nur die GLB und die
|
||||||
Clipnamen; die Zuordnung Element → Clip ist ein späterer Schritt. Details:
|
Clipnamen; die Zuordnung Element → Clip ist ein späterer Schritt. Details:
|
||||||
`docs/rotoscoping.md`.
|
`docs/rotoscoping.md`.
|
||||||
|
|
||||||
|
**D16 – Die Kufenspur ist eine reine 3D-Visualisierung.**
|
||||||
|
`SkateTrail3D` zeichnet zwei Ribbons an den geschätzten Blade-Positionen.
|
||||||
|
Die Farbe kommt aus `PathSegment.direction`: türkis für vorwärts, orange für
|
||||||
|
rückwärts. Die Alterung läuft über die Playback-Zeit (1,3 s), nicht über die
|
||||||
|
Echtzeit; beim Pausieren bleibt die Spur stehen. Bei Positionssprüngen über
|
||||||
|
1,5 m, Zeit-Rücksprüngen oder `clear_pose` wird sie verworfen. Sie schreibt
|
||||||
|
keine Modelldaten und ist nur in der 3D-Vorschau sichtbar.
|
||||||
|
|
||||||
## 4. View- und Controller-Grenzen
|
## 4. View- und Controller-Grenzen
|
||||||
|
|
||||||
- **View** (`Node2D`/`Control`) liest das Modell und zeichnet. Sie verändert
|
- **View** (`Node2D`/`Control`) liest das Modell und zeichnet. Sie verändert
|
||||||
|
|
@ -484,9 +492,9 @@ Aktueller Stand:
|
||||||
- **3D-Assets:** 54 Assertions für Manifest-Schema, Pfade, FTP-Pfade,
|
- **3D-Assets:** 54 Assertions für Manifest-Schema, Pfade, FTP-Pfade,
|
||||||
Platzierung, Rig-Metadaten, Animationen, Hashes und – falls synchronisiert
|
Platzierung, Rig-Metadaten, Animationen, Hashes und – falls synchronisiert
|
||||||
– Größe und SHA-256 der GLB-Datei.
|
– Größe und SHA-256 der GLB-Datei.
|
||||||
- **3D-Vorschau:** 44 Assertions für Koordinatenabbildung, Rink-Geometrie,
|
- **3D-Vorschau:** 52 Assertions für Koordinatenabbildung, Rink-Geometrie,
|
||||||
Kamera-Modi, Platzhalter-Fallback und den 2D/3D-Moduswechsel samt
|
Kamera-Modi, Platzhalter-Fallback, Kufenspur (Farbe, zwei Kufen, Reset)
|
||||||
geteilter Playback-Position.
|
und den 2D/3D-Moduswechsel samt geteilter Playback-Position.
|
||||||
- **Blender-Werkbank:** Rotoscoping wird separat geprüft
|
- **Blender-Werkbank:** Rotoscoping wird separat geprüft
|
||||||
(`tools/rotoscope.sh test-reference` → `setup` → `export` → `promote
|
(`tools/rotoscope.sh test-reference` → `setup` → `export` → `promote
|
||||||
--dry-run`), nicht in `./tools/test.sh`, weil Blender und ffmpeg
|
--dry-run`), nicht in `./tools/test.sh`, weil Blender und ffmpeg
|
||||||
|
|
|
||||||
104
docs/findings-2026-10-31-kufenspur.md
Normal file
104
docs/findings-2026-10-31-kufenspur.md
Normal file
|
|
@ -0,0 +1,104 @@
|
||||||
|
# Findings 2026-10-31 – Kufenspur in der 3D-Vorschau
|
||||||
|
|
||||||
|
## Ziel
|
||||||
|
|
||||||
|
Die Fahrtrichtung im 3D-Bild sichtbar machen, besonders vorwärts und
|
||||||
|
rückwärts. Zwei verblassende Spuren an den Kufen sollen die Bewegung
|
||||||
|
nachvollziehbar machen, ohne das Modell zu verändern.
|
||||||
|
|
||||||
|
## Umsetzung
|
||||||
|
|
||||||
|
Neu: `src/presentation3d/skate_trail_3d.gd` (`SkateTrail3D`).
|
||||||
|
|
||||||
|
- Zwei Ribbons an den geschätzten Blade-Positionen
|
||||||
|
(`Skater3D.get_blade_positions()`, seitlicher Offset ±0,065 m,
|
||||||
|
1,5 cm über dem Eis).
|
||||||
|
- Breite 0,048 m, 120 Samples, Alterung 1,3 s.
|
||||||
|
- Farbe aus `PathSegment.direction`:
|
||||||
|
- **türkis** `#0ea5e9` = vorwärts,
|
||||||
|
- **orange** `#f97316` = rückwärts.
|
||||||
|
- Die Alterung läuft über die **Playback-Zeit**, nicht über die Echtzeit:
|
||||||
|
Beim Pausieren bleibt die Spur stehen.
|
||||||
|
- Reset bei Positionssprung > 1,5 m, Zeit-Rücksprung (Loop/Scrub) und
|
||||||
|
`clear_pose`.
|
||||||
|
- Während Element-Markern (Pirouette, Sprung) werden keine neuen Samples
|
||||||
|
erzeugt; die vorhandene Spur blendet über die Playback-Zeit aus.
|
||||||
|
- Unshaded-Material mit Vertex-Alpha; die neuesten Samples sind kräftig,
|
||||||
|
die ältesten laufen transparent aus.
|
||||||
|
|
||||||
|
### Kamera
|
||||||
|
|
||||||
|
Die reine Folgekamera direkt hinter dem Skater verdeckte die Spur im unteren
|
||||||
|
Bildrand. Sie ist jetzt eine 3/4-Verfolgung:
|
||||||
|
|
||||||
|
- 9 m hinter dem Skater,
|
||||||
|
- 3,5 m seitlich versetzt,
|
||||||
|
- 6 m hoch,
|
||||||
|
- Blickpunkt 2,5 m vor dem Skater.
|
||||||
|
|
||||||
|
Damit liegt die Spur sichtbar neben/hinter dem Skater, und die Fahrtrichtung
|
||||||
|
bleibt auch bei Rückwärtsfahrt erkennbar.
|
||||||
|
|
||||||
|
### Legende
|
||||||
|
|
||||||
|
Ein `Label` oben links im 3D-Bild erklärt die Farben:
|
||||||
|
|
||||||
|
`Spur: türkis = vorwärts · orange = rückwärts`
|
||||||
|
|
||||||
|
Es ist nur im 3D-Modus sichtbar und blockiert keine Eingaben.
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
`tests/run_presentation3d_tests.gd` erweitert um:
|
||||||
|
|
||||||
|
- Vortwärtsbewegung erzeugt Samples,
|
||||||
|
- zwei getrennte Blade-Positionen,
|
||||||
|
- Vortwärtsfarbe türkis,
|
||||||
|
- Rückwärtsfarbe orange,
|
||||||
|
- großer Sprung leert die Spur,
|
||||||
|
- `clear_pose` leert die Spur,
|
||||||
|
- Legende sichtbar in 3D / verborgen in 2D.
|
||||||
|
|
||||||
|
Ergebnis: **52 Assertions** (vorher 44), Gesamtsuite **1181** grün.
|
||||||
|
|
||||||
|
## Visuelle Prüfung
|
||||||
|
|
||||||
|
- 1400 × 900: Vorwärtsspur türkis, Rückwärtsspur orange, je zwei Linien.
|
||||||
|
- 1024 × 768: Legende und Spur passen; die Top-Leiste bleibt im
|
||||||
|
Compact-Layout.
|
||||||
|
- Die Spur beginnt an den Füßen und läuft hinter dem Skater aus.
|
||||||
|
|
||||||
|
## Gefundene Punkte
|
||||||
|
|
||||||
|
1. **Spur beim Scrubbing unsichtbar:** Ein einzelner Seek erzeugt nur eine
|
||||||
|
Pose; ohne Playback gibt es keine Samples. Der manuelle Capture spielt
|
||||||
|
jetzt 1,2 s vor dem Screenshot. In der App entsteht die Spur beim
|
||||||
|
Abspielen.
|
||||||
|
2. **Spur unter dem Bildrand:** Die direkt hinter dem Skater stehende Kamera
|
||||||
|
projizierte die Spur nach unten aus dem Bild. Die 3/4-Kamera löst das.
|
||||||
|
3. **Farben zu blass:** Auf dem weißen Eis waren die ersten Farben kaum zu
|
||||||
|
sehen. Kräftigere Farben, 0,048 m Breite und 0,95 Alpha.
|
||||||
|
4. **Einfrieren beim Pausieren:** Die Alterung wurde von Echtzeit auf
|
||||||
|
Playback-Zeit umgestellt. Die Spur bleibt beim Pausieren stehen und
|
||||||
|
verschwindet erst, wenn die Zeit weiterläuft.
|
||||||
|
|
||||||
|
## Grenzen
|
||||||
|
|
||||||
|
- Die Blade-Positionen sind feste lokale Offsets, keine Knochenauswertung.
|
||||||
|
Für den visuellen Effekt reicht das; bei extremen Fußstellungen kann die
|
||||||
|
Spur leicht neben der Kufe liegen.
|
||||||
|
- Bei Pirouetten und Element-Markern wird die Spur nicht weitergezeichnet.
|
||||||
|
- Die Spur ist nur in 3D sichtbar und wird nicht gespeichert.
|
||||||
|
- Es gibt noch keine freie Kamera/Orbit-Steuerung.
|
||||||
|
|
||||||
|
## Dateien
|
||||||
|
|
||||||
|
```
|
||||||
|
rinkplanner/src/presentation3d/skate_trail_3d.gd
|
||||||
|
rinkplanner/src/presentation3d/presentation_3d.gd
|
||||||
|
rinkplanner/src/presentation3d/skater_3d.gd
|
||||||
|
rinkplanner/scenes/presentation3d/presentation_3d.tscn
|
||||||
|
rinkplanner/scenes/whiteboard/whiteboard.tscn
|
||||||
|
rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd
|
||||||
|
rinkplanner/tests/run_presentation3d_tests.gd
|
||||||
|
```
|
||||||
|
|
@ -24,7 +24,12 @@ der bisherige Bearbeitungsstand wieder da.
|
||||||
- **Playback geteilt:** Start/Pause, Reset, Timeline und Geschwindigkeit
|
- **Playback geteilt:** Start/Pause, Reset, Timeline und Geschwindigkeit
|
||||||
wirken auf den 2D-Marker und den 3D-Skater gleichzeitig.
|
wirken auf den 2D-Marker und den 3D-Skater gleichzeitig.
|
||||||
- **Kamera:** Der Button „Kamera: Folge" wechselt zwischen der
|
- **Kamera:** Der Button „Kamera: Folge" wechselt zwischen der
|
||||||
Folgekamera (hinter dem Skater) und der Übersicht (ganzes Rink).
|
Folgekamera (hinten/seitlich versetzt) und der Übersicht (ganzes Rink).
|
||||||
|
- **Kufenspur:** Zwei verblassende Spuren an den Kufen zeigen die
|
||||||
|
Fahrtrichtung: **türkis = vorwärts**, **orange = rückwärts**. Beim
|
||||||
|
Pausieren bleibt die Spur stehen; bei Sprüngen, Scrubben oder einem
|
||||||
|
Sprung in der Zeit wird sie zurückgesetzt. Die Legende steht oben links
|
||||||
|
im 3D-Bild.
|
||||||
- **Zurück:** erneut **2D** drücken oder **Esc**.
|
- **Zurück:** erneut **2D** drücken oder **Esc**.
|
||||||
- **Statusleiste:** zeigt im 3D-Modus den Hinweis „Esc: 2D" und die aktive
|
- **Statusleiste:** zeigt im 3D-Modus den Hinweis „Esc: 2D" und die aktive
|
||||||
Kamera.
|
Kamera.
|
||||||
|
|
|
||||||
|
|
@ -187,6 +187,7 @@ UI-Feedback der Tester ohnehin noch ausstehen.
|
||||||
- [x] Geriggter Skater (AutoRigPro, 226 Control-/30 Deform-Bones, glTF-Export)
|
- [x] Geriggter Skater (AutoRigPro, 226 Control-/30 Deform-Bones, glTF-Export)
|
||||||
- [x] Animations-Bake und Godot-Import eines Testclips (`TestWave`)
|
- [x] Animations-Bake und Godot-Import eines Testclips (`TestWave`)
|
||||||
- [x] 3D-Rink, Kamera und Skater auf denselben Kurven (schreibgeschützte Vorschau)
|
- [x] 3D-Rink, Kamera und Skater auf denselben Kurven (schreibgeschützte Vorschau)
|
||||||
|
- [x] Kufenspur mit Richtungsfarbe (vorwärts türkis, rückwärts orange)
|
||||||
- [x] Erster Produktionsclip `Glide` als 2-s-Loop
|
- [x] Erster Produktionsclip `Glide` als 2-s-Loop
|
||||||
- [x] Rotoscoping-Workflow (Blender-Werkbank, Referenz, Multi-Clip-Export, Manifest)
|
- [x] Rotoscoping-Workflow (Blender-Werkbank, Referenz, Multi-Clip-Export, Manifest)
|
||||||
- [ ] Erste echte Clips aus Referenzmaterial (Vorwärts, Rückwärts, Pirouette)
|
- [ ] Erste echte Clips aus Referenzmaterial (Vorwärts, Rückwärts, Pirouette)
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
[gd_scene load_steps=4 format=3]
|
[gd_scene load_steps=5 format=3]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://src/presentation3d/presentation_3d.gd" id="1_presentation"]
|
[ext_resource type="Script" path="res://src/presentation3d/presentation_3d.gd" id="1_presentation"]
|
||||||
[ext_resource type="Script" path="res://src/presentation3d/rink_3d.gd" id="2_rink"]
|
[ext_resource type="Script" path="res://src/presentation3d/rink_3d.gd" id="2_rink"]
|
||||||
[ext_resource type="Script" path="res://src/presentation3d/skater_3d.gd" id="3_skater"]
|
[ext_resource type="Script" path="res://src/presentation3d/skater_3d.gd" id="3_skater"]
|
||||||
|
[ext_resource type="Script" path="res://src/presentation3d/skate_trail_3d.gd" id="4_trail"]
|
||||||
|
|
||||||
[node name="Presentation3D" type="Node3D"]
|
[node name="Presentation3D" type="Node3D"]
|
||||||
script = ExtResource("1_presentation")
|
script = ExtResource("1_presentation")
|
||||||
|
|
@ -24,3 +25,7 @@ script = ExtResource("2_rink")
|
||||||
[node name="Skater" type="Node3D" parent="."]
|
[node name="Skater" type="Node3D" parent="."]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
script = ExtResource("3_skater")
|
script = ExtResource("3_skater")
|
||||||
|
|
||||||
|
[node name="Trail" type="Node3D" parent="."]
|
||||||
|
unique_name_in_owner = true
|
||||||
|
script = ExtResource("4_trail")
|
||||||
|
|
|
||||||
|
|
@ -554,6 +554,22 @@ theme_override_font_sizes/font_size = 15
|
||||||
disabled = true
|
disabled = true
|
||||||
text = "Segment löschen"
|
text = "Segment löschen"
|
||||||
|
|
||||||
|
[node name="TrailLegend" type="Label" parent="."]
|
||||||
|
unique_name_in_owner = true
|
||||||
|
visible = false
|
||||||
|
layout_mode = 1
|
||||||
|
anchors_preset = 0
|
||||||
|
offset_left = 24.0
|
||||||
|
offset_top = 84.0
|
||||||
|
offset_right = 520.0
|
||||||
|
offset_bottom = 108.0
|
||||||
|
mouse_filter = 2
|
||||||
|
theme_override_colors/font_color = Color(0.85098, 0.921569, 1, 1)
|
||||||
|
theme_override_colors/font_outline_color = Color(0.0627451, 0.105882, 0.156863, 0.9)
|
||||||
|
theme_override_constants/outline_size = 4
|
||||||
|
theme_override_font_sizes/font_size = 15
|
||||||
|
text = "Spur: türkis = vorwärts · orange = rückwärts"
|
||||||
|
|
||||||
[node name="RenameDialog" type="ConfirmationDialog" parent="."]
|
[node name="RenameDialog" type="ConfirmationDialog" parent="."]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
title = "Abschnitt umbenennen"
|
title = "Abschnitt umbenennen"
|
||||||
|
|
|
||||||
|
|
@ -10,20 +10,26 @@ enum CameraMode {
|
||||||
OVERVIEW,
|
OVERVIEW,
|
||||||
}
|
}
|
||||||
|
|
||||||
const FOLLOW_DISTANCE_M := 8.0
|
const FOLLOW_DISTANCE_M := 9.0
|
||||||
const FOLLOW_HEIGHT_M := 5.5
|
const FOLLOW_HEIGHT_M := 6.0
|
||||||
|
const FOLLOW_SIDE_OFFSET_M := 3.5
|
||||||
const OVERVIEW_POSITION := Vector3(0.0, 36.0, 40.0)
|
const OVERVIEW_POSITION := Vector3(0.0, 36.0, 40.0)
|
||||||
const CAMERA_SMOOTHING := 4.0
|
const CAMERA_SMOOTHING := 4.0
|
||||||
|
const FORWARD_TRAIL_COLOR := Color("0ea5e9")
|
||||||
|
const BACKWARD_TRAIL_COLOR := Color("f97316")
|
||||||
|
const TRAIL_RESET_DISTANCE_M := 1.5
|
||||||
|
|
||||||
@onready var camera: Camera3D = %Camera3D
|
@onready var camera: Camera3D = %Camera3D
|
||||||
@onready var sun: DirectionalLight3D = %Sun
|
@onready var sun: DirectionalLight3D = %Sun
|
||||||
@onready var rink: Rink3D = %Rink
|
@onready var rink: Rink3D = %Rink
|
||||||
@onready var skater: Skater3D = %Skater
|
@onready var skater: Skater3D = %Skater
|
||||||
|
@onready var trail: SkateTrail3D = %Trail
|
||||||
|
|
||||||
var _active: bool = false
|
var _active: bool = false
|
||||||
var _camera_mode: CameraMode = CameraMode.FOLLOW
|
var _camera_mode: CameraMode = CameraMode.FOLLOW
|
||||||
var _camera_initialized: bool = false
|
var _camera_initialized: bool = false
|
||||||
var _look_target := Vector3(0.0, 1.0, 0.0)
|
var _look_target := Vector3(0.0, 1.0, 0.0)
|
||||||
|
var _last_playback_time: float = -1.0
|
||||||
|
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
|
|
@ -43,6 +49,8 @@ func setup(routine: Routine) -> void:
|
||||||
dimensions = routine.rink
|
dimensions = routine.rink
|
||||||
rink.build(dimensions)
|
rink.build(dimensions)
|
||||||
skater.setup()
|
skater.setup()
|
||||||
|
trail.clear()
|
||||||
|
_last_playback_time = -1.0
|
||||||
|
|
||||||
_camera_mode = CameraMode.FOLLOW
|
_camera_mode = CameraMode.FOLLOW
|
||||||
_camera_initialized = false
|
_camera_initialized = false
|
||||||
|
|
@ -56,6 +64,8 @@ func set_active(active: bool) -> void:
|
||||||
visible = active
|
visible = active
|
||||||
camera.current = active
|
camera.current = active
|
||||||
set_process(active)
|
set_process(active)
|
||||||
|
trail.clear()
|
||||||
|
_last_playback_time = -1.0
|
||||||
if active:
|
if active:
|
||||||
_camera_initialized = false
|
_camera_initialized = false
|
||||||
_update_camera(0.0, true)
|
_update_camera(0.0, true)
|
||||||
|
|
@ -68,21 +78,53 @@ func is_active() -> bool:
|
||||||
func update_pose(
|
func update_pose(
|
||||||
position_m: Vector2,
|
position_m: Vector2,
|
||||||
heading: Vector2,
|
heading: Vector2,
|
||||||
_segment: PathSegment = null
|
segment: PathSegment = null,
|
||||||
|
playback_time: float = -1.0
|
||||||
) -> void:
|
) -> void:
|
||||||
|
var current_time := playback_time
|
||||||
|
if current_time < 0.0:
|
||||||
|
current_time = Time.get_ticks_msec() / 1000.0
|
||||||
|
var time_reset := (
|
||||||
|
playback_time >= 0.0
|
||||||
|
and _last_playback_time >= 0.0
|
||||||
|
and current_time + 0.001 < _last_playback_time
|
||||||
|
)
|
||||||
|
_last_playback_time = current_time
|
||||||
|
|
||||||
var previous := skater.position
|
var previous := skater.position
|
||||||
skater.set_pose(position_m, heading)
|
skater.set_pose(position_m, heading)
|
||||||
if not _active:
|
if not _active:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
var moved := previous.distance_to(skater.position)
|
||||||
|
var jumped := moved > TRAIL_RESET_DISTANCE_M
|
||||||
|
if jumped or time_reset:
|
||||||
|
trail.clear()
|
||||||
|
|
||||||
|
var is_marker := segment != null and segment.is_element_marker()
|
||||||
|
if not is_marker and not jumped and not time_reset and moved > 0.0001:
|
||||||
|
var blades := skater.get_blade_positions()
|
||||||
|
var color := FORWARD_TRAIL_COLOR
|
||||||
|
if (
|
||||||
|
segment != null
|
||||||
|
and segment.direction == PathSegment.Direction.BACKWARD
|
||||||
|
):
|
||||||
|
color = BACKWARD_TRAIL_COLOR
|
||||||
|
trail.add_sample(blades[0], blades[1], color, current_time)
|
||||||
|
elif not jumped and not time_reset:
|
||||||
|
trail.set_time(current_time)
|
||||||
|
|
||||||
if (
|
if (
|
||||||
not _camera_initialized
|
not _camera_initialized
|
||||||
or previous.distance_to(skater.position) > 4.0
|
or moved > 4.0
|
||||||
):
|
):
|
||||||
_update_camera(0.0, true)
|
_update_camera(0.0, true)
|
||||||
|
|
||||||
|
|
||||||
func clear_pose() -> void:
|
func clear_pose() -> void:
|
||||||
skater.clear_pose()
|
skater.clear_pose()
|
||||||
|
trail.clear()
|
||||||
|
_last_playback_time = -1.0
|
||||||
_camera_initialized = false
|
_camera_initialized = false
|
||||||
if _active:
|
if _active:
|
||||||
_update_camera(0.0, true)
|
_update_camera(0.0, true)
|
||||||
|
|
@ -139,12 +181,18 @@ func _update_camera(delta: float, snap: bool = false) -> void:
|
||||||
desired = OVERVIEW_POSITION
|
desired = OVERVIEW_POSITION
|
||||||
target = Vector3(0.0, 0.0, 0.0)
|
target = Vector3(0.0, 0.0, 0.0)
|
||||||
else:
|
else:
|
||||||
|
var right := forward.cross(Vector3.UP)
|
||||||
|
if right.length_squared() > 0.0001:
|
||||||
|
right = right.normalized()
|
||||||
|
else:
|
||||||
|
right = Vector3.RIGHT
|
||||||
desired = (
|
desired = (
|
||||||
skater_position
|
skater_position
|
||||||
- forward * FOLLOW_DISTANCE_M
|
- forward * FOLLOW_DISTANCE_M
|
||||||
|
+ right * FOLLOW_SIDE_OFFSET_M
|
||||||
+ Vector3(0.0, FOLLOW_HEIGHT_M, 0.0)
|
+ Vector3(0.0, FOLLOW_HEIGHT_M, 0.0)
|
||||||
)
|
)
|
||||||
target = skater_position + forward * 2.0 + Vector3(0.0, 1.1, 0.0)
|
target = skater_position + forward * 2.5 + Vector3(0.0, 1.1, 0.0)
|
||||||
|
|
||||||
if snap or not _camera_initialized:
|
if snap or not _camera_initialized:
|
||||||
camera.position = desired
|
camera.position = desired
|
||||||
|
|
|
||||||
171
rinkplanner/src/presentation3d/skate_trail_3d.gd
Normal file
171
rinkplanner/src/presentation3d/skate_trail_3d.gd
Normal file
|
|
@ -0,0 +1,171 @@
|
||||||
|
class_name SkateTrail3D
|
||||||
|
extends Node3D
|
||||||
|
|
||||||
|
## Zwei verblassende Ribbons an den Kufen. Die Farbe kommt aus der
|
||||||
|
## Fahrtrichtung: türkis vorwärts, orange rückwärts. Reine Visualisierung.
|
||||||
|
|
||||||
|
const MAX_AGE_SECONDS := 1.3
|
||||||
|
const MIN_SAMPLE_DISTANCE_M := 0.04
|
||||||
|
const HALF_WIDTH_M := 0.024
|
||||||
|
const MAX_SAMPLES := 120
|
||||||
|
const NEWEST_ALPHA := 0.95
|
||||||
|
|
||||||
|
var _samples: Array[Dictionary] = []
|
||||||
|
var _mesh: ImmediateMesh
|
||||||
|
var _mesh_instance: MeshInstance3D
|
||||||
|
var _time: float = 0.0
|
||||||
|
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
_mesh = ImmediateMesh.new()
|
||||||
|
_mesh_instance = MeshInstance3D.new()
|
||||||
|
_mesh_instance.name = "TrailMesh"
|
||||||
|
_mesh_instance.mesh = _mesh
|
||||||
|
_mesh_instance.cast_shadow = GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
|
||||||
|
var material := StandardMaterial3D.new()
|
||||||
|
material.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||||
|
material.vertex_color_use_as_albedo = true
|
||||||
|
material.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
|
||||||
|
material.cull_mode = BaseMaterial3D.CULL_DISABLED
|
||||||
|
material.albedo_color = Color.WHITE
|
||||||
|
_mesh_instance.material_override = material
|
||||||
|
add_child(_mesh_instance)
|
||||||
|
|
||||||
|
|
||||||
|
func add_sample(
|
||||||
|
left: Vector3,
|
||||||
|
right: Vector3,
|
||||||
|
color: Color,
|
||||||
|
time_seconds: float = -1.0
|
||||||
|
) -> void:
|
||||||
|
_time = time_seconds if time_seconds >= 0.0 else _now()
|
||||||
|
_prune()
|
||||||
|
|
||||||
|
if not _samples.is_empty():
|
||||||
|
var last: Dictionary = _samples[_samples.size() - 1]
|
||||||
|
var last_left: Vector3 = last.get("left", left)
|
||||||
|
var last_right: Vector3 = last.get("right", right)
|
||||||
|
if (
|
||||||
|
last_left.distance_to(left) < MIN_SAMPLE_DISTANCE_M
|
||||||
|
and last_right.distance_to(right) < MIN_SAMPLE_DISTANCE_M
|
||||||
|
):
|
||||||
|
last["color"] = color
|
||||||
|
_rebuild()
|
||||||
|
return
|
||||||
|
|
||||||
|
_samples.append({
|
||||||
|
"left": left,
|
||||||
|
"right": right,
|
||||||
|
"time": _time,
|
||||||
|
"color": color,
|
||||||
|
})
|
||||||
|
while _samples.size() > MAX_SAMPLES:
|
||||||
|
_samples.pop_front()
|
||||||
|
_rebuild()
|
||||||
|
|
||||||
|
|
||||||
|
func clear() -> void:
|
||||||
|
_samples.clear()
|
||||||
|
if _mesh != null:
|
||||||
|
_mesh.clear_surfaces()
|
||||||
|
|
||||||
|
|
||||||
|
func set_time(time_seconds: float) -> void:
|
||||||
|
_time = time_seconds
|
||||||
|
_prune()
|
||||||
|
_rebuild()
|
||||||
|
|
||||||
|
|
||||||
|
func get_sample_count() -> int:
|
||||||
|
return _samples.size()
|
||||||
|
|
||||||
|
|
||||||
|
func get_last_color() -> Color:
|
||||||
|
if _samples.is_empty():
|
||||||
|
return Color.TRANSPARENT
|
||||||
|
return _samples[_samples.size() - 1].get("color", Color.WHITE)
|
||||||
|
|
||||||
|
|
||||||
|
func _prune() -> void:
|
||||||
|
while (
|
||||||
|
not _samples.is_empty()
|
||||||
|
and _time - float(_samples[0].get("time", _time)) > MAX_AGE_SECONDS
|
||||||
|
):
|
||||||
|
_samples.pop_front()
|
||||||
|
|
||||||
|
|
||||||
|
func _rebuild() -> void:
|
||||||
|
if _mesh == null:
|
||||||
|
return
|
||||||
|
_mesh.clear_surfaces()
|
||||||
|
if _samples.size() < 2:
|
||||||
|
return
|
||||||
|
|
||||||
|
_mesh.surface_begin(Mesh.PRIMITIVE_TRIANGLES)
|
||||||
|
_append_blade(true)
|
||||||
|
_append_blade(false)
|
||||||
|
_mesh.surface_end()
|
||||||
|
|
||||||
|
|
||||||
|
func _append_blade(left_blade: bool) -> void:
|
||||||
|
for index: int in range(_samples.size() - 1):
|
||||||
|
var current: Dictionary = _samples[index]
|
||||||
|
var next: Dictionary = _samples[index + 1]
|
||||||
|
var current_point: Vector3 = (
|
||||||
|
current["left"] if left_blade else current["right"]
|
||||||
|
)
|
||||||
|
var next_point: Vector3 = (
|
||||||
|
next["left"] if left_blade else next["right"]
|
||||||
|
)
|
||||||
|
|
||||||
|
var before := current_point
|
||||||
|
var after := next_point
|
||||||
|
if index > 0:
|
||||||
|
var previous: Dictionary = _samples[index - 1]
|
||||||
|
before = previous["left"] if left_blade else previous["right"]
|
||||||
|
if index + 2 < _samples.size():
|
||||||
|
var following: Dictionary = _samples[index + 2]
|
||||||
|
after = following["left"] if left_blade else following["right"]
|
||||||
|
|
||||||
|
var direction := after - before
|
||||||
|
if direction.length_squared() < 0.000001:
|
||||||
|
direction = next_point - current_point
|
||||||
|
if direction.length_squared() < 0.000001:
|
||||||
|
continue
|
||||||
|
direction = direction.normalized()
|
||||||
|
|
||||||
|
var side := direction.cross(Vector3.UP)
|
||||||
|
if side.length_squared() < 0.000001:
|
||||||
|
side = Vector3.RIGHT
|
||||||
|
side = side.normalized() * HALF_WIDTH_M
|
||||||
|
|
||||||
|
var color_current: Color = current.get("color", Color.WHITE)
|
||||||
|
var color_next: Color = next.get("color", Color.WHITE)
|
||||||
|
color_current.a *= _fade(
|
||||||
|
_time - float(current.get("time", _time))
|
||||||
|
)
|
||||||
|
color_next.a *= _fade(
|
||||||
|
_time - float(next.get("time", _time))
|
||||||
|
)
|
||||||
|
|
||||||
|
_mesh.surface_set_color(color_current)
|
||||||
|
_mesh.surface_add_vertex(current_point - side)
|
||||||
|
_mesh.surface_set_color(color_current)
|
||||||
|
_mesh.surface_add_vertex(current_point + side)
|
||||||
|
_mesh.surface_set_color(color_next)
|
||||||
|
_mesh.surface_add_vertex(next_point + side)
|
||||||
|
|
||||||
|
_mesh.surface_set_color(color_current)
|
||||||
|
_mesh.surface_add_vertex(current_point - side)
|
||||||
|
_mesh.surface_set_color(color_next)
|
||||||
|
_mesh.surface_add_vertex(next_point + side)
|
||||||
|
_mesh.surface_set_color(color_next)
|
||||||
|
_mesh.surface_add_vertex(next_point - side)
|
||||||
|
|
||||||
|
|
||||||
|
func _fade(age: float) -> float:
|
||||||
|
return clampf(1.0 - age / MAX_AGE_SECONDS, 0.0, 1.0) * NEWEST_ALPHA
|
||||||
|
|
||||||
|
|
||||||
|
func _now() -> float:
|
||||||
|
return Time.get_ticks_msec() / 1000.0
|
||||||
1
rinkplanner/src/presentation3d/skate_trail_3d.gd.uid
Normal file
1
rinkplanner/src/presentation3d/skate_trail_3d.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
uid://bsv6g3cl4edum
|
||||||
|
|
@ -8,6 +8,8 @@ const MANIFEST_PATH := "res://assets/asset_manifest.json"
|
||||||
const ASSET_ID := "character.skater.figure"
|
const ASSET_ID := "character.skater.figure"
|
||||||
const FALLBACK_MODEL_PATH := "res://assets/external/characters/skater_figure_glide_v003.glb"
|
const FALLBACK_MODEL_PATH := "res://assets/external/characters/skater_figure_glide_v003.glb"
|
||||||
const IDLE_ANIMATION := "Glide"
|
const IDLE_ANIMATION := "Glide"
|
||||||
|
const BLADE_LATERAL_OFFSET_M := 0.065
|
||||||
|
const BLADE_HEIGHT_M := 0.015
|
||||||
|
|
||||||
var _model: Node3D
|
var _model: Node3D
|
||||||
var _placeholder := false
|
var _placeholder := false
|
||||||
|
|
@ -58,6 +60,14 @@ func clear_pose() -> void:
|
||||||
set_pose(Vector2.ZERO, Vector2.RIGHT)
|
set_pose(Vector2.ZERO, Vector2.RIGHT)
|
||||||
|
|
||||||
|
|
||||||
|
func get_blade_positions() -> Array[Vector3]:
|
||||||
|
var xform := global_transform
|
||||||
|
return [
|
||||||
|
xform * Vector3(-BLADE_LATERAL_OFFSET_M, BLADE_HEIGHT_M, 0.0),
|
||||||
|
xform * Vector3(BLADE_LATERAL_OFFSET_M, BLADE_HEIGHT_M, 0.0),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
func has_model() -> bool:
|
func has_model() -> bool:
|
||||||
return _model != null and not _placeholder
|
return _model != null and not _placeholder
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@ const COMPACT_LAYOUT_WIDTH := 1280.0
|
||||||
@onready var view_3d_separator: VSeparator = %View3DSeparator
|
@onready var view_3d_separator: VSeparator = %View3DSeparator
|
||||||
@onready var camera_mode_button: Button = %CameraModeButton
|
@onready var camera_mode_button: Button = %CameraModeButton
|
||||||
@onready var timing_bar: PanelContainer = %TimingBar
|
@onready var timing_bar: PanelContainer = %TimingBar
|
||||||
|
@onready var trail_legend: Label = %TrailLegend
|
||||||
@onready var status_label: Label = %StatusLabel
|
@onready var status_label: Label = %StatusLabel
|
||||||
@onready var delete_segment_button: Button = %DeleteSegmentButton
|
@onready var delete_segment_button: Button = %DeleteSegmentButton
|
||||||
@onready var section_list: VBoxContainer = %SectionList
|
@onready var section_list: VBoxContainer = %SectionList
|
||||||
|
|
@ -2919,7 +2920,8 @@ func _update_playback_state(
|
||||||
_presentation_3d.update_pose(
|
_presentation_3d.update_pose(
|
||||||
position,
|
position,
|
||||||
_playback_heading,
|
_playback_heading,
|
||||||
segment
|
segment,
|
||||||
|
_playback_time
|
||||||
)
|
)
|
||||||
_update_playback_ui()
|
_update_playback_ui()
|
||||||
|
|
||||||
|
|
@ -3009,6 +3011,7 @@ func open_3d_view() -> void:
|
||||||
view_3d_button.text = "2D"
|
view_3d_button.text = "2D"
|
||||||
view_3d_button.tooltip_text = "Zurück zur 2D-Bearbeitung"
|
view_3d_button.tooltip_text = "Zurück zur 2D-Bearbeitung"
|
||||||
camera_mode_button.visible = true
|
camera_mode_button.visible = true
|
||||||
|
trail_legend.visible = true
|
||||||
_update_camera_mode_button()
|
_update_camera_mode_button()
|
||||||
rink_canvas.cancel_interaction()
|
rink_canvas.cancel_interaction()
|
||||||
_update_status()
|
_update_status()
|
||||||
|
|
@ -3026,6 +3029,7 @@ func close_3d_view() -> void:
|
||||||
view_3d_button.text = "3D"
|
view_3d_button.text = "3D"
|
||||||
view_3d_button.tooltip_text = "3D-Vorschau öffnen"
|
view_3d_button.tooltip_text = "3D-Vorschau öffnen"
|
||||||
camera_mode_button.visible = false
|
camera_mode_button.visible = false
|
||||||
|
trail_legend.visible = false
|
||||||
_apply_responsive_layout()
|
_apply_responsive_layout()
|
||||||
_update_status()
|
_update_status()
|
||||||
rink_canvas.queue_redraw()
|
rink_canvas.queue_redraw()
|
||||||
|
|
|
||||||
|
|
@ -60,11 +60,30 @@ func _capture() -> void:
|
||||||
controller.get_presentation_3d().set_camera_mode(
|
controller.get_presentation_3d().set_camera_mode(
|
||||||
Presentation3D.CameraMode.OVERVIEW
|
Presentation3D.CameraMode.OVERVIEW
|
||||||
)
|
)
|
||||||
controller.seek_playback(seek_time)
|
controller.seek_playback(maxf(seek_time - 1.2, 0.0))
|
||||||
await process_frame
|
controller.play()
|
||||||
|
for _frame: int in range(90):
|
||||||
|
await process_frame
|
||||||
|
controller.pause()
|
||||||
await process_frame
|
await process_frame
|
||||||
await process_frame
|
await process_frame
|
||||||
|
|
||||||
|
var presentation := controller.get_presentation_3d()
|
||||||
|
print(
|
||||||
|
"PLAYBACK ",
|
||||||
|
controller.get_playback_time(),
|
||||||
|
" ",
|
||||||
|
controller.get_playback_position(),
|
||||||
|
" ",
|
||||||
|
controller.get_playback_segment_id()
|
||||||
|
)
|
||||||
|
print(
|
||||||
|
"TRAIL ",
|
||||||
|
presentation.trail.get_sample_count(),
|
||||||
|
" ",
|
||||||
|
presentation.trail.get_last_color()
|
||||||
|
)
|
||||||
|
|
||||||
var image := root.get_texture().get_image()
|
var image := root.get_texture().get_image()
|
||||||
image.save_png(output)
|
image.save_png(output)
|
||||||
print("SAVED ", output)
|
print("SAVED ", output)
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,67 @@ func _test_presentation() -> void:
|
||||||
"clear pose resets the skater position"
|
"clear pose resets the skater position"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var forward_segment := PathSegment.new()
|
||||||
|
forward_segment.direction = PathSegment.Direction.FORWARD
|
||||||
|
var backward_segment := PathSegment.new()
|
||||||
|
backward_segment.direction = PathSegment.Direction.BACKWARD
|
||||||
|
|
||||||
|
presentation.update_pose(
|
||||||
|
Vector2(0.0, 0.0),
|
||||||
|
Vector2.RIGHT,
|
||||||
|
forward_segment
|
||||||
|
)
|
||||||
|
presentation.update_pose(
|
||||||
|
Vector2(1.0, 0.0),
|
||||||
|
Vector2.RIGHT,
|
||||||
|
forward_segment
|
||||||
|
)
|
||||||
|
_check(
|
||||||
|
presentation.trail.get_sample_count() >= 1,
|
||||||
|
"forward movement leaves a trail"
|
||||||
|
)
|
||||||
|
var blades := presentation.skater.get_blade_positions()
|
||||||
|
_check(
|
||||||
|
blades.size() == 2 and blades[0].distance_to(blades[1]) > 0.1,
|
||||||
|
"the trail uses two separate blades"
|
||||||
|
)
|
||||||
|
_check(
|
||||||
|
_color_matches(
|
||||||
|
presentation.trail.get_last_color(),
|
||||||
|
Presentation3D.FORWARD_TRAIL_COLOR
|
||||||
|
),
|
||||||
|
"forward trail is cyan"
|
||||||
|
)
|
||||||
|
|
||||||
|
presentation.update_pose(
|
||||||
|
Vector2(2.0, 0.0),
|
||||||
|
Vector2.RIGHT,
|
||||||
|
backward_segment
|
||||||
|
)
|
||||||
|
_check(
|
||||||
|
_color_matches(
|
||||||
|
presentation.trail.get_last_color(),
|
||||||
|
Presentation3D.BACKWARD_TRAIL_COLOR
|
||||||
|
),
|
||||||
|
"backward trail is orange"
|
||||||
|
)
|
||||||
|
|
||||||
|
presentation.update_pose(
|
||||||
|
Vector2(20.0, 0.0),
|
||||||
|
Vector2.RIGHT,
|
||||||
|
backward_segment
|
||||||
|
)
|
||||||
|
_check(
|
||||||
|
presentation.trail.get_sample_count() == 0,
|
||||||
|
"a large jump clears the trail"
|
||||||
|
)
|
||||||
|
|
||||||
|
presentation.clear_pose()
|
||||||
|
_check(
|
||||||
|
presentation.trail.get_sample_count() == 0,
|
||||||
|
"clear pose clears the trail"
|
||||||
|
)
|
||||||
|
|
||||||
presentation.set_active(false)
|
presentation.set_active(false)
|
||||||
_check(not presentation.visible, "inactive presentation is hidden")
|
_check(not presentation.visible, "inactive presentation is hidden")
|
||||||
_check(not presentation.camera.current, "inactive presentation releases the camera")
|
_check(not presentation.camera.current, "inactive presentation releases the camera")
|
||||||
|
|
@ -146,6 +207,7 @@ func _test_controller() -> void:
|
||||||
_check(controller.is_3d_view_active(), "3D view opens")
|
_check(controller.is_3d_view_active(), "3D view opens")
|
||||||
_check(controller.view_3d_button.text == "2D", "toolbar offers the way back")
|
_check(controller.view_3d_button.text == "2D", "toolbar offers the way back")
|
||||||
_check(controller.camera_mode_button.visible, "camera button is visible in 3D")
|
_check(controller.camera_mode_button.visible, "camera button is visible in 3D")
|
||||||
|
_check(controller.trail_legend.visible, "trail legend is visible in 3D")
|
||||||
_check(not controller.rink_canvas.visible, "2D canvas is hidden in 3D")
|
_check(not controller.rink_canvas.visible, "2D canvas is hidden in 3D")
|
||||||
_check(not controller.sections_panel.visible, "section panel is hidden in 3D")
|
_check(not controller.sections_panel.visible, "section panel is hidden in 3D")
|
||||||
_check(not controller.timing_bar.visible, "timing bar is hidden in 3D")
|
_check(not controller.timing_bar.visible, "timing bar is hidden in 3D")
|
||||||
|
|
@ -185,6 +247,7 @@ func _test_controller() -> void:
|
||||||
_check(controller.sections_panel.visible, "section panel is restored")
|
_check(controller.sections_panel.visible, "section panel is restored")
|
||||||
_check(controller.timing_bar.visible, "timing bar is restored")
|
_check(controller.timing_bar.visible, "timing bar is restored")
|
||||||
_check(not controller.camera_mode_button.visible, "camera button is hidden in 2D")
|
_check(not controller.camera_mode_button.visible, "camera button is hidden in 2D")
|
||||||
|
_check(not controller.trail_legend.visible, "trail legend is hidden in 2D")
|
||||||
_check(not presentation.is_active(), "presentation is inactive after closing")
|
_check(not presentation.is_active(), "presentation is inactive after closing")
|
||||||
|
|
||||||
controller.open_3d_view()
|
controller.open_3d_view()
|
||||||
|
|
@ -209,6 +272,14 @@ func _check_approx(
|
||||||
_check(absf(actual - expected) <= tolerance, message)
|
_check(absf(actual - expected) <= tolerance, message)
|
||||||
|
|
||||||
|
|
||||||
|
func _color_matches(actual: Color, expected: Color) -> bool:
|
||||||
|
return (
|
||||||
|
absf(actual.r - expected.r) <= 0.001
|
||||||
|
and absf(actual.g - expected.g) <= 0.001
|
||||||
|
and absf(actual.b - expected.b) <= 0.001
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
func _check(condition: bool, message: String) -> void:
|
func _check(condition: bool, message: String) -> void:
|
||||||
_assertions += 1
|
_assertions += 1
|
||||||
if not condition:
|
if not condition:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue