diff --git a/.gitignore b/.gitignore index 4450cb5..d61d50b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ .export/ *.translation prefs.json -.claude/worktrees/ +.claude/ +research/personal/ diff --git a/scenes/main.tscn b/scenes/main.tscn index ef1d8a9..2b9cf65 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,17 +1,16 @@ -[gd_scene load_steps=22 format=3] +[gd_scene format=3 uid="uid://dy3bqxairm8lu"] -[ext_resource type="Script" path="res://scripts/Main.cs" id="1_main"] -[ext_resource type="PackedScene" path="res://scenes/teleport_marker.tscn" id="2_marker"] -[ext_resource type="Script" path="res://scripts/Locomotion.cs" id="3_locomotion"] -[ext_resource type="Script" path="res://scripts/WorldPanel.cs" id="4_worldpanel"] -[ext_resource type="Script" path="res://scripts/AnchorMoveMode.cs" id="5_anchormove"] -[ext_resource type="Script" path="res://scripts/PropShop.cs" id="6_propshop"] -[ext_resource type="Script" path="res://scripts/PropGrabber.cs" id="7_propgrabber"] -[ext_resource type="Script" path="res://scripts/Calibration.cs" id="12_calibration"] -[ext_resource type="Script" path="res://scripts/TrueBody.cs" id="13_truebody"] -[ext_resource type="Script" path="res://scripts/PlayerRig.cs" id="14_playerrig"] +[ext_resource type="Script" uid="uid://dsy2jm1gdcao0" path="res://scripts/Main.cs" id="1_main"] +[ext_resource type="Script" uid="uid://be6cxrxsc202g" path="res://scripts/Locomotion.cs" id="3_locomotion"] +[ext_resource type="Script" uid="uid://babrdgj2luqwv" path="res://scripts/WorldPanel.cs" id="4_worldpanel"] +[ext_resource type="Script" uid="uid://00dofwddtngn" path="res://scripts/AnchorMoveMode.cs" id="5_anchormove"] +[ext_resource type="Script" uid="uid://dathgkdgedhrj" path="res://scripts/PropShop.cs" id="6_propshop"] +[ext_resource type="Script" uid="uid://70m2rsbntlm4" path="res://scripts/PropGrabber.cs" id="7_propgrabber"] +[ext_resource type="Script" uid="uid://uniaovn6oy51" path="res://scripts/Calibration.cs" id="12_calibration"] +[ext_resource type="Script" uid="uid://cr1somauqye6" path="res://scripts/TrueBody.cs" id="13_truebody"] +[ext_resource type="Script" uid="uid://n62b8ehiuaeb" path="res://scripts/PlayerRig.cs" id="14_playerrig"] [ext_resource type="PackedScene" path="res://scenes/maps/playground.tscn" id="15_playground"] -[ext_resource type="PackedScene" path="res://scenes/maps/crag.tscn" id="16_crag"] +[ext_resource type="PackedScene" uid="uid://dbotaq78lap70" path="res://scenes/maps/crag.tscn" id="16_crag"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.66, 0.72, 0.81, 1) @@ -24,6 +23,9 @@ sky_material = SubResource("ProceduralSkyMaterial_sky") background_mode = 2 sky = SubResource("Sky_main") +[sub_resource type="BoxShape3D" id="BoxShape_floor"] +size = Vector3(80, 0.1, 80) + [sub_resource type="StandardMaterial3D" id="Material_floor"] albedo_color = Color(0.35, 0.35, 0.38, 1) @@ -31,110 +33,83 @@ albedo_color = Color(0.35, 0.35, 0.38, 1) material = SubResource("Material_floor") size = Vector2(80, 80) -[sub_resource type="BoxShape3D" id="BoxShape_floor"] -size = Vector3(80, 0.1, 80) - -[sub_resource type="SphereMesh" id="SphereMesh_hand"] -radius = 0.04 -height = 0.08 - -[sub_resource type="StandardMaterial3D" id="Material_hand_left"] -albedo_color = Color(0.9, 0.3, 0.35, 1) - -[sub_resource type="StandardMaterial3D" id="Material_hand_right"] -albedo_color = Color(0.3, 0.5, 0.9, 1) - -[node name="Main" type="Node3D"] +[node name="Main" type="Node3D" unique_id=1909672424] script = ExtResource("1_main") -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=2031010393] environment = SubResource("Environment_main") -[node name="Sun" type="DirectionalLight3D" parent="."] +[node name="Sun" type="DirectionalLight3D" parent="." unique_id=432080936] transform = Transform3D(1, 0, 0, 0, 0.642788, 0.766044, 0, -0.766044, 0.642788, 0, 8, 0) shadow_enabled = true -directional_shadow_max_distance = 10.0 shadow_bias = 0.04 shadow_normal_bias = 0.5 +directional_shadow_split_1 = 0.021 +directional_shadow_split_2 = 0.141 -[node name="Floor" type="StaticBody3D" parent="." groups=["no_grab"]] +[node name="Floor" type="StaticBody3D" parent="." unique_id=777163049 groups=["no_grab"]] collision_mask = 29 -[node name="FloorShape" type="CollisionShape3D" parent="Floor"] +[node name="FloorShape" type="CollisionShape3D" parent="Floor" unique_id=809623835] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0) shape = SubResource("BoxShape_floor") -[node name="FloorMesh" type="MeshInstance3D" parent="Floor"] +[node name="FloorMesh" type="MeshInstance3D" parent="Floor" unique_id=256794069] mesh = SubResource("PlaneMesh_floor") -[node name="XROrigin3D" type="XROrigin3D" parent="."] +[node name="XROrigin3D" type="XROrigin3D" parent="." unique_id=1331283556] physics_interpolation_mode = 2 -[node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D"] +[node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D" unique_id=1255391558] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0) -[node name="LeftHand" type="XRController3D" parent="XROrigin3D"] +[node name="LeftHand" type="XRController3D" parent="XROrigin3D" unique_id=2026728916] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1, -0.5) tracker = &"left_hand" -pose = &"default" -[node name="RightHand" type="XRController3D" parent="XROrigin3D"] +[node name="RightHand" type="XRController3D" parent="XROrigin3D" unique_id=1389872386] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1, -0.5) tracker = &"right_hand" -pose = &"default" -[node name="WorldPanel" type="Node3D" parent="XROrigin3D"] +[node name="WorldPanel" type="Node3D" parent="XROrigin3D" unique_id=1603972303] script = ExtResource("4_worldpanel") -[node name="SpawnPoint" type="Marker3D" parent="."] +[node name="SpawnPoint" type="Marker3D" parent="." unique_id=423410557] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.5) -[node name="TeleportMarkers" type="Node3D" parent="."] - -[node name="Marker1" parent="TeleportMarkers" instance=ExtResource("2_marker")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, -3) -MarkerLabel = "1" - -[node name="Marker2" parent="TeleportMarkers" instance=ExtResource("2_marker")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 0, -3) -MarkerLabel = "2" - -[node name="Marker3" parent="TeleportMarkers" instance=ExtResource("2_marker")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4) -MarkerLabel = "3" - -[node name="Locomotion" type="Node" parent="."] +[node name="Locomotion" type="Node" parent="." unique_id=1254803967] script = ExtResource("3_locomotion") -[node name="AnchorMoveMode" type="Node" parent="."] +[node name="AnchorMoveMode" type="Node" parent="." unique_id=501015667] script = ExtResource("5_anchormove") -[node name="Playground" parent="." instance=ExtResource("15_playground")] +[node name="Playground" parent="." unique_id=75577887 instance=ExtResource("15_playground")] -[node name="Crag" parent="." instance=ExtResource("16_crag")] +[node name="Crag" parent="." unique_id=1556412935 instance=ExtResource("16_crag")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.016632557, 0, -0.0011329651) -[node name="PropShop" type="Node3D" parent="."] +[node name="PropShop" type="Node3D" parent="." unique_id=2025490553] script = ExtResource("6_propshop") -[node name="PropGrabber" type="Node" parent="."] +[node name="PropGrabber" type="Node" parent="." unique_id=36341590] script = ExtResource("7_propgrabber") -[node name="Calibration" type="Node" parent="."] +[node name="Calibration" type="Node" parent="." unique_id=701360651] script = ExtResource("12_calibration") -[node name="TrueBody" type="Node3D" parent="."] +[node name="TrueBody" type="Node3D" parent="." unique_id=851816669] physics_interpolation_mode = 2 script = ExtResource("13_truebody") -[node name="PlayerRig" type="Node" parent="."] +[node name="PlayerRig" type="Node" parent="." unique_id=506216051] physics_interpolation_mode = 2 script = ExtResource("14_playerrig") -[node name="FadeLayer" type="CanvasLayer" parent="."] +[node name="FadeLayer" type="CanvasLayer" parent="." unique_id=950278420] -[node name="Fade" type="ColorRect" parent="FadeLayer"] +[node name="Fade" type="ColorRect" parent="FadeLayer" unique_id=774436280] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -color = Color(0, 0, 0, 0) mouse_filter = 2 +color = Color(0, 0, 0, 0) diff --git a/scenes/maps/crag.tscn b/scenes/maps/crag.tscn index f61b132..bc28e87 100644 --- a/scenes/maps/crag.tscn +++ b/scenes/maps/crag.tscn @@ -1,8 +1,6 @@ -[gd_scene format=3] +[gd_scene format=3 uid="uid://dbotaq78lap70"] -[ext_resource type="Script" path="res://scripts/Crag.cs" id="1"] -[ext_resource type="PackedScene" path="res://scenes/teleport_marker.tscn" id="2_v0m8b"] -[ext_resource type="Script" path="res://scripts/TeleportMarker.cs" id="3_s3tp4"] +[ext_resource type="Script" uid="uid://cqeckjtcuntlv" path="res://scripts/Crag.cs" id="1"] [sub_resource type="BoxShape3D" id="BoxShape3D_v0m8b"] size = Vector3(12, 8, 7) @@ -4123,11 +4121,6 @@ billboard = 2 text = "The Crag — 26 m" font_size = 96 -[node name="CragMarker" type="Node3D" parent="." unique_id=1762871811 instance=ExtResource("2_v0m8b")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0, -9.5) -script = ExtResource("3_s3tp4") -MarkerLabel = "Crag" - [node name="SummitCrate0" type="RigidBody3D" parent="." unique_id=85171181 groups=["prop"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 26.2, -17.2) collision_mask = 29