X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fnet%2FPacketTest.cpp;h=27ee32c7151773b29d7b6ade1c1cbf0a3dd0cb6b;hb=33b37e7242e4cbfa76e4a0d6e5bb54223b541162;hp=6803110ca969092d3e1b1c890bfb6f00d6283ef3;hpb=7c5e04a4af82947ae8e26db3d03f13a555c10aba;p=blank.git diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp index 6803110..27ee32c 100644 --- a/tst/net/PacketTest.cpp +++ b/tst/net/PacketTest.cpp @@ -108,7 +108,7 @@ void PacketTest::testLogin() { void PacketTest::testJoin() { auto pack = Packet::Make(udp_pack); - AssertPacket("Join", 2, 54, 86, pack); + AssertPacket("Join", 2, 47, 78, pack); Entity write_entity; write_entity.ID(534574); @@ -116,7 +116,8 @@ void PacketTest::testJoin() { write_entity.GetState().block_pos = { 1.5f, 0.9f, 12.0f }; write_entity.GetState().velocity = { 0.025f, 0.001f, 0.0f }; write_entity.GetState().orient = { 1.0f, 0.0f, 0.0f, 0.0f }; - write_entity.GetState().ang_vel = { 0.01f, 0.00302f, 0.0985f }; + write_entity.GetState().pitch = 0.3f; + write_entity.GetState().yaw = -2.3f; uint32_t read_id = 0; EntityState read_state; pack.WritePlayer(write_entity); @@ -157,36 +158,27 @@ void PacketTest::testPart() { void PacketTest::testPlayerUpdate() { auto pack = Packet::Make(udp_pack); - AssertPacket("PlayerUpdate", 4, 62, pack); + AssertPacket("PlayerUpdate", 4, 50, pack); EntityState write_state; write_state.chunk_pos = { 7, 2, -3 }; write_state.block_pos = { 1.5f, 0.9f, 12.0f }; write_state.velocity = { 0.025f, 0.001f, 0.0f }; write_state.orient = { 1.0f, 0.0f, 0.0f, 0.0f }; - write_state.ang_vel = { 0.01f, 0.00302f, 0.0985f }; glm::vec3 write_movement(0.5f, -1.0f, 1.0f); - float write_pitch = 1.25f; - float write_yaw = -2.5f; uint8_t write_actions = 0x05; uint8_t write_slot = 3; pack.WritePredictedState(write_state); pack.WriteMovement(write_movement); - pack.WritePitch(write_pitch); - pack.WriteYaw(write_yaw); pack.WriteActions(write_actions); pack.WriteSlot(write_slot); EntityState read_state; glm::vec3 read_movement; - float read_pitch; - float read_yaw; uint8_t read_actions; uint8_t read_slot; pack.ReadPredictedState(read_state); pack.ReadMovement(read_movement); - pack.ReadPitch(read_pitch); - pack.ReadYaw(read_yaw); pack.ReadActions(read_actions); pack.ReadSlot(read_slot); AssertEqual( @@ -197,14 +189,6 @@ void PacketTest::testPlayerUpdate() { "player movement input not correctly transported in PlayerUpdate packet", write_movement, read_movement, 0.0001f ); - CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( - "player pitch input not correctly transported in PlayerUpdate packet", - write_pitch, read_pitch, 0.0001f - ); - CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( - "player yaw input not correctly transported in PlayerUpdate packet", - write_yaw, read_yaw, 0.0001f - ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "player actions not correctly transported in PlayerUpdate packet", int(write_actions), int(read_actions) @@ -217,7 +201,7 @@ void PacketTest::testPlayerUpdate() { void PacketTest::testSpawnEntity() { auto pack = Packet::Make(udp_pack); - AssertPacket("SpawnEntity", 5, 87, 118, pack); + AssertPacket("SpawnEntity", 5, 79, 110, pack); Entity write_entity; write_entity.ID(534574); @@ -228,7 +212,8 @@ void PacketTest::testSpawnEntity() { write_entity.GetState().block_pos = { 1.5f, 0.9f, 12.0f }; write_entity.GetState().velocity = { 0.025f, 0.001f, 0.0f }; write_entity.GetState().orient = { 1.0f, 0.0f, 0.0f, 0.0f }; - write_entity.GetState().ang_vel = { 0.01f, 0.00302f, 0.0985f }; + write_entity.GetState().pitch = 0.3f; + write_entity.GetState().yaw = -2.3f; write_entity.Bounds({{ -1, -1, -1 }, { 1, 1, 1 }}); write_entity.WorldCollidable(true); write_entity.Name("blah"); @@ -284,12 +269,12 @@ void PacketTest::testDespawnEntity() { void PacketTest::testEntityUpdate() { auto pack = Packet::Make(udp_pack); - AssertPacket("EntityUpdate", 7, 16, 466, pack); + AssertPacket("EntityUpdate", 7, 16, 460, pack); pack.length = Packet::EntityUpdate::GetSize(3); CPPUNIT_ASSERT_EQUAL_MESSAGE( "length not correctly set in EntityUpdate packet", - size_t(16 + 3 * 45), pack.length + size_t(16 + 3 * 37), pack.length ); uint32_t write_count = 3; @@ -317,7 +302,8 @@ void PacketTest::testEntityUpdate() { write_entity.GetState().block_pos = { 1.5f, 0.9f, 12.0f }; write_entity.GetState().velocity = { 0.025f, 0.001f, 0.0f }; write_entity.GetState().orient = { 1.0f, 0.0f, 0.0f, 0.0f }; - write_entity.GetState().ang_vel = { 0.01f, 0.00302f, 0.0985f }; + write_entity.GetState().pitch = 0.3f; + write_entity.GetState().yaw = -2.3f; pack.WriteEntity(write_entity, write_base, 1); pack.WriteEntity(write_entity, write_base, 0); pack.WriteEntity(write_entity, write_base, 2); @@ -338,7 +324,7 @@ void PacketTest::testEntityUpdate() { void PacketTest::testPlayerCorrection() { auto pack = Packet::Make(udp_pack); - AssertPacket("PlayerCorrection", 8, 52, pack); + AssertPacket("PlayerCorrection", 8, 44, pack); uint16_t write_seq = 50050; uint16_t read_seq; @@ -354,7 +340,8 @@ void PacketTest::testPlayerCorrection() { write_entity.GetState().block_pos = { 1.5f, 0.9f, 12.0f }; write_entity.GetState().velocity = { 0.025f, 0.001f, 0.0f }; write_entity.GetState().orient = { 1.0f, 0.0f, 0.0f, 0.0f }; - write_entity.GetState().ang_vel = { 0.01f, 0.00302f, 0.0985f }; + write_entity.GetState().pitch = 0.3f; + write_entity.GetState().yaw = -2.3f; pack.WritePlayer(write_entity); EntityState read_state; @@ -615,9 +602,13 @@ void PacketTest::AssertEqual( message + ": bad orientation", expected.orient, actual.orient ); - AssertEqual( - message + ": bad angular velocity", - expected.ang_vel, actual.ang_vel + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( + message + ": bad pitch", + expected.pitch, actual.pitch, PI/65534.0f + ); + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( + message + ": bad yaw", + expected.yaw, actual.yaw, PI/32767.0f ); }