diff --git a/AMSG_Examples/Character/mixamo_character.tscn b/AMSG_Examples/Character/mixamo_character.tscn index 9c10c6b..25a9beb 100644 --- a/AMSG_Examples/Character/mixamo_character.tscn +++ b/AMSG_Examples/Character/mixamo_character.tscn @@ -255,7 +255,7 @@ nodes/standing/node = SubResource("AnimationNodeStateMachine_ieguh") nodes/standing/position = Vector2(-120, 40) node_connections = [&"output", 0, &"crouch", &"crouch", 0, &"standing", &"crouch", 1, &"crouching"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_xi71d"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_uekge"] resource_local_to_scene = true nodes/AnimTurnLeft/node = SubResource("AnimationNodeAnimation_mb2kt") nodes/AnimTurnLeft/position = Vector2(500, 1540) @@ -274,9 +274,9 @@ nodes/VelocityDirection/position = Vector2(680, 1400) nodes/output/position = Vector2(1540, 1400) node_connections = [&"output", 0, &"InAir", &"InAir", 0, &"Turn", &"InAir", 1, &"FallAnimation", &"RightOrLeft", 0, &"AnimTurnLeft", &"RightOrLeft", 1, &"AnimTurnRight", &"Turn", 0, &"VelocityDirection", &"Turn", 1, &"RightOrLeft"] -[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_f6tfm"] +[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_2cqd5"] -[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_a2sin"] +[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_5kb4e"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_70w0s"] resource_local_to_scene = true @@ -535,14 +535,14 @@ aim_standing_data = ExtResource("2_c4o7m") aim_crouch_data = ExtResource("3_p3fng") [node name="AnimationTree" parent="." node_paths=PackedStringArray("movement_script") instance=ExtResource("3_86f8p")] -tree_root = SubResource("AnimationNodeBlendTree_xi71d") +tree_root = SubResource("AnimationNodeBlendTree_uekge") anim_player = NodePath("../AnimationPlayer") active = true parameters/VelocityDirection/crouch/current_state = "" parameters/VelocityDirection/crouch/transition_request = "" parameters/VelocityDirection/crouch/current_index = 0 -parameters/VelocityDirection/crouching/playback = SubResource("AnimationNodeStateMachinePlayback_f6tfm") -parameters/VelocityDirection/standing/playback = SubResource("AnimationNodeStateMachinePlayback_a2sin") +parameters/VelocityDirection/crouching/playback = SubResource("AnimationNodeStateMachinePlayback_2cqd5") +parameters/VelocityDirection/standing/playback = SubResource("AnimationNodeStateMachinePlayback_5kb4e") parameters/VelocityDirection/standing/Jog/FB/current_state = "" parameters/VelocityDirection/standing/Jog/FB/transition_request = "Forward" parameters/VelocityDirection/standing/Jog/FB/current_index = 0 @@ -552,11 +552,12 @@ parameters/VelocityDirection/standing/Walk/FB/transition_request = "Backward" parameters/VelocityDirection/standing/Walk/FB/current_index = 0 movement_script = NodePath("../CharacterMovementComponent") -[node name="CameraComponent" type="Node" parent="." node_paths=PackedStringArray("SpringArm", "Camera", "PlayerRef")] +[node name="CameraComponent" type="Node" parent="." node_paths=PackedStringArray("SpringArm", "Camera", "PlayerRef", "first_person_camera_bone")] script = ExtResource("2_d5854") SpringArm = NodePath("../SpringArm3D") Camera = NodePath("../SpringArm3D/Camera") PlayerRef = NodePath("../CharacterMovementComponent") +first_person_camera_bone = NodePath("../Armature/Skeleton3D/BoneAttachment3D") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) @@ -569,43 +570,43 @@ bones/0/name = "Hips" bones/0/parent = -1 bones/0/rest = Transform3D(0.544576, -0.0348814, -0.837986, 0.0102475, 0.999337, -0.0349382, 0.838649, 0.0104393, 0.544573, -0.000172998, 0.901879, -0.00179914) bones/0/enabled = true -bones/0/position = Vector3(0.00121861, 0.928669, -0.00434813) -bones/0/rotation = Quaternion(-0.0371539, -0.371496, -0.0133176, 0.927595) +bones/0/position = Vector3(0.0046573, 0.928532, -0.00704415) +bones/0/rotation = Quaternion(-0.0388708, -0.367714, -0.0143724, 0.929015) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Spine" bones/1/parent = 0 bones/1/rest = Transform3D(0.99963, -0.0129189, 0.0239171, 0.01122, 0.997494, 0.0698543, -0.0247596, -0.0695601, 0.99727, 4.88944e-09, 0.0992349, -0.0122733) bones/1/enabled = true bones/1/position = Vector3(4.88944e-09, 0.0992349, -0.0122733) -bones/1/rotation = Quaternion(-0.0116885, 0.0401141, -0.00577612, 0.99911) +bones/1/rotation = Quaternion(-0.0108126, 0.0405103, -0.00590771, 0.999103) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Spine1" bones/2/parent = 1 bones/2/rest = Transform3D(0.99985, -0.015446, 0.00786788, 0.0155655, 0.999761, -0.0153596, -0.00762876, 0.0154798, 0.999851, -2.79397e-09, 0.11732, 1.86265e-09) bones/2/enabled = true bones/2/position = Vector3(-2.79397e-09, 0.11732, 1.86265e-09) -bones/2/rotation = Quaternion(0.098932, 0.0813496, -0.00803722, 0.991731) +bones/2/rotation = Quaternion(0.0997541, 0.0822027, -0.00811827, 0.991578) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Spine2" bones/3/parent = 2 bones/3/rest = Transform3D(0.999844, -0.014346, 0.0103258, 0.0156141, 0.990645, -0.135571, -0.00828427, 0.135711, 0.990714, -2.79397e-09, 0.134588, -2.51457e-08) bones/3/enabled = true bones/3/position = Vector3(-2.79397e-09, 0.134588, -2.51457e-08) -bones/3/rotation = Quaternion(0.158428, 0.0808123, -0.0129405, 0.983973) +bones/3/rotation = Quaternion(0.159445, 0.0815607, -0.0131101, 0.983745) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Neck" bones/4/parent = 3 bones/4/rest = Transform3D(0.968778, 0.12654, 0.213204, -0.00181599, 0.863542, -0.504273, -0.247921, 0.488142, 0.836811, 2.48197e-07, 0.150325, 0.00792907) bones/4/enabled = true bones/4/position = Vector3(2.48197e-07, 0.150325, 0.00792907) -bones/4/rotation = Quaternion(0.121201, -0.00966527, 0.00171226, 0.99258) +bones/4/rotation = Quaternion(0.115686, -0.0106419, 0.00349793, 0.993223) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Head" bones/5/parent = 4 bones/5/rest = Transform3D(0.840773, 0.330252, 0.428993, -0.33245, 0.940342, -0.0723432, -0.427291, -0.0817944, 0.900406, 5.58794e-09, 0.107895, 5.21541e-08) bones/5/enabled = true bones/5/position = Vector3(5.58794e-09, 0.107895, 5.21541e-08) -bones/5/rotation = Quaternion(-0.0168695, 0.166462, -0.0626841, 0.983909) +bones/5/rotation = Quaternion(-0.0349443, 0.164478, -0.0666652, 0.983505) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "HeadTop_End" bones/6/parent = 5 @@ -633,42 +634,42 @@ bones/9/parent = 3 bones/9/rest = Transform3D(-0.250988, 0.959361, -0.128958, 0.025503, -0.126623, -0.991623, -0.967654, -0.252174, 0.0073142, 0.0610582, 0.0911044, 0.00705553) bones/9/enabled = true bones/9/position = Vector3(0.0610582, 0.0911044, 0.00705553) -bones/9/rotation = Quaternion(-0.490264, -0.520345, 0.57195, -0.402189) +bones/9/rotation = Quaternion(-0.490549, -0.519819, 0.571963, -0.402502) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "LeftArm" bones/10/parent = 9 bones/10/rest = Transform3D(0.845869, -0.51692, -0.131522, 0.093338, 0.386222, -0.917671, 0.52516, 0.763954, 0.374941, 7.45058e-09, 0.129223, 3.95812e-08) bones/10/enabled = true bones/10/position = Vector3(7.45058e-09, 0.129223, 3.95812e-08) -bones/10/rotation = Quaternion(0.519103, -0.0825372, 0.145915, 0.83811) +bones/10/rotation = Quaternion(0.523509, -0.0831806, 0.144218, 0.835596) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "LeftForeArm" bones/11/parent = 10 bones/11/rest = Transform3D(0.138967, -0.989426, 0.0415226, 0.989436, 0.140472, 0.0358277, -0.0412816, 0.0361051, 0.998495, -4.47035e-08, 0.274229, -7.45058e-09) bones/11/enabled = true bones/11/position = Vector3(-4.47035e-08, 0.274229, -7.45058e-09) -bones/11/rotation = Quaternion(-0.0107545, 0.0937809, 0.443235, 0.891422) +bones/11/rotation = Quaternion(-0.0122892, 0.0917405, 0.443377, 0.891543) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "LeftHand" bones/12/parent = 11 bones/12/rest = Transform3D(0.746359, -0.304314, 0.591895, 0.184003, 0.949028, 0.255908, -0.639601, -0.0820888, 0.764311, 6.0536e-09, 0.276326, -1.49012e-08) bones/12/enabled = true bones/12/position = Vector3(6.0536e-09, 0.276326, -1.49012e-08) -bones/12/rotation = Quaternion(-0.160278, 0.123054, -0.00734542, 0.979344) +bones/12/rotation = Quaternion(-0.118116, 0.122339, -0.0073744, 0.985407) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "LeftHandMiddle1" bones/13/parent = 12 bones/13/rest = Transform3D(0.98654, 0.118644, -0.112532, -0.118809, 0.0472127, -0.991794, -0.112357, 0.991814, 0.0606732, -3.12924e-07, 0.127755, -7.63685e-08) bones/13/enabled = true bones/13/position = Vector3(-3.12924e-07, 0.127755, -7.63685e-08) -bones/13/rotation = Quaternion(0.132066, 0.00519045, -0.080583, 0.987946) +bones/13/rotation = Quaternion(0.130353, 0.00516825, -0.0806636, 0.988167) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "LeftHandMiddle2" bones/14/parent = 13 bones/14/rest = Transform3D(0.980685, 0.110739, -0.161229, -0.112737, -0.353585, -0.928584, -0.159838, 0.928824, -0.334271, -7.45058e-09, 0.0361397, -5.21541e-08) bones/14/enabled = true bones/14/position = Vector3(-7.45058e-09, 0.0361397, -5.21541e-08) -bones/14/rotation = Quaternion(0.193515, -0.00134406, 0.0147534, 0.980986) +bones/14/rotation = Quaternion(0.193591, -0.00134108, 0.0147623, 0.98097) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "LeftHandMiddle3" bones/15/parent = 14 @@ -689,14 +690,14 @@ bones/17/parent = 12 bones/17/rest = Transform3D(0.922249, -0.296379, 0.248225, 0.374682, 0.843413, -0.385056, -0.0952333, 0.448123, 0.888885, -0.0300309, 0.0378879, 0.0216701) bones/17/enabled = true bones/17/position = Vector3(-0.0300309, 0.0378879, 0.0216701) -bones/17/rotation = Quaternion(0.288844, 0.115154, 0.182259, 0.932787) +bones/17/rotation = Quaternion(0.291029, 0.116526, 0.176806, 0.932986) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "LeftHandThumb2" bones/18/parent = 17 bones/18/rest = Transform3D(0.793061, 0.491162, -0.360297, -0.562049, 0.818065, -0.121947, 0.234851, 0.299216, 0.924832, 1.19209e-07, 0.0474499, -2.44938e-07) bones/18/enabled = true bones/18/position = Vector3(1.19209e-07, 0.0474499, -2.44938e-07) -bones/18/rotation = Quaternion(-0.00544676, 0.00129682, -0.00144173, 0.999983) +bones/18/rotation = Quaternion(-0.00513924, 0.00128102, -0.00161039, 0.999985) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "LeftHandThumb3" bones/19/parent = 18 @@ -717,14 +718,14 @@ bones/21/parent = 12 bones/21/rest = Transform3D(0.983723, 0.142189, -0.109869, -0.119058, 0.0577917, -0.991204, -0.134589, 0.988151, 0.0737798, -0.0282207, 0.122666, 0.00231682) bones/21/enabled = true bones/21/position = Vector3(-0.0282207, 0.122666, 0.00231682) -bones/21/rotation = Quaternion(0.0605513, -0.00483723, 0.062862, 0.996172) +bones/21/rotation = Quaternion(0.0475941, -0.00737054, 0.0610451, 0.996972) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "LeftHandIndex2" bones/22/parent = 21 bones/22/rest = Transform3D(0.978949, 0.10384, -0.175717, -0.111366, -0.44972, -0.8862, -0.171047, 0.887113, -0.428688, 1.11759e-07, 0.0389198, -5.96046e-08) bones/22/enabled = true bones/22/position = Vector3(1.11759e-07, 0.0389198, -5.96046e-08) -bones/22/rotation = Quaternion(0.185155, -0.00176768, -0.00161499, 0.982707) +bones/22/rotation = Quaternion(0.148575, -0.00087253, -0.00615875, 0.988882) bones/22/scale = Vector3(1, 1, 1) bones/23/name = "LeftHandIndex3" bones/23/parent = 22 @@ -745,14 +746,14 @@ bones/25/parent = 12 bones/25/rest = Transform3D(0.991492, 0.0540781, -0.118406, -0.118263, -0.00584495, -0.992965, -0.0543897, 0.99852, 0.000600219, 0.0221662, 0.12147, -9.90927e-05) bones/25/enabled = true bones/25/position = Vector3(0.0221662, 0.12147, -9.90927e-05) -bones/25/rotation = Quaternion(0.271655, -0.0147349, -0.125194, 0.954103) +bones/25/rotation = Quaternion(0.270399, -0.0148768, -0.125223, 0.954454) bones/25/scale = Vector3(1, 1, 1) bones/26/name = "LeftHandRing2" bones/26/parent = 25 bones/26/rest = Transform3D(0.981497, 0.113181, -0.154445, -0.116659, -0.286137, -0.951061, -0.151835, 0.951481, -0.267639, -3.72529e-08, 0.036012, -1.11759e-07) bones/26/enabled = true bones/26/position = Vector3(-3.72529e-08, 0.036012, -1.11759e-07) -bones/26/rotation = Quaternion(0.278678, 0.00168912, 0.0245598, 0.960069) +bones/26/rotation = Quaternion(0.278802, 0.00168958, 0.0245668, 0.960033) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "LeftHandRing3" bones/27/parent = 26 @@ -773,14 +774,14 @@ bones/29/parent = 12 bones/29/rest = Transform3D(0.991785, 0.0101279, -0.127516, -0.126197, -0.0855001, -0.988314, -0.0209122, 0.996287, -0.0835196, 0.0472581, 0.109082, 0.00226384) bones/29/enabled = true bones/29/position = Vector3(0.0472581, 0.109082, 0.00226384) -bones/29/rotation = Quaternion(0.296114, -0.0157989, -0.159076, 0.94168) +bones/29/rotation = Quaternion(0.295463, -0.0159181, -0.158852, 0.941921) bones/29/scale = Vector3(1, 1, 1) bones/30/name = "LeftHandPinky2" bones/30/parent = 29 bones/30/rest = Transform3D(0.989305, 0.129006, -0.068066, -0.049097, -0.144898, -0.988228, -0.13735, 0.981001, -0.137015, -5.96046e-08, 0.0413669, -1.49012e-08) bones/30/enabled = true bones/30/position = Vector3(-5.96046e-08, 0.0413669, -1.49012e-08) -bones/30/rotation = Quaternion(0.339956, 0.0113933, 0.0499395, 0.939045) +bones/30/rotation = Quaternion(0.339654, 0.0113506, 0.0499343, 0.939155) bones/30/scale = Vector3(1, 1, 1) bones/31/name = "LeftHandPinky3" bones/31/parent = 30 @@ -801,42 +802,42 @@ bones/33/parent = 3 bones/33/rest = Transform3D(-0.214833, -0.949432, 0.228968, -0.0511495, -0.223182, -0.973434, 0.975311, -0.220837, -0.000616074, -0.061057, 0.0911053, 0.00705566) bones/33/enabled = true bones/33/position = Vector3(-0.061057, 0.0911053, 0.00705566) -bones/33/rotation = Quaternion(0.538305, -0.484104, 0.538848, 0.430713) +bones/33/rotation = Quaternion(0.542566, -0.479921, 0.539745, 0.428921) bones/33/scale = Vector3(1, 1, 1) bones/34/name = "RightArm" bones/34/parent = 33 bones/34/rest = Transform3D(0.555382, 0.714901, -0.424814, -0.786414, 0.285417, -0.547804, -0.270377, 0.63832, 0.720724, -2.23517e-08, 0.129223, 9.12696e-08) bones/34/enabled = true bones/34/position = Vector3(-2.23517e-08, 0.129223, 9.12696e-08) -bones/34/rotation = Quaternion(0.507123, 0.0920267, 0.0759733, 0.853572) +bones/34/rotation = Quaternion(0.512736, 0.0870515, 0.0786523, 0.850493) bones/34/scale = Vector3(1, 1, 1) bones/35/name = "RightForeArm" bones/35/parent = 34 bones/35/rest = Transform3D(-0.491194, 0.870247, -0.0374029, -0.870282, -0.488505, 0.0630281, 0.0365786, 0.0635101, 0.997311, 7.45058e-09, 0.274776, -3.72529e-08) bones/35/enabled = true bones/35/position = Vector3(7.45058e-09, 0.274776, -3.72529e-08) -bones/35/rotation = Quaternion(0.0569769, -0.0444491, -0.429543, 0.90015) +bones/35/rotation = Quaternion(0.0534985, -0.0509765, -0.427707, 0.900892) bones/35/scale = Vector3(1, 1, 1) bones/36/name = "RightHand" bones/36/parent = 35 bones/36/rest = Transform3D(0.953663, 0.121098, 0.275431, -0.18063, 0.962538, 0.202223, -0.240624, -0.242603, 0.939811, 7.45058e-09, 0.276868, 5.96046e-08) bones/36/enabled = true bones/36/position = Vector3(7.45058e-09, 0.276868, 5.96046e-08) -bones/36/rotation = Quaternion(0.0857476, -0.00791894, -0.0304067, 0.995821) +bones/36/rotation = Quaternion(0.108485, -0.0205698, -0.0668447, 0.991635) bones/36/scale = Vector3(1, 1, 1) bones/37/name = "RightHandMiddle1" bones/37/parent = 36 bones/37/rest = Transform3D(0.986308, -0.119644, 0.1135, 0.119813, 0.0469439, -0.991686, 0.113321, 0.991706, 0.060636, 3.50177e-07, 0.127755, -8.9407e-08) bones/37/enabled = true bones/37/position = Vector3(3.50177e-07, 0.127755, -8.9407e-08) -bones/37/rotation = Quaternion(0.111102, 0.00854498, 0.0245488, 0.993469) +bones/37/rotation = Quaternion(0.111183, 0.00836547, 0.0255322, 0.993437) bones/37/scale = Vector3(1, 1, 1) bones/38/name = "RightHandMiddle2" bones/38/parent = 37 bones/38/rest = Transform3D(0.980361, -0.111685, 0.162538, 0.114835, -0.346749, -0.930902, 0.160328, 0.931285, -0.327114, 6.70552e-08, 0.0361398, -1.02445e-07) bones/38/enabled = true bones/38/position = Vector3(6.70552e-08, 0.0361398, -1.02445e-07) -bones/38/rotation = Quaternion(0.261227, 0.00137492, -0.0168363, 0.96513) +bones/38/rotation = Quaternion(0.278891, 0.00150967, -0.0184624, 0.960144) bones/38/scale = Vector3(1, 1, 1) bones/39/name = "RightHandMiddle3" bones/39/parent = 38 @@ -857,14 +858,14 @@ bones/41/parent = 36 bones/41/rest = Transform3D(0.940404, 0.29207, -0.174168, -0.340048, 0.811489, -0.475239, 0.00253238, 0.506143, 0.862446, 0.0300309, 0.037888, 0.0216703) bones/41/enabled = true bones/41/position = Vector3(0.0300309, 0.037888, 0.0216703) -bones/41/rotation = Quaternion(0.201844, 0.0247071, -0.222229, 0.953553) +bones/41/rotation = Quaternion(0.203311, 0.0243947, -0.227643, 0.951971) bones/41/scale = Vector3(1, 1, 1) bones/42/name = "RightHandThumb2" bones/42/parent = 41 bones/42/rest = Transform3D(0.793791, -0.608189, -0.00159446, 0.595053, 0.777184, -0.204689, 0.125729, 0.161531, 0.978826, -1.2666e-07, 0.0474498, -2.68221e-07) bones/42/enabled = true bones/42/position = Vector3(-1.2666e-07, 0.0474498, -2.68221e-07) -bones/42/rotation = Quaternion(0.00690274, 0.00162785, 0.188929, 0.981965) +bones/42/rotation = Quaternion(0.00447874, 0.00104979, 0.18107, 0.983459) bones/42/scale = Vector3(1, 1, 1) bones/43/name = "RightHandThumb3" bones/43/parent = 42 @@ -885,14 +886,14 @@ bones/45/parent = 36 bones/45/rest = Transform3D(0.978763, -0.172845, 0.110213, 0.120904, 0.0525683, -0.991271, 0.165542, 0.983545, 0.0723496, 0.0282207, 0.122666, 0.00231693) bones/45/enabled = true bones/45/position = Vector3(0.0282207, 0.122666, 0.00231693) -bones/45/rotation = Quaternion(0.0510383, 0.00995817, 0.00976571, 0.998599) +bones/45/rotation = Quaternion(0.0537729, 0.0105712, 0.00586389, 0.99848) bones/45/scale = Vector3(1, 1, 1) bones/46/name = "RightHandIndex2" bones/46/parent = 45 bones/46/rest = Transform3D(0.978593, -0.104714, 0.177172, 0.106914, -0.476935, -0.872412, 0.175853, 0.872679, -0.45553, 1.49012e-07, 0.0389196, -8.75443e-08) bones/46/enabled = true bones/46/position = Vector3(1.49012e-07, 0.0389196, -8.75443e-08) -bones/46/rotation = Quaternion(0.179479, 0.000994183, 0.0063853, 0.983741) +bones/46/rotation = Quaternion(0.182498, 0.00101699, 0.00607069, 0.983187) bones/46/scale = Vector3(1, 1, 1) bones/47/name = "RightHandIndex3" bones/47/parent = 46 @@ -913,14 +914,14 @@ bones/49/parent = 36 bones/49/rest = Transform3D(0.991829, -0.0281871, 0.124419, 0.122843, -0.0520322, -0.991061, 0.0344089, 0.998247, -0.0481446, -0.0221661, 0.12147, -9.89214e-05) bones/49/enabled = true bones/49/position = Vector3(-0.0221661, 0.12147, -9.89214e-05) -bones/49/rotation = Quaternion(0.186456, -0.00862052, 0.0670912, 0.980132) +bones/49/rotation = Quaternion(0.195053, -0.00785942, 0.0668951, 0.978477) bones/49/scale = Vector3(1, 1, 1) bones/50/name = "RightHandRing2" bones/50/parent = 49 bones/50/rest = Transform3D(0.982662, -0.117406, 0.143498, 0.122607, -0.169092, -0.977944, 0.139081, 0.978583, -0.151765, -7.45058e-09, 0.036012, 0) bones/50/enabled = true bones/50/position = Vector3(-7.45058e-09, 0.036012, 0) -bones/50/rotation = Quaternion(0.318956, -0.00233901, -0.0340754, 0.947154) +bones/50/rotation = Quaternion(0.327979, -0.00241433, -0.0348388, 0.944039) bones/50/scale = Vector3(1, 1, 1) bones/51/name = "RightHandRing3" bones/51/parent = 50 @@ -941,14 +942,14 @@ bones/53/parent = 36 bones/53/rest = Transform3D(0.989897, 0.0602255, 0.128364, 0.133612, -0.0931972, -0.986642, -0.0474579, 0.993824, -0.100302, -0.047258, 0.109082, 0.00226358) bones/53/enabled = true bones/53/position = Vector3(-0.047258, 0.109082, 0.00226358) -bones/53/rotation = Quaternion(0.207014, -0.0111368, 0.0919918, 0.97394) +bones/53/rotation = Quaternion(0.208013, -0.0111828, 0.0923374, 0.973694) bones/53/scale = Vector3(1, 1, 1) bones/54/name = "RightHandPinky2" bones/54/parent = 53 bones/54/rest = Transform3D(0.983236, -0.118306, 0.138749, 0.122507, -0.134994, -0.983244, 0.135054, 0.983758, -0.118237, -2.98023e-08, 0.0413665, 4.24334e-08) bones/54/enabled = true bones/54/position = Vector3(-2.98023e-08, 0.0413665, 4.24334e-08) -bones/54/rotation = Quaternion(0.348009, -0.0121483, -0.068993, 0.93487) +bones/54/rotation = Quaternion(0.379945, -0.0136072, -0.0710299, 0.922178) bones/54/scale = Vector3(1, 1, 1) bones/55/name = "RightHandPinky3" bones/55/parent = 54 @@ -969,28 +970,28 @@ bones/57/parent = 0 bones/57/rest = Transform3D(-0.919821, -0.336213, -0.202214, 0.264978, -0.912457, 0.311783, -0.289337, 0.233202, 0.928386, -0.0912445, -0.0665637, -0.000553781) bones/57/enabled = true bones/57/position = Vector3(-0.0912445, -0.0665637, -0.000553781) -bones/57/rotation = Quaternion(-0.125081, 0.0215739, 0.983315, 0.130311) +bones/57/rotation = Quaternion(-0.124493, 0.0221161, 0.983488, 0.129478) bones/57/scale = Vector3(1, 1, 1) bones/58/name = "RightLeg" bones/58/parent = 57 bones/58/rest = Transform3D(0.997811, 0.0392429, -0.0532304, 0.00932048, 0.713425, 0.70067, 0.0654722, -0.699632, 0.711497, 4.84288e-08, 0.405994, 2.6077e-08) bones/58/enabled = true bones/58/position = Vector3(4.84288e-08, 0.405994, 2.6077e-08) -bones/58/rotation = Quaternion(-0.302617, 0.0686129, -0.0179827, 0.950469) +bones/58/rotation = Quaternion(-0.304963, 0.0727443, -0.0195748, 0.94938) bones/58/scale = Vector3(1, 1, 1) bones/59/name = "RightFoot" bones/59/parent = 58 bones/59/rest = Transform3D(0.96994, -0.122934, 0.210008, 0.229929, 0.180407, -0.95634, 0.0796801, 0.975879, 0.20325, -1.02445e-08, 0.42099, 9.31323e-09) bones/59/enabled = true bones/59/position = Vector3(-1.02445e-08, 0.42099, 9.31323e-09) -bones/59/rotation = Quaternion(0.598297, 0.0607964, 0.111994, 0.791077) +bones/59/rotation = Quaternion(0.597411, 0.0611909, 0.112887, 0.791588) bones/59/scale = Vector3(1, 1, 1) bones/60/name = "RightToeBase" bones/60/parent = 59 bones/60/rest = Transform3D(0.999367, 6.43255e-05, 0.0355612, 0.0227211, 0.768109, -0.639916, -0.027356, 0.640319, 0.767622, -5.51563e-09, 0.16432, -1.09159e-07) bones/60/enabled = true bones/60/position = Vector3(-5.51563e-09, 0.16432, -1.09159e-07) -bones/60/rotation = Quaternion(0.354294, 0.0201724, 0.00411274, 0.934907) +bones/60/rotation = Quaternion(0.354124, 0.0203921, 0.00401378, 0.934968) bones/60/scale = Vector3(1, 1, 1) bones/61/name = "RightToe_End" bones/61/parent = 60 @@ -1004,28 +1005,28 @@ bones/62/parent = 0 bones/62/rest = Transform3D(-0.893651, 0.403296, 0.196826, -0.227377, -0.785047, 0.576195, 0.386895, 0.470164, 0.793258, 0.0912445, -0.0665636, -0.000553777) bones/62/enabled = true bones/62/position = Vector3(0.0912445, -0.0665636, -0.000553777) -bones/62/rotation = Quaternion(0.0785891, 0.214798, 0.967701, -0.106019) +bones/62/rotation = Quaternion(0.0773969, 0.215585, 0.96776, -0.104758) bones/62/scale = Vector3(1, 1, 1) bones/63/name = "LeftLeg" bones/63/parent = 62 bones/63/rest = Transform3D(0.99576, 0.0029921, 0.0919402, -0.056273, 0.810456, 0.583091, -0.0727688, -0.585792, 0.807188, 5.12227e-08, 0.405994, -2.04891e-08) bones/63/enabled = true bones/63/position = Vector3(5.12227e-08, 0.405994, -2.04891e-08) -bones/63/rotation = Quaternion(-0.313075, 0.1178, -0.0379647, 0.941629) +bones/63/rotation = Quaternion(-0.311327, 0.120237, -0.0381131, 0.941895) bones/63/scale = Vector3(1, 1, 1) bones/64/name = "LeftFoot" bones/64/parent = 63 bones/64/rest = Transform3D(0.977802, 0.128039, -0.165856, -0.209522, 0.59104, -0.778956, -0.00170929, 0.796415, 0.604748, -2.04891e-08, 0.42099, 6.98492e-09) bones/64/enabled = true bones/64/position = Vector3(-2.04891e-08, 0.42099, 6.98492e-09) -bones/64/rotation = Quaternion(0.49014, -0.0224964, -0.0407652, 0.870399) +bones/64/rotation = Quaternion(0.486588, -0.0221643, -0.0401658, 0.872426) bones/64/scale = Vector3(1, 1, 1) bones/65/name = "LeftToeBase" bones/65/parent = 64 bones/65/rest = Transform3D(0.999367, -0.000945242, -0.0355486, -0.0227206, 0.752033, -0.658734, 0.0273564, 0.659125, 0.751536, 3.66616e-08, 0.16432, -1.10293e-07) bones/65/enabled = true bones/65/position = Vector3(3.66616e-08, 0.16432, -1.10293e-07) -bones/65/rotation = Quaternion(0.360467, -0.00209315, -0.0302022, 0.932281) +bones/65/rotation = Quaternion(0.358161, 0.00103521, -0.0287534, 0.933217) bones/65/scale = Vector3(1, 1, 1) bones/66/name = "LeftToe_End" bones/66/parent = 65 @@ -1043,6 +1044,11 @@ skin = SubResource("Skin_hh536") mesh = ExtResource("6_e2l25") skin = SubResource("Skin_hh536") +[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] +transform = Transform3D(0.997899, -0.0624139, 0.0173572, 0.0617342, 0.834955, -0.546844, 0.0196383, 0.546767, 0.837055, -0.0182193, 1.49583, 0.112048) +bone_name = "Head" +bone_idx = 5 + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_5egkr") diff --git a/addons/AMSG/Components/CameraComponent.gd b/addons/AMSG/Components/CameraComponent.gd index 1115341..c4c1a36 100644 --- a/addons/AMSG/Components/CameraComponent.gd +++ b/addons/AMSG/Components/CameraComponent.gd @@ -58,7 +58,7 @@ var camera_v : float = 0 ## Assign a [camera_values] resource to it and change its values to tweak camera settings @export var camera_settings : camera_values = camera_values.new() - +@export var first_person_camera_bone : BoneAttachment3D var current_fov : float = 90.0 var acceleration_h = 10 var acceleration_v = 10 @@ -69,7 +69,6 @@ func _ready(): Camera.current = networking.is_local_authority() spring_arm_position_relative_to_player = SpringArm.position SpringArm.top_level = true - func _input(event): if event is InputEventMouseMotion: @@ -81,7 +80,7 @@ func _physics_process(delta): if camera_settings.camera_change_fov_on_speed and PlayerRef.actual_velocity.length() > camera_settings.camera_fov_change_starting_speed: smooth_fov(current_fov + clampf((PlayerRef.actual_velocity.length()-camera_settings.camera_fov_change_starting_speed)*(camera_settings.camera_max_fov_change/10.0),0,camera_settings.camera_max_fov_change)) - SpringArm.position = SpringArm.position.lerp(get_parent().global_position + spring_arm_position_relative_to_player,(1/camera_settings.camera_inertia)) + SpringArm.position = SpringArm.position.lerp((get_parent().global_position + spring_arm_position_relative_to_player) if view_mode == Global.view_mode.third_person else first_person_camera_bone.global_position,(1/camera_settings.camera_inertia) if view_mode == Global.view_mode.third_person else 1.0) camera_v = clamp(camera_v,deg_to_rad(camera_vertical_min),deg_to_rad(camera_vertical_max)) HObject.rotation.y = lerp(HObject.rotation.y,camera_h,delta * acceleration_h) diff --git a/addons/AMSG/Components/PlayerGameplayComponent.gd b/addons/AMSG/Components/PlayerGameplayComponent.gd index b948fb4..3d4a5ec 100644 --- a/addons/AMSG/Components/PlayerGameplayComponent.gd +++ b/addons/AMSG/Components/PlayerGameplayComponent.gd @@ -146,10 +146,6 @@ func _input(event): await get_tree().create_timer(0.2).timeout if view_changed_recently == false: camera_root.view_mode = camera_root.view_mode + 1 if camera_root.view_mode < 1 else 0 - if camera_root.view_mode == Global.view_mode.first_person and networking.is_local_authority(): - mesh_ref.visible = false - else: - mesh_ref.visible = true view_changed_recently = true if networking.is_local_authority(): if event.is_action_pressed("EnableSDFGI"):