diff --git a/rinkplanner/avatar.gd b/rinkplanner/scenes/rink/avatar.gd similarity index 100% rename from rinkplanner/avatar.gd rename to rinkplanner/scenes/rink/avatar.gd diff --git a/rinkplanner/avatar.gd.uid b/rinkplanner/scenes/rink/avatar.gd.uid similarity index 100% rename from rinkplanner/avatar.gd.uid rename to rinkplanner/scenes/rink/avatar.gd.uid diff --git a/rinkplanner/camera_3d.gd b/rinkplanner/scenes/rink/camera_3d.gd similarity index 100% rename from rinkplanner/camera_3d.gd rename to rinkplanner/scenes/rink/camera_3d.gd diff --git a/rinkplanner/camera_3d.gd.uid b/rinkplanner/scenes/rink/camera_3d.gd.uid similarity index 100% rename from rinkplanner/camera_3d.gd.uid rename to rinkplanner/scenes/rink/camera_3d.gd.uid diff --git a/rinkplanner/rink.tscn b/rinkplanner/scenes/rink/rink.tscn similarity index 92% rename from rinkplanner/rink.tscn rename to rinkplanner/scenes/rink/rink.tscn index 487c2bd..7392baf 100644 --- a/rinkplanner/rink.tscn +++ b/rinkplanner/scenes/rink/rink.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=13 format=3 uid="uid://cd1ulyybmuft5"] -[ext_resource type="Texture2D" uid="uid://d2f4ue6f2152o" path="res://assets/images/checkboard.png" id="1_aj6nb"] -[ext_resource type="Script" uid="uid://deq4wi2r1o4e4" path="res://avatar.gd" id="2_28a8u"] -[ext_resource type="Script" uid="uid://cbufos2esa5yu" path="res://camera_3d.gd" id="2_ytmxt"] -[ext_resource type="ArrayMesh" uid="uid://lqtpafx25sxi" path="res://assets/models/Flieger.obj" id="3_28a8u"] +[ext_resource type="Texture2D" uid="uid://d2f4ue6f2152o" path="res://assets/images/checkboard.png" id="1_pkikb"] +[ext_resource type="Script" uid="uid://cbufos2esa5yu" path="res://scenes/rink/camera_3d.gd" id="2_3oeyx"] +[ext_resource type="Script" uid="uid://deq4wi2r1o4e4" path="res://scenes/rink/avatar.gd" id="3_dfx6t"] +[ext_resource type="ArrayMesh" uid="uid://lqtpafx25sxi" path="res://assets/models/Flieger.obj" id="4_qwf8l"] [sub_resource type="Curve3D" id="Curve3D_jm5wf"] closed = true @@ -23,7 +23,7 @@ albedo_color = Color(0, 0.267906, 0.269092, 1) albedo_texture = SubResource("CanvasTexture_ytmxt") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ytmxt"] -albedo_texture = ExtResource("1_aj6nb") +albedo_texture = ExtResource("1_pkikb") albedo_texture_force_srgb = true uv1_triplanar = true @@ -75,7 +75,7 @@ visible = false curve = SubResource("Curve3D_jm5wf") [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] -transform = Transform3D(0.557721, 0, -0.83002, 0, 0.999992, 0, 0.830022, 0, 0.55772, 0, 0, 6.50187) +transform = Transform3D(0.5577211, 0, -0.83002007, 0, 0.999992, 0, 0.83002186, 0, 0.5577199, 0, 0, 6.50187) [node name="CSGPolygon3D" type="CSGPolygon3D" parent="Path3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.56211, -3.94667, -15.3778) @@ -128,15 +128,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.985, 0, -9.146) [node name="Camera3D" type="Camera3D" parent="."] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 0.484031, 0.875051, 0, -0.875051, 0.484031, 0, 23.5809, 16.7921) -script = ExtResource("2_ytmxt") +script = ExtResource("2_3oeyx") [node name="CharacterBody3D" type="CharacterBody3D" parent="." node_paths=PackedStringArray("waypoints")] -script = ExtResource("2_28a8u") +script = ExtResource("3_dfx6t") waypoints = [NodePath("../Waypoints/Waypoint1"), NodePath("../Waypoints/Waypoint2"), NodePath("../Waypoints/Waypoint3"), NodePath("../Waypoints/Waypoint4")] [node name="Flieger" type="MeshInstance3D" parent="CharacterBody3D"] transform = Transform3D(-0.999657, 0, -0.026177, 0, 1, 0, 0.026177, 0, -0.999657, 0, 0.470388, 0) -mesh = ExtResource("3_28a8u") +mesh = ExtResource("4_qwf8l") skeleton = NodePath("../..") [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] diff --git a/rinkplanner/scenes/title/title.tscn b/rinkplanner/scenes/title/title.tscn new file mode 100644 index 0000000..6703c4a --- /dev/null +++ b/rinkplanner/scenes/title/title.tscn @@ -0,0 +1,36 @@ +[gd_scene format=3 uid="uid://c4myh7psuj5hy"] + +[node name="Control" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Title" type="Label" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 34 +text = "Rinkplanner" +horizontal_alignment = 1 + +[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 +alignment = 1 + +[node name="NewButton" type="Button" parent="VBoxContainer/VBoxContainer"] +layout_mode = 2 +text = "Neue Kür" + +[node name="LoadButton" type="Button" parent="VBoxContainer/VBoxContainer"] +layout_mode = 2 +text = "Kür laden" diff --git a/rinkplanner/skater.gd b/rinkplanner/skater.gd deleted file mode 100644 index 07e6770..0000000 --- a/rinkplanner/skater.gd +++ /dev/null @@ -1,28 +0,0 @@ -extends CharacterBody3D - -const SPEED = 5.0 -const JUMP_VELOCITY = 4.5 - -var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") - -func _physics_process(delta): - # Apply gravity - if not is_on_floor(): - velocity.y -= gravity * delta - - # Handle jump - if Input.is_action_just_pressed("ui_accept") and is_on_floor(): - velocity.y = JUMP_VELOCITY - - # Get input direction - var input_dir = Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down") - var direction = (transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized() - - if direction: - velocity.x = direction.x * SPEED - velocity.z = direction.z * SPEED - else: - velocity.x = move_toward(velocity.x, 0, SPEED) - velocity.z = move_toward(velocity.z, 0, SPEED) - - move_and_slide() diff --git a/rinkplanner/skater.gd.uid b/rinkplanner/skater.gd.uid deleted file mode 100644 index ca15743..0000000 --- a/rinkplanner/skater.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://db1ra4er3lrbr diff --git a/rinkplanner/skater.tscn b/rinkplanner/skater.tscn deleted file mode 100644 index 6b649a7..0000000 --- a/rinkplanner/skater.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://cpdnvt3u4bkfi"] - -[ext_resource type="PackedScene" uid="uid://prh35jb6tjtd" path="res://addons/gdquest_sophia/sophia_skin.tscn" id="1_j83vg"] -[ext_resource type="Script" uid="uid://db1ra4er3lrbr" path="res://skater.gd" id="1_vo2sv"] -[ext_resource type="Script" uid="uid://cbufos2esa5yu" path="res://camera_3d.gd" id="3_cg4j7"] - -[sub_resource type="CylinderShape3D" id="CylinderShape3D_jm5wf"] -height = 1.65 -radius = 0.4 - -[node name="skater" type="CharacterBody3D"] -script = ExtResource("1_vo2sv") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="."] -shape = SubResource("CylinderShape3D_jm5wf") - -[node name="SophiaSkin" parent="." instance=ExtResource("1_j83vg")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.766929, 0) - -[node name="CameraAnchor" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, 1.12031, 0) - -[node name="Camera3D" type="Camera3D" parent="CameraAnchor"] -transform = Transform3D(-0.677622, -0.234539, 0.697008, -0.666748, 0.59582, -0.447712, -0.310285, -0.768108, -0.560118, 0, 98.1232, 5.93962) -fov = 6.3 -script = ExtResource("3_cg4j7") diff --git a/workbench/blender/flip/flip_2268_2444/flip_2268_2444_Mixamo.fbx b/workbench/blender/flip/flip_2268_2444/flip_2268_2444_Mixamo.fbx new file mode 100644 index 0000000..e90861c Binary files /dev/null and b/workbench/blender/flip/flip_2268_2444/flip_2268_2444_Mixamo.fbx differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408.fbx b/workbench/blender/salchow/salchow0900-106/salchow0900-106_Mixamo.fbx similarity index 79% rename from workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408.fbx rename to workbench/blender/salchow/salchow0900-106/salchow0900-106_Mixamo.fbx index 220ad35..4dcc082 100644 Binary files a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408.fbx and b/workbench/blender/salchow/salchow0900-106/salchow0900-106_Mixamo.fbx differ diff --git a/workbench/videos/skating/extract/deleteme.txt b/workbench/videos/skating/extract/deleteme.txt deleted file mode 100644 index 8b13789..0000000 --- a/workbench/videos/skating/extract/deleteme.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/workbench/videos/skating/extract/flip/flip_2268_2444.mp4 b/workbench/videos/skating/extract/flip/flip_2268_2444.mp4 new file mode 100644 index 0000000..22b150f Binary files /dev/null and b/workbench/videos/skating/extract/flip/flip_2268_2444.mp4 differ diff --git a/workbench/videos/skating/extract/salchow/salchow0900-1065.mp4 b/workbench/videos/skating/extract/salchow/salchow0900-1065.mp4 new file mode 100644 index 0000000..32d8959 Binary files /dev/null and b/workbench/videos/skating/extract/salchow/salchow0900-1065.mp4 differ diff --git a/workbench/videos/skating/extract/toeloop/toeloop1408-1559.mp4 b/workbench/videos/skating/extract/toeloop/toeloop1408-1559.mp4 new file mode 100644 index 0000000..72b080c Binary files /dev/null and b/workbench/videos/skating/extract/toeloop/toeloop1408-1559.mp4 differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408_fixed.blend b/workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408_fixed.blend deleted file mode 100644 index d94e674..0000000 Binary files a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_1408_15591408_fixed.blend and /dev/null differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend b/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend deleted file mode 100644 index 1384514..0000000 Binary files a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend and /dev/null differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend1 b/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend1 deleted file mode 100644 index a9c55c0..0000000 Binary files a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.blend1 and /dev/null differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.fbx b/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.fbx deleted file mode 100644 index 90db061..0000000 Binary files a/workbench/videos/skating/extract/toeloop_1408_15/toeloop_rigtest.fbx and /dev/null differ diff --git a/workbench/videos/skating/extract/toeloop_1408_15591408-1559.mp4 b/workbench/videos/skating/extract/toeloop_1408_15591408-1559.mp4 deleted file mode 100644 index ed57c84..0000000 Binary files a/workbench/videos/skating/extract/toeloop_1408_15591408-1559.mp4 and /dev/null differ diff --git a/workbench/videos/skating/source/01_Figure_Skating_Jumps_explained.blend b/workbench/videos/skating/source/01_Figure_Skating_Jumps_explained.blend index 721febb..897e371 100644 Binary files a/workbench/videos/skating/source/01_Figure_Skating_Jumps_explained.blend and b/workbench/videos/skating/source/01_Figure_Skating_Jumps_explained.blend differ