diff --git a/docs/findings-2026-10-31-3d-vorschau.md b/docs/findings-2026-10-31-3d-vorschau.md index 01f2ee2..1d2b0c9 100644 --- a/docs/findings-2026-10-31-3d-vorschau.md +++ b/docs/findings-2026-10-31-3d-vorschau.md @@ -107,3 +107,23 @@ rinkplanner/tests/manual/capture_3d.gd workbench/source/characters/skater/skater_rig_v003.blend workbench/library/characters/skater_figure_glide_v003.glb ``` + +## Nachtrag: Bande mit mehr Kontrast (2026-11-12) + +Eis und Bande waren beide nahezu weiß (`e8f3ff` bzw. `f4f7fa`), bei flachem +Licht war die Kante kaum zu sehen. Die Bande ist jetzt dreiteilig: + +- **Sockel (Kickplate):** 0,22 m hoch, petrolfarben (`0f3b46`), sitzt leicht + vor der Bande und trennt Eis und Bande als dunkle Linie. +- **Bandfläche:** `bccddd`, also deutlich kühler und dunkler als das Eis + (`d3e6f5`), mit einer prozedural erzeugten Fugen-Textur + (`BOARD_PANEL_WIDTH_M = 2,4`). Die Textur läuft über + `uv1_world_triplanar`, damit die Panelbreite auf geraden Stücken und in den + Kurven gleich bleibt – BoxMesh-UVs hätten die Fugen pro Segment gestreckt. +- **Reling:** rot (`b3261e`) als obere Kante. + +Sichtprüfung mit vier Blickwinkeln (Übersicht, Bande nah, Folgekamera, +Innenansicht): `tests/manual/capture_rink_boards.gd`. Die Tests prüfen, dass +jede Bande einen Sockel hat, die Bande eine Textur trägt, die Fugen in +Weltkoordinaten wiederholen und sich Bande und Eis in der Helligkeit +unterscheiden. diff --git a/rinkplanner/src/presentation3d/rink_3d.gd b/rinkplanner/src/presentation3d/rink_3d.gd index ef66247..4611152 100644 --- a/rinkplanner/src/presentation3d/rink_3d.gd +++ b/rinkplanner/src/presentation3d/rink_3d.gd @@ -7,9 +7,13 @@ extends Node3D const BOARDS_HEIGHT_M := 1.1 const BOARDS_THICKNESS_M := 0.08 const CORNER_SEGMENTS := 10 -const ICE_COLOR := Color("e8f3ff") -const BOARD_COLOR := Color("f4f7fa") -const RAIL_COLOR := Color("c0392b") +const ICE_COLOR := Color("d3e6f5") +const BOARD_COLOR := Color("bccddd") +const BOARD_PANEL_WIDTH_M := 2.4 +const BOARD_SEAM_COLOR := Color("b9c4d0") +const KICKPLATE_COLOR := Color("0f3b46") +const KICKPLATE_HEIGHT_M := 0.22 +const RAIL_COLOR := Color("b3261e") const MARKING_COLOR := Color("7fa8c9") const GROUND_COLOR := Color("202b38") @@ -110,7 +114,8 @@ func _build_ice( func _build_boards(outline: PackedVector2Array) -> void: - var boards_material := _material(BOARD_COLOR, 0.6) + var boards_material := _board_material() + var kickplate_material := _material(KICKPLATE_COLOR, 0.55) var rail_material := _material(RAIL_COLOR, 0.5) for index: int in range(outline.size()): @@ -143,6 +148,26 @@ func _build_boards(outline: PackedVector2Array) -> void: wall.cast_shadow = GeometryInstance3D.SHADOW_CASTING_SETTING_OFF add_child(wall) + # Dunkler Sockel: trennt Bande und Eisfläche auch bei flachem Licht. + var kickplate_mesh := BoxMesh.new() + kickplate_mesh.size = Vector3( + length + BOARDS_THICKNESS_M + 0.01, + KICKPLATE_HEIGHT_M, + BOARDS_THICKNESS_M + 0.02 + ) + var kickplate := MeshInstance3D.new() + kickplate.name = "Kickplate%03d" % index + kickplate.mesh = kickplate_mesh + kickplate.material_override = kickplate_material + kickplate.position = Vector3( + middle.x, + KICKPLATE_HEIGHT_M * 0.5, + -middle.y + ) + kickplate.rotation.y = yaw + kickplate.cast_shadow = GeometryInstance3D.SHADOW_CASTING_SETTING_OFF + add_child(kickplate) + var rail_mesh := BoxMesh.new() rail_mesh.size = Vector3( length + BOARDS_THICKNESS_M + 0.02, @@ -210,6 +235,28 @@ func _build_ground(dimensions: RinkDimensions) -> void: add_child(ground) +## Bande mit Fugen: die Textur wiederholt sich in Weltkoordinaten, damit die +## Panelbreite auf geraden Stücken und in den Kurven gleich bleibt. +func _board_material() -> StandardMaterial3D: + var material := _material(BOARD_COLOR, 0.75) + material.albedo_texture = _board_texture() + material.uv1_triplanar = true + material.uv1_world_triplanar = true + material.uv1_scale = Vector3.ONE / BOARD_PANEL_WIDTH_M + material.texture_filter = BaseMaterial3D.TEXTURE_FILTER_LINEAR_WITH_MIPMAPS + return material + + +func _board_texture() -> ImageTexture: + var width := 128 + var image := Image.create(width, 8, false, Image.FORMAT_RGBA8) + image.fill(BOARD_COLOR) + for y: int in range(8): + image.set_pixel(0, y, BOARD_SEAM_COLOR) + image.set_pixel(1, y, BOARD_SEAM_COLOR.darkened(0.08)) + return ImageTexture.create_from_image(image) + + func _material(color: Color, roughness: float) -> StandardMaterial3D: var material := StandardMaterial3D.new() material.albedo_color = color diff --git a/rinkplanner/tests/manual/capture_rink_boards.gd b/rinkplanner/tests/manual/capture_rink_boards.gd new file mode 100644 index 0000000..6f1921f --- /dev/null +++ b/rinkplanner/tests/manual/capture_rink_boards.gd @@ -0,0 +1,67 @@ +extends SceneTree + +## Rendert die 3D-Bande aus zwei Blickwinkeln für die Sichtprüfung von Farbe, +## Sockel und Fugen. +## +## Aufruf: +## godot --path rinkplanner --script res://tests/manual/capture_rink_boards.gd -- /tmp/opencode/rink + + +func _init() -> void: + _capture.call_deferred() + + +func _capture() -> void: + var args := OS.get_cmdline_user_args() + var prefix := args[0] if args.size() > 0 else "/tmp/opencode/rink_boards" + + var viewport := SubViewport.new() + viewport.size = Vector2i(1280, 720) + viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS + root.add_child(viewport) + + var scene := Node3D.new() + viewport.add_child(scene) + + var rink := Rink3D.new() + scene.add_child(rink) + rink.build(RinkDimensions.new()) + + var environment := Environment.new() + environment.background_mode = Environment.BG_COLOR + environment.background_color = Color("aebdcd") + environment.ambient_light_source = Environment.AMBIENT_SOURCE_COLOR + environment.ambient_light_color = Color.WHITE + environment.ambient_light_energy = 0.6 + var world_environment := WorldEnvironment.new() + world_environment.environment = environment + scene.add_child(world_environment) + + var sun := DirectionalLight3D.new() + sun.rotation_degrees = Vector3(-50.0, -35.0, 0.0) + sun.light_energy = 1.15 + scene.add_child(sun) + + var camera := Camera3D.new() + camera.fov = 50.0 + camera.far = 250.0 + scene.add_child(camera) + camera.current = true + + var shots := [ + ["overview", Vector3(0.0, 36.0, 40.0), Vector3(0.0, 0.0, 0.0)], + ["boards", Vector3(14.0, 4.5, 18.0), Vector3(24.0, 0.4, 4.0)], + ["follow", Vector3(0.0, 6.0, -12.0), Vector3(0.0, 0.6, 6.0)], + ["inner", Vector3(0.0, 1.7, 0.0), Vector3(0.0, 0.4, -14.0)], + ] + for shot: Array in shots: + camera.position = shot[1] + camera.look_at(shot[2], Vector3.UP) + await process_frame + await process_frame + await process_frame + var image := viewport.get_texture().get_image() + var path := "%s_%s.png" % [prefix, shot[0]] + image.save_png(path) + print("SAVED ", path) + quit(0) diff --git a/rinkplanner/tests/manual/capture_rink_boards.gd.uid b/rinkplanner/tests/manual/capture_rink_boards.gd.uid new file mode 100644 index 0000000..c3fc09c --- /dev/null +++ b/rinkplanner/tests/manual/capture_rink_boards.gd.uid @@ -0,0 +1 @@ +uid://dqdkopungj75l diff --git a/rinkplanner/tests/run_presentation3d_tests.gd b/rinkplanner/tests/run_presentation3d_tests.gd index 498ab83..a1ce86d 100644 --- a/rinkplanner/tests/run_presentation3d_tests.gd +++ b/rinkplanner/tests/run_presentation3d_tests.gd @@ -48,6 +48,42 @@ func _test_presentation() -> void: presentation.rink.get_node_or_null("CenterCircle") != null, "rink has a center circle" ) + + var board := presentation.rink.get_node_or_null("Board000") as MeshInstance3D + var kickplate := presentation.rink.get_node_or_null( + "Kickplate000" + ) as MeshInstance3D + _check(board != null, "rink has boards") + _check(kickplate != null, "boards sit on a kickplate") + if board != null and ice != null: + var board_material := board.material_override as StandardMaterial3D + var ice_material := ice.material_override as StandardMaterial3D + _check(board_material != null, "boards carry a material") + if board_material != null: + _check( + board_material.albedo_texture != null, + "board material carries the panel texture" + ) + _check( + board_material.uv1_world_triplanar, + "panel seams repeat in world space" + ) + if ice_material != null: + var gap := absf( + board_material.albedo_color.get_luminance() + - ice_material.albedo_color.get_luminance() + ) + _check( + gap >= 0.05, + "boards differ from the ice in brightness" + ) + if kickplate != null: + var kickplate_material := kickplate.material_override as StandardMaterial3D + _check( + kickplate_material != null + and kickplate_material.albedo_color.get_luminance() < 0.35, + "kickplate is dark enough to separate ice and boards" + ) _check( presentation.skater.get_child_count() > 0, "skater is instantiated"