Squashed commit of the following:

[william-skin.git] / player / player.tscn

diff --git a/player/player.tscn b/player/player.tscn
index 2aa179c34f55c7a4c8b89bcba29fc9fa3a0232ae..d9bcc61350332d3e50bf8f98ac4d0aa791daddbd 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -8,15 +8,15 @@
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2yjd0"]
 
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_ntdse"]
+radius = 4.0
+
 [sub_resource type="SphereShape3D" id="SphereShape3D_4dtvp"]
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_frf40"]
 dof_blur_far_enabled = true
 dof_blur_far_distance = 20.0
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_ntdse"]
-radius = 5.0
-
 [node name="player" type="CharacterBody3D"]
 script = ExtResource("1_h17j6")
 camera_mode = "unlocked"
@@ -29,6 +29,13 @@ shape = SubResource("CapsuleShape3D_2yjd0")
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 
+[node name="headTurn" type="Area3D" parent="WilliamSkin"]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 0, 0)
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="WilliamSkin/headTurn"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -3.91559)
+shape = SubResource("CylinderShape3D_ntdse")
+
 [node name="cameraPivot" type="Node3D" parent="."]
 
 [node name="SpringArm3D" type="SpringArm3D" parent="cameraPivot"]
@@ -39,14 +46,9 @@ shape = SubResource("SphereShape3D_4dtvp")
 attributes = SubResource("CameraAttributesPractical_frf40")
 fov = 80.0
 
-[node name="headTurn" type="Area3D" parent="."]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="headTurn"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
-shape = SubResource("CylinderShape3D_ntdse")
-
 [node name="DebugOverlay" type="CanvasLayer" parent="."]
 unique_name_in_owner = true
+visible = false
 script = ExtResource("3_lokna")
 
 [node name="DebugDraw3D" type="Control" parent="DebugOverlay"]
@@ -64,5 +66,5 @@ script = ExtResource("5_n0cdm")
 [node name="VBoxContainer" type="VBoxContainer" parent="DebugOverlay/DebugStats"]
 layout_mode = 2
 
-[connection signal="area_entered" from="headTurn" to="." method="_on_head_turn_area_entered"]
-[connection signal="area_exited" from="headTurn" to="." method="_on_head_turn_area_exited"]
+[connection signal="area_entered" from="WilliamSkin/headTurn" to="." method="_on_head_turn_area_entered"]
+[connection signal="area_exited" from="WilliamSkin/headTurn" to="." method="_on_head_turn_area_exited"]