get rid of angular velocity

[blank.git] / tst / net / PacketTest.cpp

diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp
index b5f9eed57f506255a56af4a63991c494757ec7ee..d616fd32101cecca72d2a9588c7c7a86aad351ab 100644 (file)
--- a/tst/net/PacketTest.cpp
+++ b/tst/net/PacketTest.cpp
@@ -1,6 +1,6 @@
 #include "PacketTest.hpp"
 
-#include "model/CompositeModel.hpp"
+#include "model/Model.hpp"
 #include "world/Entity.hpp"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(blank::test::PacketTest);
@@ -34,14 +34,6 @@ void PacketTest::testSizes() {
                "unexpected size of vec3i",
                size_t(12), sizeof(glm::ivec3)
        );
-       CPPUNIT_ASSERT_EQUAL_MESSAGE(
-               "unexpected size of quat",
-               size_t(16), sizeof(glm::quat)
-       );
-       CPPUNIT_ASSERT_EQUAL_MESSAGE(
-               "unexpected size of entity state",
-               size_t(64), sizeof(EntityState)
-       );
 }
 
 void PacketTest::testControl() {
@@ -116,7 +108,7 @@ void PacketTest::testLogin() {
 
 void PacketTest::testJoin() {
        auto pack = Packet::Make<Packet::Join>(udp_pack);
-       AssertPacket("Join", 2, 68, 100, pack);
+       AssertPacket("Join", 2, 54, 86, pack);
 
        Entity write_entity;
        write_entity.ID(534574);
@@ -124,7 +116,6 @@ 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 };
        uint32_t read_id = 0;
        EntityState read_state;
        pack.WritePlayer(write_entity);
@@ -165,14 +156,13 @@ void PacketTest::testPart() {
 
 void PacketTest::testPlayerUpdate() {
        auto pack = Packet::Make<Packet::PlayerUpdate>(udp_pack);
-       AssertPacket("PlayerUpdate", 4, 76, pack);
+       AssertPacket("PlayerUpdate", 4, 62, 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;
@@ -225,28 +215,27 @@ void PacketTest::testPlayerUpdate() {
 
 void PacketTest::testSpawnEntity() {
        auto pack = Packet::Make<Packet::SpawnEntity>(udp_pack);
-       AssertPacket("SpawnEntity", 5, 100, 132, pack);
+       AssertPacket("SpawnEntity", 5, 87, 118, pack);
 
        Entity write_entity;
        write_entity.ID(534574);
-       CompositeModel model;
+       Model model;
        model.ID(23);
        model.Instantiate(write_entity.GetModel());
        write_entity.GetState().chunk_pos = { 7, 2, -3 };
        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.Bounds({{ -1, -1, -1 }, { 1, 1, 1 }});
        write_entity.WorldCollidable(true);
        write_entity.Name("blah");
        pack.WriteEntity(write_entity);
 
        uint32_t entity_id;
-       uint32_t skeleton_id;
+       uint32_t model_id;
        Entity read_entity;
        pack.ReadEntityID(entity_id);
-       pack.ReadSkeletonID(skeleton_id);
+       pack.ReadModelID(model_id);
        pack.ReadEntity(read_entity);
 
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -254,8 +243,8 @@ void PacketTest::testSpawnEntity() {
                write_entity.ID(), entity_id
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
-               "skeleton ID not correctly transported in SpawnEntity packet",
-               write_entity.GetModel().GetModel().ID(), skeleton_id
+               "model ID not correctly transported in SpawnEntity packet",
+               write_entity.GetModel().GetModel().ID(), model_id
        );
        AssertEqual(
                "entity state not correctly transported in PlayerUpdate packet",
@@ -292,22 +281,32 @@ void PacketTest::testDespawnEntity() {
 
 void PacketTest::testEntityUpdate() {
        auto pack = Packet::Make<Packet::EntityUpdate>(udp_pack);
-       AssertPacket("EntityUpdate", 7, 4, 480, pack);
+       AssertPacket("EntityUpdate", 7, 16, 466, pack);
 
        pack.length = Packet::EntityUpdate::GetSize(3);
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "length not correctly set in EntityUpdate packet",
-               size_t(4 + 3 * 68), pack.length
+               size_t(16 + 3 * 45), pack.length
        );
 
        uint32_t write_count = 3;
-       uint32_t read_count;
+       glm::ivec3 write_base(8, -15, 1);
        pack.WriteEntityCount(write_count);
+       pack.WriteChunkBase(write_base);
+
+       uint32_t read_count;
+       glm::ivec3 read_base;
        pack.ReadEntityCount(read_count);
+       pack.ReadChunkBase(read_base);
+
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "entity count not correctly transported in EntityUpdate packet",
                write_count, read_count
        );
+       AssertEqual(
+               "chunk base not correctly transported in EntityUpdate packet",
+               write_base, read_base
+       );
 
        Entity write_entity;
        write_entity.ID(8567234);
@@ -315,15 +314,14 @@ 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 };
-       pack.WriteEntity(write_entity, 1);
-       pack.WriteEntity(write_entity, 0);
-       pack.WriteEntity(write_entity, 2);
+       pack.WriteEntity(write_entity, write_base, 1);
+       pack.WriteEntity(write_entity, write_base, 0);
+       pack.WriteEntity(write_entity, write_base, 2);
 
        uint32_t read_id;
        EntityState read_state;
        pack.ReadEntityID(read_id, 1);
-       pack.ReadEntityState(read_state, 1);
+       pack.ReadEntityState(read_state, write_base, 1);
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "entity ID not correctly transported in EntityUpdate packet",
                write_entity.ID(), read_id
@@ -336,7 +334,7 @@ void PacketTest::testEntityUpdate() {
 
 void PacketTest::testPlayerCorrection() {
        auto pack = Packet::Make<Packet::PlayerCorrection>(udp_pack);
-       AssertPacket("PlayerCorrection", 8, 66, pack);
+       AssertPacket("PlayerCorrection", 8, 52, pack);
 
        uint16_t write_seq = 50050;
        uint16_t read_seq;
@@ -352,7 +350,6 @@ 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 };
        pack.WritePlayer(write_entity);
 
        EntityState read_state;
@@ -510,6 +507,46 @@ void PacketTest::testBlockUpdate() {
        );
 }
 
+void PacketTest::testMessage() {
+       auto pack = Packet::Make<Packet::Message>(udp_pack);
+       AssertPacket("Message", 12, 6, 455, pack);
+
+       const uint8_t write_type = 1;
+       const uint32_t write_ref = 6433235;
+       const string write_msg("hello, world");
+
+       pack.length = Packet::Message::GetSize(write_msg);
+       CPPUNIT_ASSERT_EQUAL_MESSAGE(
+               "length not correctly set in BlockUpdate packet",
+               size_t(5 + write_msg.size() + 1), pack.length
+       );
+
+       pack.WriteType(write_type);
+       pack.WriteReferral(write_ref);
+       pack.WriteMessage(write_msg);
+
+       uint8_t read_type = 5;
+       uint32_t read_ref = 884373;
+       string read_msg;
+
+       pack.ReadType(read_type);
+       pack.ReadReferral(read_ref);
+       pack.ReadMessage(read_msg);
+
+       CPPUNIT_ASSERT_EQUAL_MESSAGE(
+               "type not correctly transported in Message packet",
+               write_type, read_type
+       );
+       CPPUNIT_ASSERT_EQUAL_MESSAGE(
+               "referral not correctly transported in Message packet",
+               write_ref, read_ref
+       );
+       CPPUNIT_ASSERT_EQUAL_MESSAGE(
+               "message not correctly transported in Message packet",
+               write_msg, read_msg
+       );
+}
+
 
 void PacketTest::AssertPacket(
        const string &name,
@@ -563,7 +600,7 @@ void PacketTest::AssertEqual(
        );
        AssertEqual(
                message + ": bad block position",
-               expected.block_pos, actual.block_pos
+               expected.block_pos, actual.block_pos, 16.0f/65535.0f // that's about the max accuracy that packing's going to give us
        );
        AssertEqual(
                message + ": bad velocity",
@@ -573,10 +610,6 @@ void PacketTest::AssertEqual(
                message + ": bad orientation",
                expected.orient, actual.orient
        );
-       AssertEqual(
-               message + ": bad angular velocity",
-               expected.ang_vel, actual.ang_vel
-       );
 }
 
 void PacketTest::AssertEqual(