diff --git a/scene/gpu_particles_3d.tscn b/scene/gpu_particles_3d.tscn index 28c976c..450bdc2 100644 --- a/scene/gpu_particles_3d.tscn +++ b/scene/gpu_particles_3d.tscn @@ -6,6 +6,7 @@ emission_shape_scale = Vector3(0.05, 0.05, 0.05) emission_shape = 1 emission_sphere_radius = 1.0 gravity = Vector3(0, -20, 0) +damping_max = 30.0 turbulence_enabled = true turbulence_noise_strength = 0.1 turbulence_noise_scale = 0.1 diff --git a/scene/player.tscn b/scene/player.tscn index 7b18b83..7707ace 100644 --- a/scene/player.tscn +++ b/scene/player.tscn @@ -17,26 +17,26 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("MainHugues:position") +tracks/0/path = NodePath("MainHugues:rotation") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector3(0.252187, 0, 0)] +"values": [Vector3(0, 0, -1.5708)] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("MainHugues:rotation") +tracks/1/path = NodePath("MainHugues: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, -1.5708)] +"values": [Vector3(0.252187, 0, 0)] } tracks/2/type = "value" tracks/2/imported = false @@ -60,35 +60,35 @@ tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [true] +"values": [false] } [sub_resource type="Animation" id="Animation_njhrs"] resource_name = "finger" -length = 7.0 +length = 4.5 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("MainHugues:position") +tracks/0/path = NodePath("MainHugues:rotation") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.5, 1, 1.26667, 1.5, 2, 5.03333, 7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"times": PackedFloat32Array(0.166667, 0.433333, 0.933333, 3.53333, 4.03333), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), "update": 0, -"values": [Vector3(0.252187, 0, 0), Vector3(0.252187, 0, -0.254602), Vector3(0.000633344, 0.311501, -0.254602), Vector3(0.000633359, 0.156883, -0.254602), Vector3(0.173339, 0.156883, -0.143999), Vector3(0.173339, 0.768297, -0.143999), Vector3(0.173339, 0.768297, -0.143999), Vector3(0.252187, 0, 0)] +"values": [Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00872665, -4.87645, 1.5708), Vector3(0.00872665, -4.87645, 1.5708), Vector3(0.00872665, 1.40674, 1.5708)] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("MainHugues:rotation") +tracks/1/path = NodePath("MainHugues:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 0.5, 1, 1.26667, 1.5, 2, 5.03333, 7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"times": PackedFloat32Array(0.166667, 0.433333, 0.933333, 3.53333, 4.03333), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), "update": 0, -"values": [Vector3(0, 0, -1.5708), Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00877896, -1.57553, 1.5708), Vector3(0.00877896, -2.96647, 1.5708), Vector3(0.00877896, -2.96647, 1.5708), Vector3(0, 0, -1.5708)] +"values": [Vector3(0.000633344, 0.311501, -0.254602), Vector3(0.000633359, 0.156883, -0.254602), Vector3(0.173339, 0.317806, -0.445379), Vector3(0.173339, 0.317806, -0.445379), Vector3(0.173339, -0.040048, -0.224093)] } tracks/2/type = "value" tracks/2/imported = false @@ -97,7 +97,7 @@ tracks/2/path = NodePath("GPUParticles3D:emitting") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 2.03333, 7), +"times": PackedFloat32Array(0, 1.1, 3.83333), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [false, true, false] @@ -109,10 +109,10 @@ tracks/3/path = NodePath("MainHugues:visible") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0, 0.5, 4.96667, 7), -"transitions": PackedFloat32Array(1, 1, 1, 1), +"times": PackedFloat32Array(0.133333, 4.5), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [false, true, false, false] +"values": [true, false] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_jrykd"] @@ -131,6 +131,7 @@ anim = NodePath("AnimationPlayer") particules = NodePath("GPUParticles3D") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(0.999917, 0, 0.0128802, 0, 1, 0, -0.0128802, 0, 0.999917, 0, 0, 0) shape = SubResource("CapsuleShape3D_d8bnp") [node name="head" type="Node3D" parent="."] @@ -146,7 +147,7 @@ material_override = SubResource("StandardMaterial3D_ohrfw") mesh = SubResource("CapsuleMesh_ha068") [node name="GPUParticles3D" parent="." instance=ExtResource("2_ctykj")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.181584, 1.08362, -0.121582) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.149993, 0.627285, -0.43281) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { @@ -154,4 +155,5 @@ libraries = { } [node name="MainHugues" parent="." instance=ExtResource("3_wfafm")] -transform = Transform3D(-2.18557e-09, 0.05, 0, -0.05, -2.18557e-09, 0, 0, 0, 0.05, 0.252187, 0, 0) +transform = Transform3D(-2.18557e-09, 0.05, 0, -0.0499999, -2.18557e-09, 0, 0, 0, 0.05, 0.252187, 0, 0) +visible = false diff --git a/script/player.gd b/script/player.gd index 6bf5e71..73f7578 100644 --- a/script/player.gd +++ b/script/player.gd @@ -22,9 +22,9 @@ func _ready() -> void: func _input(event: InputEvent) -> void: if event is InputEventMouseMotion: - head.rotate_x(-event.relative.y * SENSI) + #head.rotate_x(-event.relative.y * SENSI) rotate_y(-event.relative.x * SENSI) - head.rotation.x = clamp(head.rotation.x, -PI/2, PI/2) + #head.rotation.x = clamp(head.rotation.x, -PI/2, PI/2) func _physics_process(delta: float) -> void: time_hand += delta