From 3ece5edc59993a06971baaa52217992f89646f47 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Wed, 21 Aug 2024 12:52:00 +0200 Subject: [PATCH] fix position sync issues --- .../Characters/first_person_player.tscn | 5 +- godot/Scenes/Characters/player.tscn | 93 +++++++++---------- include/blitz/godot/World.h | 1 - include/client/ClientWorld.h | 2 + include/client/FirstPersonPlayer.h | 2 +- include/client/Player.h | 3 +- include/server/ServerWorld.h | 3 +- src/blitz/godot/World.cpp | 8 -- src/blitz/protocol/Packets.cpp | 3 +- src/client/ClientWorld.cpp | 18 ++++ src/client/FirstPersonPlayer.cpp | 9 +- src/client/Player.cpp | 15 ++- src/server/ServerWorld.cpp | 9 ++ 13 files changed, 98 insertions(+), 73 deletions(-) diff --git a/godot/Scenes/Characters/first_person_player.tscn b/godot/Scenes/Characters/first_person_player.tscn index 1449b9f..7c4a05a 100644 --- a/godot/Scenes/Characters/first_person_player.tscn +++ b/godot/Scenes/Characters/first_person_player.tscn @@ -2,8 +2,7 @@ [sub_resource type="CapsuleMesh" id="CapsuleMesh_ky6st"] -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_qjfxs"] -points = PackedVector3Array(-0.125207, -0.532801, -0.480507, 0.0227831, 0.47607, 0.498884, 0.169713, 0.559144, 0.464172, 0.231051, -0.803591, 0.320455, 0.40741, 0.651043, -0.243523, -0.482789, 0.594843, 0.0822132, -0.362868, -0.682312, 0.289697, 0.469044, -0.654529, -0.0662713, -0.127444, 0.842701, -0.338103, -0.393435, -0.683942, -0.244717, 0.438255, 0.623309, 0.200849, 0.0841477, 0.977454, 0.114795, -0.0682023, -0.976458, -0.12927, 0.20055, -0.563129, -0.451454, -0.185527, 0.595453, -0.453475, -0.273363, 0.592268, 0.407754, -0.00693649, -0.476823, 0.49966, 0.375821, -0.588614, 0.316955, 0.111579, 0.563059, -0.481177, -0.41725, 0.527866, -0.270497, -0.484546, -0.596972, -0.0665097, -0.279747, 0.908561, 0.0533361, -0.250197, -0.880712, 0.205319, 0.263647, -0.902771, -0.127394, 0.293368, 0.871526, -0.157196, 0.373412, -0.526319, -0.328246, 0.499663, 0.476641, -0.00688856, 0.0531056, 0.875001, 0.324703, -0.154543, -0.590854, 0.465879, -0.0972799, -0.782358, -0.398188, -0.387649, -0.498171, 0.31565, -0.30068, -0.587995, -0.388901) +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_snsyg"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gwsuw"] resource_name = "Beta_Joints_MAT1" @@ -3283,7 +3282,7 @@ mesh = SubResource("CapsuleMesh_ky6st") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) -shape = SubResource("ConvexPolygonShape3D_qjfxs") +shape = SubResource("CapsuleShape3D_snsyg") [node name="Head" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.579, 0) diff --git a/godot/Scenes/Characters/player.tscn b/godot/Scenes/Characters/player.tscn index 2ebef8c..a7b4cc0 100644 --- a/godot/Scenes/Characters/player.tscn +++ b/godot/Scenes/Characters/player.tscn @@ -254,9 +254,7 @@ _surfaces = [{ }] blend_shape_mode = 0 -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_mm42w"] -radius = 0.283343 -height = 1.84319 +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_p1dvg"] [sub_resource type="Animation" id="Animation_jas7c"] resource_name = "Air-loop" @@ -3273,7 +3271,6 @@ nodes/output/position = Vector2(860, 160) node_connections = [&"ground_air_transition", 0, &"iwr_blend", &"ground_air_transition", 1, &"Air", &"iwr_blend", 0, &"Idle", &"iwr_blend", 1, &"Walk", &"iwr_blend", 2, &"Run", &"output", 0, &"ground_air_transition"] [node name="Player" type="Player"] -velocity = Vector3(0, -5821.84, 0) [node name="Mesh" type="Node3D" parent="."] @@ -3285,43 +3282,43 @@ bones/0/name = "Hips" bones/0/parent = -1 bones/0/rest = Transform3D(1, -5.00981e-07, 6.47142e-09, 0, 0.0129164, 0.999917, -5.01023e-07, -0.999917, 0.0129164, -7.72729e-06, 1.55432, -104.275) bones/0/enabled = true -bones/0/position = Vector3(-0.00545547, 1.5608, -104.173) -bones/0/rotation = Quaternion(-0.673975, -0.26086, 0.257429, 0.641436) +bones/0/position = Vector3(-0.00545729, 1.56079, -104.173) +bones/0/rotation = Quaternion(-0.674952, -0.262938, 0.255891, 0.640175) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Spine" bones/1/parent = 0 bones/1/rest = Transform3D(1, 4.9454e-07, 3.97682e-08, -4.9454e-07, 0.98715, 0.159796, 3.97681e-08, -0.159796, 0.98715, -4.1641e-10, 10.1824, 4.47034e-08) bones/1/enabled = true bones/1/position = Vector3(-4.1641e-10, 10.1824, 4.47034e-08) -bones/1/rotation = Quaternion(0.0494452, 0.00102938, -0.0281418, 0.99838) +bones/1/rotation = Quaternion(0.0492163, 0.000532408, -0.02752, 0.998409) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Spine1" bones/2/parent = 1 bones/2/rest = Transform3D(1, 4.13003e-14, -6.10621e-16, -4.13003e-14, 1, 5.96046e-08, 6.10624e-16, -5.96046e-08, 1, -6.45306e-12, 10.0027, 2.63751e-06) bones/2/enabled = true bones/2/position = Vector3(-6.45306e-12, 10.0027, 2.63751e-06) -bones/2/rotation = Quaternion(0.25634, 0.00456356, -0.0680245, 0.964179) +bones/2/rotation = Quaternion(0.255913, 0.00352153, -0.0657837, 0.964453) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Spine2" bones/3/parent = 2 bones/3/rest = Transform3D(1, 7.40298e-08, -1.9083e-09, -7.40543e-08, 0.999668, -0.0257692, -2.13163e-14, 0.0257692, 0.999668, -6.39488e-13, 9.32208, -1.54972e-06) bones/3/enabled = true bones/3/position = Vector3(-6.39488e-13, 9.32208, -1.54972e-06) -bones/3/rotation = Quaternion(0.268751, 0.00362875, -0.0681548, 0.960789) +bones/3/rotation = Quaternion(0.268319, 0.00267362, -0.0658236, 0.961075) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Neck" bones/4/parent = 3 bones/4/rest = Transform3D(1, -1.45661e-13, -1.46549e-14, 1.45661e-13, 1, -1.86265e-08, 1.46549e-14, 1.86265e-08, 1, 4.13195e-10, 16.8654, 4.15668e-13) bones/4/enabled = true bones/4/position = Vector3(4.13195e-10, 16.8654, 4.15668e-13) -bones/4/rotation = Quaternion(0.0150258, 0.0423437, -0.0448451, 0.997983) +bones/4/rotation = Quaternion(0.0137645, 0.0488776, -0.0564687, 0.997112) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Head" bones/5/parent = 4 bones/5/rest = Transform3D(1, 7.74936e-14, 5.77316e-15, -7.74936e-14, 1, 4.47035e-08, -5.77316e-15, -4.47035e-08, 1, -1.07566e-07, 9.3419, 2.84104) bones/5/enabled = true bones/5/position = Vector3(-1.07566e-07, 9.3419, 2.84104) -bones/5/rotation = Quaternion(0.00920543, 0.0563305, 0.022933, 0.998106) +bones/5/rotation = Quaternion(0.011752, 0.0558241, 0.0292939, 0.997942) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "HeadTop_End" bones/6/parent = 5 @@ -3335,42 +3332,42 @@ bones/7/parent = 3 bones/7/rest = Transform3D(-0.205696, -0.977364, 0.0494833, -0.129005, -0.0230424, -0.991376, 0.970076, -0.210305, -0.121346, -4.56997, 11.1959, -0.806634) bones/7/enabled = true bones/7/position = Vector3(-4.56997, 11.1959, -0.806634) -bones/7/rotation = Quaternion(-0.407796, 0.575185, -0.614273, -0.354307) +bones/7/rotation = Quaternion(-0.41009, 0.574024, -0.615595, -0.351234) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "RightArm" bones/8/parent = 7 bones/8/rest = Transform3D(0.978563, 0.205696, 0.0101912, -0.205948, 0.977364, 0.0484225, -2.57045e-07, -0.0494833, 0.998775, -3.57628e-07, 10.8382, -1.46913e-05) bones/8/enabled = true bones/8/position = Vector3(1.96774e-07, 10.8382, -3.20984e-07) -bones/8/rotation = Quaternion(0.203226, 0.203129, -0.0329129, 0.957264) +bones/8/rotation = Quaternion(0.211294, 0.201632, -0.0386556, 0.955618) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "RightForeArm" bones/9/parent = 8 bones/9/rest = Transform3D(1, -5.8991e-08, -1.67444e-07, 5.8991e-08, 1, -9.42509e-15, 1.67444e-07, -4.52622e-16, 1, -1.01963e-05, 27.8415, -1.44409e-05) bones/9/enabled = true bones/9/position = Vector3(-1.00907e-05, 27.8415, -3.06037e-05) -bones/9/rotation = Quaternion(0.016868, -0.0422137, -0.187411, 0.981229) +bones/9/rotation = Quaternion(0.0174234, -0.0442375, -0.187662, 0.981082) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "RightHand" bones/10/parent = 9 bones/10/rest = Transform3D(1, -1.90228e-09, 1.90222e-09, 1.90228e-09, 1, 1.10216e-13, -1.90222e-09, -1.10212e-13, 1, 1.54253e-05, 28.3288, 1.70057e-05) bones/10/enabled = true bones/10/position = Vector3(1.5054e-05, 28.3288, 8.42971e-07) -bones/10/rotation = Quaternion(-0.29465, 0.0869538, -0.124768, 0.943426) +bones/10/rotation = Quaternion(-0.311762, 0.048629, -0.109617, 0.942562) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "RightHandThumb1" bones/11/parent = 10 bones/11/rest = Transform3D(0.888246, 0.459367, 6.78003e-07, -0.396939, 0.767535, -0.503319, -0.231209, 0.447071, 0.864101, 2.68185, 2.46481, 1.57399) bones/11/enabled = true bones/11/position = Vector3(2.68185, 2.46481, 1.57397) -bones/11/rotation = Quaternion(0.2394, 0.160363, -0.215536, 0.933014) +bones/11/rotation = Quaternion(0.248563, 0.146822, -0.244856, 0.925584) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "RightHandThumb2" bones/12/parent = 11 bones/12/rest = Transform3D(0.999824, -0.0185942, -0.0023841, 0.0186051, 0.999816, 0.00460874, 0.00229796, -0.00465229, 0.999986, 3.93391e-06, 4.18899, 7.30372e-06) bones/12/enabled = true bones/12/position = Vector3(-4.17233e-06, 4.18898, -1.18934e-05) -bones/12/rotation = Quaternion(-0.115742, 0.0900667, 0.192157, 0.970344) +bones/12/rotation = Quaternion(-0.107896, 0.082565, 0.177687, 0.974663) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "RightHandThumb3" bones/13/parent = 12 @@ -3391,14 +3388,14 @@ bones/15/parent = 10 bones/15/rest = Transform3D(1, 0.000328245, -7.43808e-08, -0.000328245, 1, 2.44166e-11, 7.43808e-08, -1.4988e-15, 1, 2.25983, 9.10829, 0.517869) bones/15/enabled = true bones/15/position = Vector3(2.25983, 9.10828, 0.517853) -bones/15/rotation = Quaternion(0.11025, 0.00650945, 0.00551306, 0.993867) +bones/15/rotation = Quaternion(0.0830017, 0.00512602, 0.00685563, 0.996513) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "RightHandIndex2" bones/16/parent = 15 bones/16/rest = Transform3D(1, -0.000511482, 3.19887e-07, 0.000511482, 1, 1.0708e-05, -3.25364e-07, -1.07078e-05, 1, -7.49751e-08, 3.69999, 1.65342e-05) bones/16/enabled = true bones/16/position = Vector3(1.82747e-07, 3.7, 7.39788e-07) -bones/16/rotation = Quaternion(0.165573, 0.0101262, 0.00848687, 0.986109) +bones/16/rotation = Quaternion(0.154202, 0.00991445, 0.00963483, 0.987943) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "RightHandIndex3" bones/17/parent = 16 @@ -3419,14 +3416,14 @@ bones/19/parent = 10 bones/19/rest = Transform3D(1, 0.0010033, 8.39909e-08, -0.0010033, 1, 6.61679e-11, -8.39908e-08, -1.50436e-10, 1, -2.58012e-05, 9.53251, 4.75128e-05) bones/19/enabled = true bones/19/position = Vector3(-2.61725e-05, 9.5325, 3.135e-05) -bones/19/rotation = Quaternion(0.1721, 0.00873778, 0.0157109, 0.984915) +bones/19/rotation = Quaternion(0.147732, 0.0111146, 0.0265099, 0.98861) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "RightHandMiddle2" bones/20/parent = 19 bones/20/rest = Transform3D(0.999998, -0.00169976, 6.79326e-08, 0.00169976, 0.999998, 5.1725e-06, -7.67245e-08, -5.17238e-06, 1, 4.37467e-07, 3.70001, 1.65339e-05) bones/20/enabled = true bones/20/position = Vector3(5.8697e-08, 3.70001, -3.01458e-05) -bones/20/rotation = Quaternion(0.29122, 0.00291729, -0.0159203, 0.956519) +bones/20/rotation = Quaternion(0.254491, 0.00271635, -0.01288, 0.966986) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "RightHandMiddle3" bones/21/parent = 20 @@ -3447,14 +3444,14 @@ bones/23/parent = 10 bones/23/rest = Transform3D(1, -0.000311951, 2.28835e-07, 0.000311951, 1, 7.13874e-11, -2.28835e-07, -1.97758e-15, 1, -1.86514, 9.1036, 0.0430626) bones/23/enabled = true bones/23/position = Vector3(-1.86514, 9.1036, 0.0430626) -bones/23/rotation = Quaternion(0.230492, 0.00939941, 0.0756768, 0.970082) +bones/23/rotation = Quaternion(0.181591, 0.0278997, 0.069303, 0.980532) bones/23/scale = Vector3(1, 1, 1) bones/24/name = "RightHandRing2" bones/24/parent = 23 bones/24/rest = Transform3D(1, 0.000442856, 1.18525e-07, -0.000442856, 1, 5.28028e-06, -1.16186e-07, -5.28033e-06, 1, -2.23002e-07, 3.37928, 6.29645e-07) bones/24/enabled = true bones/24/position = Vector3(-2.23002e-07, 3.37928, 6.29645e-07) -bones/24/rotation = Quaternion(0.355641, -0.00404305, -0.0360694, 0.933917) +bones/24/rotation = Quaternion(0.317146, -0.00384532, -0.0329689, 0.947796) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "RightHandRing3" bones/25/parent = 24 @@ -3475,14 +3472,14 @@ bones/27/parent = 10 bones/27/rest = Transform3D(0.999999, -0.00104089, 1.35743e-07, 0.00104089, 0.999999, -8.47695e-06, -1.26919e-07, 8.47709e-06, 1, -3.80628, 8.07669, 0.486713) bones/27/enabled = true bones/27/position = Vector3(-3.80628, 8.07668, 0.486696) -bones/27/rotation = Quaternion(0.293242, 0.0144781, 0.0775827, 0.952775) +bones/27/rotation = Quaternion(0.247856, 0.00925302, 0.0721828, 0.96606) bones/27/scale = Vector3(1, 1, 1) bones/28/name = "RightHandPinky2" bones/28/parent = 27 bones/28/rest = Transform3D(0.999999, -0.00169266, 2.0762e-07, 0.00169266, 0.999999, 1.21108e-06, -2.0967e-07, -1.21073e-06, 1, 1.02501e-06, 3.6, -1.07715e-07) bones/28/enabled = true bones/28/position = Vector3(1.02501e-06, 3.6, -1.07715e-07) -bones/28/rotation = Quaternion(0.398295, -0.018258, -0.0590211, 0.915175) +bones/28/rotation = Quaternion(0.356941, -0.017438, -0.057749, 0.932177) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "RightHandPinky3" bones/29/parent = 28 @@ -3503,42 +3500,42 @@ bones/31/parent = 3 bones/31/rest = Transform3D(-0.205707, 0.977362, -0.0494651, 0.129002, -0.0230232, -0.991377, -0.970074, -0.210314, -0.121346, 4.57045, 11.1957, -0.806628) bones/31/enabled = true bones/31/position = Vector3(4.57045, 11.1957, -0.806628) -bones/31/rotation = Quaternion(0.488057, 0.536105, -0.568538, 0.388789) +bones/31/rotation = Quaternion(0.48725, 0.536206, -0.569594, 0.388114) bones/31/scale = Vector3(1, 1, 1) bones/32/name = "LeftArm" bones/32/parent = 31 bones/32/rest = Transform3D(0.978561, -0.205707, -0.0101878, 0.20596, 0.977363, 0.0484042, 1.67638e-08, -0.0494647, 0.998776, 1.19209e-07, 10.8377, -7.69096e-07) bones/32/enabled = true bones/32/position = Vector3(1.19209e-07, 10.8377, -7.69096e-07) -bones/32/rotation = Quaternion(0.185302, -0.209923, 0.138081, 0.950015) +bones/32/rotation = Quaternion(0.176075, -0.211821, 0.127993, 0.952758) bones/32/scale = Vector3(1, 1, 1) bones/33/name = "LeftForeArm" bones/33/parent = 32 bones/33/rest = Transform3D(1, -7.91888e-10, 1.53855e-09, 7.9189e-10, 1, -1.06455e-06, -1.53855e-09, 1.06455e-06, 1, 6.43076e-07, 27.8415, 7.54874e-06) bones/33/enabled = true bones/33/position = Vector3(6.43076e-07, 27.8415, 7.54874e-06) -bones/33/rotation = Quaternion(0.0734728, -0.0260904, 0.146778, 0.986092) +bones/33/rotation = Quaternion(0.0710945, -0.0137076, 0.17137, 0.982543) bones/33/scale = Vector3(1, 1, 1) bones/34/name = "LeftHand" bones/34/parent = 33 bones/34/rest = Transform3D(1, 1.34242e-08, -1.34244e-08, -1.34242e-08, 1, -2.38631e-07, 1.34244e-08, 2.38631e-07, 1, 6.6208e-06, 28.3288, 7.55342e-06) bones/34/enabled = true bones/34/position = Vector3(6.6208e-06, 28.3288, 7.55342e-06) -bones/34/rotation = Quaternion(-0.269413, 0.00612019, 0.168673, 0.948118) +bones/34/rotation = Quaternion(-0.264837, 0.0075152, 0.176516, 0.94797) bones/34/scale = Vector3(1, 1, 1) bones/35/name = "LeftHandThumb1" bones/35/parent = 34 bones/35/rest = Transform3D(0.8891, -0.457712, -1.3113e-06, 0.395629, 0.768507, -0.502867, 0.230169, 0.447099, 0.864364, -2.68173, 2.46615, 1.57617) bones/35/enabled = true bones/35/position = Vector3(-2.68173, 2.46615, 1.57617) -bones/35/rotation = Quaternion(0.284649, -0.0891071, 0.106222, 0.948553) +bones/35/rotation = Quaternion(0.284339, -0.0840352, 0.103361, 0.949424) bones/35/scale = Vector3(1, 1, 1) bones/36/name = "LeftHandThumb2" bones/36/parent = 35 bones/36/rest = Transform3D(0.999863, 0.0164218, 0.00212004, -0.0164305, 0.999857, 0.00411473, -0.00205216, -0.004149, 0.999989, 3.03984e-06, 4.1871, 3.07148e-06) bones/36/enabled = true bones/36/position = Vector3(2.98023e-07, 4.18709, 1.43951e-05) -bones/36/rotation = Quaternion(-0.012463, -0.00528461, -0.0347495, 0.999304) +bones/36/rotation = Quaternion(-0.0138929, -0.00574121, -0.0316338, 0.999386) bones/36/scale = Vector3(1, 1, 1) bones/37/name = "LeftHandThumb3" bones/37/parent = 36 @@ -3559,14 +3556,14 @@ bones/39/parent = 34 bones/39/rest = Transform3D(1, 8.81505e-05, -2.88796e-08, -8.81505e-05, 1, -2.25531e-06, 2.86808e-08, 2.25531e-06, 1, -2.25986, 9.10932, 0.518009) bones/39/enabled = true bones/39/position = Vector3(-2.25986, 9.10932, 0.518024) -bones/39/rotation = Quaternion(0.0830108, 0.0388407, 0.0514195, 0.994463) +bones/39/rotation = Quaternion(0.0770195, 0.0389847, 0.0515855, 0.994931) bones/39/scale = Vector3(1, 1, 1) bones/40/name = "LeftHandIndex2" bones/40/parent = 39 bones/40/rest = Transform3D(1, -0.000210313, 1.21517e-07, 0.000210313, 1, -1.2441e-06, -1.21255e-07, 1.24412e-06, 1, -7.90296e-08, 3.70001, -2.50717e-05) bones/40/enabled = true bones/40/position = Vector3(-1.00166e-07, 3.69999, 4.91004e-06) -bones/40/rotation = Quaternion(0.162598, -0.00866607, -0.00498977, 0.986642) +bones/40/rotation = Quaternion(0.161606, -0.00865864, -0.0051118, 0.986804) bones/40/scale = Vector3(1, 1, 1) bones/41/name = "LeftHandIndex3" bones/41/parent = 40 @@ -3587,14 +3584,14 @@ bones/43/parent = 34 bones/43/rest = Transform3D(1, 6.33157e-05, -1.5605e-08, -6.33157e-05, 1, 1.85453e-06, 1.57224e-08, -1.85453e-06, 1, -3.57426e-05, 9.5334, -7.29997e-05) bones/43/enabled = true bones/43/position = Vector3(-3.58482e-05, 9.53341, -4.3386e-05) -bones/43/rotation = Quaternion(0.166169, -0.0258238, -0.0800847, 0.982501) +bones/43/rotation = Quaternion(0.160956, -0.0268348, -0.0830034, 0.983099) bones/43/scale = Vector3(1, 1, 1) bones/44/name = "LeftHandMiddle2" bones/44/parent = 43 bones/44/rest = Transform3D(1, -4.26227e-05, 1.84394e-07, 4.26227e-05, 1, -5.17247e-06, -1.84174e-07, 5.17248e-06, 1, 7.8513e-07, 3.70001, 5.89059e-07) bones/44/enabled = true bones/44/position = Vector3(7.8513e-07, 3.70001, 5.89059e-07) -bones/44/rotation = Quaternion(0.199962, 3.23689e-06, 0.0137906, 0.979707) +bones/44/rotation = Quaternion(0.211036, -2.03901e-05, 0.0148582, 0.977365) bones/44/scale = Vector3(1, 1, 1) bones/45/name = "LeftHandMiddle3" bones/45/parent = 44 @@ -3615,14 +3612,14 @@ bones/47/parent = 34 bones/47/rest = Transform3D(1, -1.26778e-05, 1.44174e-07, 1.26778e-05, 1, 1.85554e-06, -1.44198e-07, -1.85554e-06, 1, 1.86508, 9.10454, 0.0429883) bones/47/enabled = true bones/47/position = Vector3(1.86508, 9.10454, 0.0430176) -bones/47/rotation = Quaternion(0.289842, -0.0611307, -0.118318, 0.947763) +bones/47/rotation = Quaternion(0.297001, -0.0708289, -0.113667, 0.945438) bones/47/scale = Vector3(1, 1, 1) bones/48/name = "LeftHandRing2" bones/48/parent = 47 bones/48/rest = Transform3D(1, 7.29823e-08, -5.63593e-08, -7.29826e-08, 1, -5.17351e-06, 5.63589e-08, 5.17351e-06, 1, 7.46404e-07, 3.15002, 2.05661e-06) bones/48/enabled = true bones/48/position = Vector3(7.46404e-07, 3.15002, 2.05661e-06) -bones/48/rotation = Quaternion(0.289539, -0.000320947, 0.024351, 0.956857) +bones/48/rotation = Quaternion(0.299352, -0.000364506, 0.0249265, 0.953817) bones/48/scale = Vector3(1, 1, 1) bones/49/name = "LeftHandRing3" bones/49/parent = 48 @@ -3643,14 +3640,14 @@ bones/51/parent = 34 bones/51/rest = Transform3D(0.999992, -0.00408962, 4.99198e-08, 0.00408962, 0.999992, 1.03318e-05, -9.21724e-08, -1.03315e-05, 1, 3.80626, 8.07779, 0.486838) bones/51/enabled = true bones/51/position = Vector3(3.80626, 8.07779, 0.486867) -bones/51/rotation = Quaternion(0.327025, -0.0820818, -0.129876, 0.932443) +bones/51/rotation = Quaternion(0.327225, -0.0828698, -0.126651, 0.932746) bones/51/scale = Vector3(1, 1, 1) bones/52/name = "LeftHandPinky2" bones/52/parent = 51 bones/52/rest = Transform3D(1, 0.000421534, -2.89811e-07, -0.000421534, 1, 6.05504e-06, 2.92363e-07, -6.05491e-06, 1, 5.8622e-07, 3.59999, 1.86631e-05) bones/52/enabled = true bones/52/position = Vector3(-9.29924e-07, 3.59999, -1.33763e-05) -bones/52/rotation = Quaternion(0.35166, 0.00795197, 0.0407161, 0.935208) +bones/52/rotation = Quaternion(0.360969, 0.00803003, 0.0406202, 0.931658) bones/52/scale = Vector3(1, 1, 1) bones/53/name = "LeftHandPinky3" bones/53/parent = 52 @@ -3671,28 +3668,28 @@ bones/55/parent = 0 bones/55/rest = Transform3D(-1, -5.15831e-07, -6.28369e-08, 5.14419e-07, -0.999785, 0.0207118, -7.35073e-08, 0.0207118, 0.999785, -8.20779, -6.77175, -1.51222) bones/55/enabled = true bones/55/position = Vector3(-8.20779, -6.77175, -1.51222) -bones/55/rotation = Quaternion(-0.171821, 0.578667, 0.782421, 0.153099) +bones/55/rotation = Quaternion(-0.17425, 0.59257, 0.774068, 0.138983) bones/55/scale = Vector3(1, 1, 1) bones/56/name = "RightLeg" bones/56/parent = 55 bones/56/rest = Transform3D(1, -3.11163e-08, -6.95594e-08, 3.63214e-08, 0.997098, 0.0761275, 6.69888e-08, -0.0761275, 0.997098, 7.40101e-07, 44.3715, -4.82482e-08) bones/56/enabled = true bones/56/position = Vector3(7.40101e-07, 44.3715, -4.82482e-08) -bones/56/rotation = Quaternion(-0.914553, -0.0261421, 0.0810702, 0.395396) +bones/56/rotation = Quaternion(-0.923313, -0.0260744, 0.0789081, 0.374948) bones/56/scale = Vector3(1, 1, 1) bones/57/name = "RightFoot" bones/57/parent = 56 bones/57/rest = Transform3D(1, 2.89989e-07, -6.30721e-08, -2.18905e-07, 0.577278, -0.816548, -2.00379e-07, 0.816548, 0.577278, -1.88774e-07, 44.5278, 5.80588e-07) bones/57/enabled = true bones/57/position = Vector3(-1.88774e-07, 44.5278, 5.80588e-07) -bones/57/rotation = Quaternion(0.264136, 0.0252433, 0.0430909, 0.963192) +bones/57/rotation = Quaternion(0.272201, 0.039937, 0.0662076, 0.959129) bones/57/scale = Vector3(1, 1, 1) bones/58/name = "RightToeBase" bones/58/parent = 57 bones/58/rest = Transform3D(1, 1.2381e-07, -1.08868e-07, -1.64751e-07, 0.775226, -0.631684, 6.18842e-09, 0.631684, 0.775226, -5.1651e-07, 13.8169, -1.90205e-06) bones/58/enabled = true bones/58/position = Vector3(-5.1651e-07, 13.8169, -1.90205e-06) -bones/58/rotation = Quaternion(0.317939, -1.00007e-07, -1.98108e-07, 0.948111) +bones/58/rotation = Quaternion(0.316531, -1.75597e-07, 4.4775e-07, 0.948582) bones/58/scale = Vector3(1, 1, 1) bones/59/name = "RightToe_End" bones/59/parent = 58 @@ -3706,21 +3703,21 @@ bones/60/parent = 0 bones/60/rest = Transform3D(-1, -5.37325e-07, -1.73336e-07, 5.33615e-07, -0.999785, 0.0207348, -1.84441e-07, 0.0207348, 0.999785, 8.20779, -6.77179, -1.51221) bones/60/enabled = true bones/60/position = Vector3(8.20779, -6.77179, -1.51221) -bones/60/rotation = Quaternion(0.15404, 0.603026, 0.780016, -0.0648573) +bones/60/rotation = Quaternion(0.147747, 0.598258, 0.783679, -0.0781332) bones/60/scale = Vector3(1, 1, 1) bones/61/name = "LeftLeg" bones/61/parent = 60 bones/61/rest = Transform3D(1, -2.27105e-08, -2.66928e-07, 4.29763e-08, 0.997095, 0.0761695, 2.64423e-07, -0.0761695, 0.997095, 8.49408e-07, 44.3714, 5.43912e-09) bones/61/enabled = true bones/61/position = Vector3(8.49408e-07, 44.3714, 5.43912e-09) -bones/61/rotation = Quaternion(-0.898276, -0.00139739, 0.0107046, 0.439299) +bones/61/rotation = Quaternion(-0.896348, 0.0043123, -0.00358725, 0.443317) bones/61/scale = Vector3(1, 1, 1) bones/62/name = "LeftFoot" bones/62/parent = 61 bones/62/rest = Transform3D(1, 2.78454e-07, -1.41493e-07, -2.76279e-07, 0.577262, -0.816559, -1.45696e-07, 0.816559, 0.577262, 6.62281e-07, 44.5279, 6.18865e-08) bones/62/enabled = true bones/62/position = Vector3(6.62281e-07, 44.5279, 6.18865e-08) -bones/62/rotation = Quaternion(0.40896, -0.0618288, -0.11995, 0.902519) +bones/62/rotation = Quaternion(0.417055, -0.0641341, -0.125439, 0.897896) bones/62/scale = Vector3(1, 1, 1) bones/63/name = "LeftToeBase" bones/63/parent = 62 @@ -3746,8 +3743,8 @@ mesh = SubResource("ArrayMesh_1w418") skin = SubResource("Skin_l3wpu") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.908729, 0) -shape = SubResource("CapsuleShape3D_mm42w") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +shape = SubResource("CapsuleShape3D_p1dvg") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] root_node = NodePath("../Mesh") diff --git a/include/blitz/godot/World.h b/include/blitz/godot/World.h index 272ed84..7c0ca39 100644 --- a/include/blitz/godot/World.h +++ b/include/blitz/godot/World.h @@ -25,7 +25,6 @@ class World : public godot::Node3D, public protocol::PacketHandler { void HandlePacket(const protocol::packets::PlayerJoin&) override; void HandlePacket(const protocol::packets::PlayerLeave&) override; - void HandlePacket(const protocol::packets::PlayerPositionAndRotation&) override; protected: NetworkInterface* m_NetworkInterface; diff --git a/include/client/ClientWorld.h b/include/client/ClientWorld.h index 4b8087b..919abca 100644 --- a/include/client/ClientWorld.h +++ b/include/client/ClientWorld.h @@ -12,6 +12,8 @@ class ClientWorld : public World { ~ClientWorld(); void _process(float delta); + void HandlePacket(const protocol::packets::PlayerPositionAndRotation&) override; + private: void UpdatePlayerPos(); }; diff --git a/include/client/FirstPersonPlayer.h b/include/client/FirstPersonPlayer.h index f5d2f89..9e7c2bc 100644 --- a/include/client/FirstPersonPlayer.h +++ b/include/client/FirstPersonPlayer.h @@ -16,7 +16,7 @@ class FirstPersonPlayer : public Player { // Godot overrides void _unhandled_input(const godot::Ref&); - void _physics_process(float delta); + void _physics_process(float delta) override; void _ready() override; private: diff --git a/include/client/Player.h b/include/client/Player.h index 5f1cc9f..6afe037 100644 --- a/include/client/Player.h +++ b/include/client/Player.h @@ -21,7 +21,7 @@ class Player : public godot::CharacterBody3D { ~Player(); void _ready(); - void _physics_process(float delta); + virtual void _physics_process(float delta); void animate(float delta); godot::Vector3 GetCameraRotation() const; @@ -36,7 +36,6 @@ class Player : public godot::CharacterBody3D { godot::AnimationTree* m_AnimationTree; godot::Vector3 m_SnapVector; - float m_Speed; PeerID m_PeerId; friend class World; diff --git a/include/server/ServerWorld.h b/include/server/ServerWorld.h index 2f609f8..9c3270b 100644 --- a/include/server/ServerWorld.h +++ b/include/server/ServerWorld.h @@ -12,7 +12,8 @@ class ServerWorld : public World { ~ServerWorld(); void _process(float delta); - private: + void HandlePacket(const protocol::packets::PlayerPositionAndRotation&) override; + void SyncPlayersPos(); }; diff --git a/src/blitz/godot/World.cpp b/src/blitz/godot/World.cpp index 86b547f..972a16f 100644 --- a/src/blitz/godot/World.cpp +++ b/src/blitz/godot/World.cpp @@ -64,14 +64,6 @@ void World::HandlePacket(const protocol::packets::PlayerLeave& a_PlayerLeave) { RemovePlayer(a_PlayerLeave.m_Data.m_PlayerId); } -void World::HandlePacket(const protocol::packets::PlayerPositionAndRotation& a_PlayerPos) { - const auto& data = a_PlayerPos.m_Data; - if (data.m_Player == get_multiplayer()->get_unique_id() || data.m_Player != a_PlayerPos.m_Sender) - return; - - SetPlayerPositionAndRotation(data.m_Player, data.m_Position, data.m_Rotation, data.m_Velocity); -} - void World::AddPlayer(PlayerID a_PlayerId, String a_PlayerName) { UtilityFunctions::print("New Player with id : ", a_PlayerId, " and name ", a_PlayerName); if (a_PlayerId == get_multiplayer()->get_unique_id()) { diff --git a/src/blitz/protocol/Packets.cpp b/src/blitz/protocol/Packets.cpp index 38fdeeb..e858461 100644 --- a/src/blitz/protocol/Packets.cpp +++ b/src/blitz/protocol/Packets.cpp @@ -14,7 +14,8 @@ void packets::ConcretePacket::Accept(PacketVisitor& a_Visitor) const { a_Visitor.Visit(*this); } -#define DeclarePacket(PacketName, packetSendType, packetSenderType) static_assert(static_cast(PacketSendType::packetSendType) && static_cast(PacketSenderType::packetSenderType)); +#define DeclarePacket(PacketName, packetSendType, packetSenderType) \ + static_assert(static_cast(PacketSendType::packetSendType) && static_cast(PacketSenderType::packetSenderType)); DeclareAllPacket() diff --git a/src/client/ClientWorld.cpp b/src/client/ClientWorld.cpp index 4f30631..85f882d 100644 --- a/src/client/ClientWorld.cpp +++ b/src/client/ClientWorld.cpp @@ -5,6 +5,8 @@ #include #include +#include + namespace blitz { using namespace godot; @@ -20,10 +22,12 @@ void ClientWorld::_process(float delta) { if (Engine::get_singleton()->is_editor_hint()) return; #endif + m_PassedTime += delta; if (m_PassedTime < 0.05f) return; + m_PassedTime = 0.0f; UpdatePlayerPos(); } @@ -36,4 +40,18 @@ void ClientWorld::UpdatePlayerPos() { } } +void ClientWorld::HandlePacket(const protocol::packets::PlayerPositionAndRotation& a_PlayerPos) { + const auto& data = a_PlayerPos.m_Data; + if (data.m_Player == get_multiplayer()->get_unique_id()) { + Player* player = GetPlayerById(get_multiplayer()->get_unique_id()); + if (player && (a_PlayerPos.m_Data.m_Position - player->get_position()).length() > 10) { + SetPlayerPositionAndRotation(data.m_Player, data.m_Position, data.m_Rotation, data.m_Velocity); + godot::UtilityFunctions::print("Teleported to : ", data.m_Position); + } + return; + } + + SetPlayerPositionAndRotation(data.m_Player, data.m_Position, data.m_Rotation, data.m_Velocity); +} + } // namespace blitz \ No newline at end of file diff --git a/src/client/FirstPersonPlayer.cpp b/src/client/FirstPersonPlayer.cpp index 2d65420..0f83999 100644 --- a/src/client/FirstPersonPlayer.cpp +++ b/src/client/FirstPersonPlayer.cpp @@ -39,7 +39,7 @@ static const float AnimationBlend = 7.0; void FirstPersonPlayer::_bind_methods() {} -FirstPersonPlayer::FirstPersonPlayer() : m_BobTime(0) {} +FirstPersonPlayer::FirstPersonPlayer() : Player(), m_BobTime(0) {} FirstPersonPlayer::~FirstPersonPlayer() {} @@ -52,6 +52,9 @@ void FirstPersonPlayer::_ready() { m_Camera = Object::cast_to(m_Head->find_child("Camera")); m_AnimationTree = Object::cast_to(find_child("AnimationTree")); m_Mesh = Object::cast_to(find_child("Mesh")); + + set_position({0, 0, 0}); + set_velocity({0, 0, 0}); } void FirstPersonPlayer::_unhandled_input(const godot::Ref& a_Event) { @@ -89,9 +92,9 @@ void FirstPersonPlayer::_physics_process(float a_Delta) { UpdateFOV(a_Delta); UpdateBobbing(a_Delta); - UpdateAnimation(a_Delta); - move_and_slide(); + + UpdateAnimation(a_Delta); } void FirstPersonPlayer::UpdateBobbing(float a_Delta) { diff --git a/src/client/Player.cpp b/src/client/Player.cpp index b3711d7..487a6e6 100644 --- a/src/client/Player.cpp +++ b/src/client/Player.cpp @@ -7,7 +7,7 @@ #include static const float WalkSpeed = 2.0; -static const float RunSpeed = 5.0; +static const float RunSpeed = 7.0; static const float JumpStrength = 15.0; static const float Gravity = 50.0; @@ -20,7 +20,7 @@ using namespace godot; void Player::_bind_methods() {} -Player::Player() {} +Player::Player() : m_PeerId(0) {} Player::~Player() {} @@ -31,7 +31,9 @@ void Player::_ready() { DEV_ASSERT(m_Mesh); DEV_ASSERT(m_AnimationTree); - apply_floor_snap(); + set_position({0, 0, 0}); + set_velocity({0, 0, 0}); + animate(0); } @@ -39,6 +41,7 @@ void Player::_physics_process(float delta) { if (godot::Engine::get_singleton()->is_editor_hint()) return; + move_and_slide(); animate(delta); } @@ -46,8 +49,10 @@ void Player::animate(float delta) { if (is_on_floor()) { m_AnimationTree->set("parameters/ground_air_transition/transition_request", "grounded"); - if (get_velocity().length() > 0) { - if (m_Speed == RunSpeed) { + float speed = get_velocity().length(); + + if (speed > 0.2f) { + if (speed >= RunSpeed) { m_AnimationTree->set("parameters/iwr_blend/blend_amount", godot::UtilityFunctions::lerp( m_AnimationTree->get("parameters/iwr_blend/blend_amount"), 1.0, delta * AnimationBlend)); diff --git a/src/server/ServerWorld.cpp b/src/server/ServerWorld.cpp index 8c86fa7..a556d1d 100644 --- a/src/server/ServerWorld.cpp +++ b/src/server/ServerWorld.cpp @@ -23,6 +23,7 @@ void ServerWorld::_process(float delta) { if (m_PassedTime < 0.05f) return; + m_PassedTime = 0.0f; SyncPlayersPos(); } @@ -35,4 +36,12 @@ void ServerWorld::SyncPlayersPos() { } } +void ServerWorld::HandlePacket(const protocol::packets::PlayerPositionAndRotation& a_PlayerPos) { + const auto& data = a_PlayerPos.m_Data; + if (data.m_Player != a_PlayerPos.m_Sender) + return; + + SetPlayerPositionAndRotation(data.m_Player, data.m_Position, data.m_Rotation, data.m_Velocity); +} + } // namespace blitz \ No newline at end of file