diff --git a/addons/fpc/character.gd b/addons/fpc/character.gd index 22d4197..31b99f3 100644 --- a/addons/fpc/character.gd +++ b/addons/fpc/character.gd @@ -313,9 +313,10 @@ func headbob_animation(moving): # This code is extremely performant but it makes no sense. else: - if HEADBOB_ANIMATION.is_playing(): - HEADBOB_ANIMATION.play("RESET", 0.25) + if HEADBOB_ANIMATION.current_animation == "sprint" or HEADBOB_ANIMATION.current_animation == "walk": + print("reset here") HEADBOB_ANIMATION.speed_scale = 1 + HEADBOB_ANIMATION.play("RESET", 1) func _process(delta): diff --git a/addons/fpc/character.tscn b/addons/fpc/character.tscn index 34159db..5a08b1a 100644 --- a/addons/fpc/character.tscn +++ b/addons/fpc/character.tscn @@ -174,17 +174,6 @@ tracks/1/keys = { "points": PackedFloat32Array(0, -0.25, 0, 0.25, 0), "times": PackedFloat32Array(0) } -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Camera:position:z") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) -} [sub_resource type="Animation" id="Animation_8ku67"] resource_name = "sprint" @@ -212,17 +201,6 @@ tracks/1/keys = { "points": PackedFloat32Array(0.05, -0.25, 0, 0.2, -0.01, 0, -0.2, 0.000186046, 0.2, 0.000186046, 0.05, -0.2, -0.01, 0.2, -0.01, 0, -0.2, 0, 0.2, 0, 0.05, -0.2, -0.01, 0.25, 0), "times": PackedFloat32Array(0, 0.5, 1, 1.5, 2) } -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Camera:position:z") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0, 0, 0, 0, 0), -"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.5, 1, 1.5, 2) -} [sub_resource type="Animation" id="Animation_lrqmv"] resource_name = "walk" @@ -250,17 +228,6 @@ tracks/1/keys = { "points": PackedFloat32Array(-0.05, -0.25, 0, 0.2, 0.005, 0, -0.2, 0.000186046, 0.2, 0.000186046, -0.05, -0.2, 0.005, 0.2, 0.005, 0, -0.2, 0, 0.2, 0, -0.05, -0.2, 0.005, 0.25, 0), "times": PackedFloat32Array(0, 0.5, 1, 1.5, 2) } -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("Camera:position:z") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0, 0, 0, 0, 0), -"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.5, 1, 1.5, 2) -} [sub_resource type="AnimationLibrary" id="AnimationLibrary_o0unb"] _data = { @@ -281,7 +248,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector3(0.0349066, 0, 0)] +"values": [Vector3(0, 0, 0)] } tracks/1/type = "value" tracks/1/imported = false @@ -413,7 +380,7 @@ libraries = { transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) [node name="Camera" type="Camera3D" parent="Head"] -transform = Transform3D(1, 0, 0, 0, 0.999391, -0.0348995, 0, 0.0348995, 0.999391, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) [node name="HeadbobAnimation" type="AnimationPlayer" parent="Head"] libraries = { diff --git a/test_world.tscn b/test_world.tscn index e902043..b6901b9 100644 --- a/test_world.tscn +++ b/test_world.tscn @@ -65,9 +65,6 @@ uv1_triplanar_sharpness = 0.000850145 [node name="Character" parent="." instance=ExtResource("1_e18vq")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) -[node name="Camera" parent="Character/Head" index="0"] -transform = Transform3D(1, 0, 0, 0, 0.999391, -0.0348995, 0, 0.0348995, 0.999391, 0, 0, 0) - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_20rw3") @@ -107,5 +104,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, -15.5) use_collision = true size = Vector3(19, 8, 1) material = SubResource("StandardMaterial3D_7j4uu") - -[editable path="Character"]