diff --git a/Assets/prefabs/Player.prefab b/Assets/prefabs/Player.prefab index ff1ccf6..164ab78 100644 --- a/Assets/prefabs/Player.prefab +++ b/Assets/prefabs/Player.prefab @@ -2003,8 +2003,8 @@ "__version": 1, "Flags": 8, "Name": "aim_matrix_01", - "Position": "5.872967,0.006041013,11.81102", - "Rotation": "-0.0001633297,-0.01784967,-0.009139647,0.9997989", + "Position": "5.801175,0.02993305,11.81102", + "Rotation": "0.0004931263,0.01212253,-0.03984565,0.9991322", "Scale": "1,1,1", "Tags": "", "Enabled": true, @@ -2020,7 +2020,7 @@ "__version": 1, "Flags": 8, "Name": "aim_matrix_02a", - "Position": "5.872967,0.006041013,9.842515", + "Position": "5.801222,0.02991927,9.842515", "Rotation": "-0.00000000000000000000001185265,0.0000000000000001455021,-0.0000003871369,1", "Scale": "1,1,1", "Tags": "", @@ -2037,7 +2037,7 @@ "__version": 1, "Flags": 8, "Name": "aim_matrix_02b", - "Position": "9.809968,0.006037482,9.842513", + "Position": "9.738223,0.02991574,9.842513", "Rotation": "-0.00000000000000000000001185278,0.0000000000000001455018,-0.0000003871369,1", "Scale": "1,1,1", "Tags": "", @@ -2054,8 +2054,8 @@ "__version": 1, "Flags": 8, "Name": "ankle_R", - "Position": "0.4100297,-4.377069,3.807491", - "Rotation": "0.6728561,0.2185199,-0.3316684,0.6241072", + "Position": "0.4099637,-4.377346,3.807714", + "Rotation": "0.6728511,0.2185302,-0.3316586,0.6241142", "Scale": "1.000002,1.000002,1.000002", "Tags": "", "Enabled": true, @@ -2071,9 +2071,9 @@ "__version": 1, "Flags": 8, "Name": "ankle_L", - "Position": "0.4083853,4.427594,3.805824", - "Rotation": "0.6245877,0.3321062,-0.2183191,0.6722592", - "Scale": "1.000001,1.000001,1.000001", + "Position": "0.4083834,4.427513,3.806108", + "Rotation": "0.6245873,0.3321065,-0.2183179,0.6722599", + "Scale": "1.000002,1.000002,1.000002", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2088,9 +2088,9 @@ "__version": 1, "Flags": 8, "Name": "arm_lower_R", - "Position": "-2.415514,-8.693256,40.92277", - "Rotation": "0.5050567,0.374271,-0.5378657,0.561729", - "Scale": "1.000002,1.000002,1.000002", + "Position": "-2.547264,-8.923134,40.63697", + "Rotation": "0.4899803,0.3799562,-0.5738583,0.5350133", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2105,9 +2105,9 @@ "__version": 1, "Flags": 8, "Name": "arm_lower_L", - "Position": "-2.065563,9.910057,41.4312", - "Rotation": "0.5884632,0.5365309,-0.3654193,0.4819899", - "Scale": "1.000002,1.000002,1.000002", + "Position": "-1.750551,9.532271,40.66884", + "Rotation": "0.5623499,0.549653,-0.4004578,0.4704017", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2122,9 +2122,9 @@ "__version": 1, "Flags": 8, "Name": "hand_R", - "Position": "-1.327014,-10.43666,33.49512", - "Rotation": "0.4767994,0.3525229,-0.5948111,0.5427613", - "Scale": "1.000003,1.000003,1.000003", + "Position": "-2.141604,-10.7859,33.16971", + "Rotation": "0.4591243,0.357981,-0.6289517,0.5152419", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2139,9 +2139,9 @@ "__version": 1, "Flags": 8, "Name": "hand_L", - "Position": "-0.8540348,12.0617,34.13079", - "Rotation": "0.5696679,0.593228,-0.3414524,0.4549389", - "Scale": "1.000003,1.000003,1.000003", + "Position": "-1.172323,11.39287,33.21243", + "Rotation": "0.5450745,0.6055658,-0.3768878,0.4406127", + "Scale": "1.000006,1.000006,1.000006", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2156,9 +2156,9 @@ "__version": 1, "Flags": 8, "Name": "hold_R", - "Position": "0.1449476,-9.016528,27.4564", - "Rotation": "0.3127081,0.7201924,0.06906751,0.61544", - "Scale": "1.000004,1.000004,1.000004", + "Position": "-1.080492,-9.496073,27.01665", + "Rotation": "0.3306133,0.7358714,0.03682049,0.5897731", + "Scale": "1.000007,1.000007,1.000007", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2173,9 +2173,9 @@ "__version": 1, "Flags": 8, "Name": "hold_L", - "Position": "0.6086711,10.95811,28.02384", - "Rotation": "-0.2794754,0.7258716,-0.0597837,0.6256435", - "Scale": "1.000003,1.000003,1.000003", + "Position": "-0.232475,10.04705,27.05133", + "Rotation": "-0.2945676,0.7504238,-0.06180435,0.5884508", + "Scale": "1.000007,1.000007,1.000007", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2190,8 +2190,8 @@ "__version": 1, "Flags": 8, "Name": "IK_right_hand", - "Position": "-1.70549,-11.30311,33.23475", - "Rotation": "0.4605321,0.3488436,-0.6099709,0.5423597", + "Position": "-1.877152,-11.09612,33.26139", + "Rotation": "0.4669385,0.3415292,-0.6186609,0.5315872", "Scale": "1,1,1", "Tags": "", "Enabled": true, @@ -2207,8 +2207,8 @@ "__version": 1, "Flags": 8, "Name": "IK_left_hand", - "Position": "-1.502214,11.36806,33.23162", - "Rotation": "0.5485557,0.6045254,-0.3535507,0.4567688", + "Position": "-1.000594,11.37386,33.24734", + "Rotation": "0.5583135,0.5952679,-0.361805,0.4505988", "Scale": "1,1,1", "Tags": "", "Enabled": true, @@ -2224,9 +2224,9 @@ "__version": 1, "Flags": 8, "Name": "leg_lower_R", - "Position": "2.140212,-4.426102,16.20282", - "Rotation": "0.4912729,0.5025679,-0.5626246,0.4353504", - "Scale": "1,1,1", + "Position": "2.772165,-4.616689,16.09606", + "Rotation": "0.4796034,0.5184785,-0.5705701,0.419059", + "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2241,8 +2241,8 @@ "__version": 1, "Flags": 8, "Name": "leg_lower_L", - "Position": "2.944108,4.841949,16.05482", - "Rotation": "0.4142257,0.5677253,-0.5281958,0.476565", + "Position": "3.125281,4.728096,16.01951", + "Rotation": "0.4123246,0.5739041,-0.5283694,0.4705829", "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, @@ -2258,9 +2258,9 @@ "__version": 1, "Flags": 8, "Name": "middle_of_both_hands", - "Position": "-0.8171214,0.9550338,29.00532", - "Rotation": "0.01974888,0.7515687,0.004535146,0.6593435", - "Scale": "1.000003,1.000003,1.000003", + "Position": "-1.823224,0.3255591,28.35205", + "Rotation": "0.01945717,0.7727925,-0.01508422,0.6341812", + "Scale": "1.000006,1.000006,1.000006", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2275,9 +2275,9 @@ "__version": 1, "Flags": 8, "Name": "driver_arm_upper_R_twist1", - "Position": "-1.529419,-7.756166,45.777", + "Position": "-1.501997,-7.934674,45.44918", "Rotation": "0,0,0,1", - "Scale": "1.000002,1.000002,1.000002", + "Scale": "1.000004,1.000004,1.000004", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2292,9 +2292,9 @@ "__version": 1, "Flags": 8, "Name": "driver_arm_lower_R_twist1", - "Position": "-1.871264,-9.56496,37.20895", + "Position": "-2.344434,-9.854515,36.90334", "Rotation": "0,0,0,1", - "Scale": "1.000003,1.000003,1.000003", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2309,9 +2309,9 @@ "__version": 1, "Flags": 8, "Name": "driver_elbow_R_position", - "Position": "-2.431499,-8.694861,40.91875", - "Rotation": "-0.03318984,-0.6286435,0.776837,0.01517099", - "Scale": "1.000002,1.000002,1.000002", + "Position": "-2.509679,-8.933312,40.63103", + "Rotation": "-0.02667829,-0.6213159,0.7814974,0.05016763", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2326,9 +2326,9 @@ "__version": 1, "Flags": 8, "Name": "driver_elbow_L_position", - "Position": "-2.081447,9.912534,41.42717", - "Rotation": "-0.04039298,0.7933497,-0.60225,0.0791183", - "Scale": "1.000002,1.000002,1.000002", + "Position": "-1.712058,9.539062,40.66292", + "Rotation": "-0.05765348,0.7835048,-0.6165186,0.05197146", + "Scale": "1.000005,1.000005,1.000005", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2343,9 +2343,9 @@ "__version": 1, "Flags": 8, "Name": "driver_arm_upper_L_twist1", - "Position": "-1.253342,8.643686,46.22322", + "Position": "-0.803157,8.423775,45.47519", "Rotation": "0,0,0,1", - "Scale": "1.000002,1.000002,1.000002", + "Scale": "1.000004,1.000004,1.000004", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2360,9 +2360,9 @@ "__version": 1, "Flags": 8, "Name": "driver_arm_lower_L_twist1", - "Position": "-1.459799,10.98588,37.78099", + "Position": "-1.461437,10.46257,36.94063", "Rotation": "0,0,0,1", - "Scale": "1.000003,1.000003,1.000003", + "Scale": "1.000006,1.000006,1.000006", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2377,9 +2377,9 @@ "__version": 1, "Flags": 8, "Name": "driver_leg_upper_R_twist1", - "Position": "1.379063,-4.254407,23.39583", + "Position": "1.730297,-4.48612,23.25467", "Rotation": "0,0,0,1", - "Scale": "1,1,1", + "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2394,7 +2394,7 @@ "__version": 1, "Flags": 8, "Name": "driver_leg_upper_L_twist1", - "Position": "1.812529,4.80524,23.20087", + "Position": "1.990266,4.612566,23.16419", "Rotation": "0,0,0,1", "Scale": "1,1,1", "Tags": "", @@ -2411,9 +2411,9 @@ "__version": 1, "Flags": 8, "Name": "driver_kneecap_R_position", - "Position": "2.502184,-4.467493,16.17297", - "Rotation": "0.5185029,0.4735409,-0.5331084,0.4719208", - "Scale": "1,1,1", + "Position": "3.266922,-4.671997,16.06072", + "Rotation": "0.5183465,0.4780885,-0.5319249,0.4688327", + "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2428,9 +2428,9 @@ "__version": 1, "Flags": 8, "Name": "driver_kneecap_L_position", - "Position": "3.477942,4.898448,16.01743", - "Rotation": "0.6999867,0.04382173,0.02689065,0.7123027", - "Scale": "1,1,1", + "Position": "3.681194,4.787521,15.97822", + "Rotation": "0.7035776,0.04610748,0.02448951,0.7086981", + "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2445,7 +2445,7 @@ "__version": 1, "Flags": 8, "Name": "driver_leg_lower_R_twist1", - "Position": "1.275122,-4.401587,10.00517", + "Position": "1.591069,-4.497025,9.951909", "Rotation": "0,0,0,1", "Scale": "1.000001,1.000001,1.000001", "Tags": "", @@ -2462,7 +2462,7 @@ "__version": 1, "Flags": 8, "Name": "driver_leg_lower_L_twist1", - "Position": "1.676247,4.634771,9.930321", + "Position": "1.766837,4.577821,9.912802", "Rotation": "0,0,0,1", "Scale": "1.000001,1.000001,1.000001", "Tags": "", @@ -2479,9 +2479,9 @@ "__version": 1, "Flags": 8, "Name": "forward_reference_modelspace", - "Position": "-0.3715452,0.2550741,43.42545", + "Position": "0.07596781,0.1687929,43.37532", "Rotation": "0,0,0,1", - "Scale": "1.000001,1.000001,1.000001", + "Scale": "1.000002,1.000002,1.000002", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2496,9 +2496,9 @@ "__version": 1, "Flags": 8, "Name": "eyes", - "Position": "5.598311,-0.2268828,63.32236", - "Rotation": "0.01307973,-0.020068,-0.01569684,0.9995899", - "Scale": "1.000001,1.000001,1.000001", + "Position": "7.030602,-0.5137365,62.65855", + "Rotation": "0.00009885425,0.03110732,-0.05690487,0.9978949", + "Scale": "1.000003,1.000003,1.000003", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2513,9 +2513,9 @@ "__version": 1, "Flags": 8, "Name": "eye_R_forward", - "Position": "5.495053,-3.57054,63.23274", - "Rotation": "0.01307973,-0.020068,-0.01569684,0.9995899", - "Scale": "1.000001,1.000001,1.000001", + "Position": "6.650522,-3.838521,62.66974", + "Rotation": "0.00009885425,0.03110732,-0.05690487,0.9978949", + "Scale": "1.000003,1.000003,1.000003", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2530,9 +2530,9 @@ "__version": 1, "Flags": 8, "Name": "eye_L_forward", - "Position": "5.701567,3.116774,63.41198", - "Rotation": "0.01307973,-0.020068,-0.01569684,0.9995899", - "Scale": "1.000001,1.000001,1.000001", + "Position": "7.410679,2.811049,62.64737", + "Rotation": "0.00009885425,0.03110732,-0.05690487,0.9978949", + "Scale": "1.000003,1.000003,1.000003", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2547,9 +2547,9 @@ "__version": 1, "Flags": 8, "Name": "forward_reference", - "Position": "0.5694897,0.1185142,56.22946", - "Rotation": "0.01307973,-0.020068,-0.01569684,0.9995899", - "Scale": "1.000001,1.000001,1.000001", + "Position": "1.332668,0.1156056,56.11215", + "Rotation": "0.00009885425,0.03110732,-0.05690487,0.9978949", + "Scale": "1.000003,1.000003,1.000003", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2564,8 +2564,8 @@ "__version": 1, "Flags": 8, "Name": "foot_R", - "Position": "1.982148,-4.91043,0.1893211", - "Rotation": "0.0004870296,-0.00001396612,-0.08711576,0.9961981", + "Position": "1.982118,-4.910692,0.1895606", + "Rotation": "0.0004845559,-0.00001421571,-0.08709803,0.9961996", "Scale": "1.000001,1.000001,1.000001", "Tags": "", "Enabled": true, @@ -2581,9 +2581,9 @@ "__version": 1, "Flags": 8, "Name": "foot_L", - "Position": "1.978698,4.96686,1.053328", - "Rotation": "-0.08723518,0.9961877,0.0004069209,0.00001392581", - "Scale": "1.000001,1.000001,1.000001", + "Position": "1.97871,4.966801,1.053631", + "Rotation": "-0.08723662,0.9961876,0.0004069805,0.00001473047", + "Scale": "1,1,1", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2598,9 +2598,9 @@ "__version": 1, "Flags": 8, "Name": "hat", - "Position": "0.2500786,-0.2772586,71.38126", - "Rotation": "0.01307973,-0.020068,-0.01569684,0.9995899", - "Scale": "1.000001,1.000001,1.000001", + "Position": "2.566394,0.02586517,71.22197", + "Rotation": "0.00009885425,0.03110732,-0.05690487,0.9978949", + "Scale": "1.000003,1.000003,1.000003", "Tags": "", "Enabled": true, "NetworkMode": 2, @@ -2631,7 +2631,7 @@ "__version": 1, "Flags": 0, "Name": "Camera", - "Position": "-72.85227,-4.651191,9.112095", + "Position": "-78.35223,-19.35114,-5.787906", "Rotation": "0,0,0,1", "Scale": "1,1,1", "Tags": "", diff --git a/Code/Player/Dedugan.Camera.cs b/Code/Player/Dedugan.Camera.cs index c619b3e..951706d 100644 --- a/Code/Player/Dedugan.Camera.cs +++ b/Code/Player/Dedugan.Camera.cs @@ -13,14 +13,16 @@ public sealed partial class Dedugan } else { - CameraPivot.WorldPosition = Eyes.WorldPosition; - + // Плавная интерполяция позиции пивота для устранения колебаний + CameraPivot.WorldPosition = + Vector3.Lerp( CameraPivot.WorldPosition, Eyes.WorldPosition, Time.Delta * 25f ); + // Компенсируем поворот тела, чтобы камера вращалась правильно // Используем только yaw от EyeAngles, но pitch оставляем как есть var bodyYaw = Renderer.LocalRotation.Yaw(); var cameraYaw = EyeAngles.yaw; var compensatedYaw = cameraYaw - bodyYaw; - + CameraPivot.LocalRotation = Rotation.FromYaw( compensatedYaw ) * Rotation.FromPitch( EyeAngles.pitch ); } }