diff --git a/scenes/utils/character.tscn b/scenes/utils/character.tscn index 5c14002..aa108b3 100644 --- a/scenes/utils/character.tscn +++ b/scenes/utils/character.tscn @@ -1,116 +1,26 @@ -[gd_scene load_steps=11 format=3 uid="uid://ccm77j5rkh21w"] +[gd_scene load_steps=6 format=3 uid="uid://ccm77j5rkh21w"] [ext_resource type="Script" path="res://scripts/character_controller.gd" id="1_sue4n"] -[ext_resource type="PackedScene" uid="uid://ceywbkneyatpw" path="res://scenes/utils/body.tscn" id="2_2couv"] [ext_resource type="PackedScene" uid="uid://bmqutwuj28san" path="res://scenes/utils/view_model_camera.tscn" id="4_al83x"] [ext_resource type="Script" path="res://scenes/weapon/pistol.gd" id="4_uwcjh"] [ext_resource type="PackedScene" uid="uid://d21giy40pnjhe" path="res://scenes/weapon/pistol.tscn" id="5_6k7rq"] -[ext_resource type="PackedScene" path="res://assets/models/character/character.glb" id="8_42pl8"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_adkee"] radius = 0.368364 -height = 1.0 - -[sub_resource type="Animation" id="Animation_rf8fv"] -resource_name = "Crouch" -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:shape:height") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [1.8, 1.0] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = false -tracks/1/path = NodePath(".:position") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector3(0, 0.9, 0), Vector3(0, 0.5, 0)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../UpperTorso:position") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector3(0, 1.2734, 0), Vector3(0, 0.639947, 0)] -} - -[sub_resource type="Animation" id="Animation_mgw3s"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:shape:height") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [1.0] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:position") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0, 0.9, 0)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../UpperTorso:position") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0, 1.2734, 0)] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mnir7"] -_data = { -"Crouch": SubResource("Animation_rf8fv"), -"RESET": SubResource("Animation_mgw3s") -} +height = 1.8 [node name="Character" type="Node3D"] [node name="CharacterBody3D" type="CharacterBody3D" parent="." node_paths=PackedStringArray("ANIMATION_PLAYER")] script = ExtResource("1_sue4n") -ANIMATION_PLAYER = NodePath("AnimationPlayer") +ANIMATION_PLAYER = NodePath("") [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] -transform = Transform3D(1, 0, 0, 0, 1.66022, 0, 0, 0, 0.967678, 0, 0.9, 0) +transform = Transform3D(1, 0, 0, 0, 1.42432, 0, 0, 0, 0.967678, 0, 1.27907, 0) shape = SubResource("CapsuleShape3D_adkee") -[node name="character" parent="CharacterBody3D" instance=ExtResource("2_2couv")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) -visible = false - [node name="UpperTorso" type="CSGSphere3D" parent="CharacterBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2734, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.71312, 0) radius = 0.001 [node name="ViewModelCamera" parent="CharacterBody3D/UpperTorso" instance=ExtResource("4_al83x")] @@ -121,15 +31,3 @@ script = ExtResource("4_uwcjh") transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.0287516, -0.136104, -0.276055) visible = false script = null - -[node name="AnimationPlayer" type="AnimationPlayer" parent="CharacterBody3D"] -root_node = NodePath("../CollisionShape3D") -libraries = { -"": SubResource("AnimationLibrary_mnir7") -} - -[node name="RealBody" type="Node3D" parent="CharacterBody3D"] -visible = false - -[node name="character2" parent="CharacterBody3D/RealBody" instance=ExtResource("8_42pl8")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -0.0147014)