glm backwards compatibility

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

diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp
index 695010dea4db7efb1246dded120ab80e2bb5eef8..cf76d151520ee1c38618a6edb40ef352419faddb 100644 (file)
--- a/tst/net/PacketTest.cpp
+++ b/tst/net/PacketTest.cpp
@@ -114,10 +114,9 @@ void PacketTest::testJoin() {
        Entity write_entity;
        write_entity.ID(534574);
        EntityState write_state;
-       write_state.chunk_pos = { 7, 2, -3 };
-       write_state.block_pos = { 1.5f, 0.9f, 12.0f };
+       write_state.pos = { { 7, 2, -3 }, { 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.orient = glm::normalize(glm::quat(0.863f, 0.0f, 0.505f, 0.0f));
        write_state.pitch = 0.3f;
        write_state.yaw = -2.3f;
        write_entity.SetState(write_state);
@@ -164,10 +163,9 @@ void PacketTest::testPlayerUpdate() {
        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.pos = { { 7, 2, -3 }, { 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.orient = { 0.0f, 0.0f, 1.0f, 0.0f };
        glm::vec3 write_movement(0.5f, -1.0f, 1.0f);
        uint8_t write_actions = 0x05;
        uint8_t write_slot = 3;
@@ -213,8 +211,7 @@ void PacketTest::testSpawnEntity() {
        model.Enumerate();
        model.Instantiate(write_entity.GetModel());
        EntityState write_state;
-       write_state.chunk_pos = { 7, 2, -3 };
-       write_state.block_pos = { 1.5f, 0.9f, 12.0f };
+       write_state.pos = { { 7, 2, -3 }, { 1.5f, 0.9f, 12.0f } };
        write_state.velocity = { 0.025f, 0.001f, 0.0f };
        write_state.pitch = 0.3f;
        write_state.yaw = -2.3f;
@@ -304,8 +301,7 @@ void PacketTest::testEntityUpdate() {
        Entity write_entity;
        write_entity.ID(8567234);
        EntityState write_state;
-       write_state.chunk_pos = { 7, 2, -3 };
-       write_state.block_pos = { 1.5f, 0.9f, 12.0f };
+       write_state.pos = { { 7, 2, -3 }, { 1.5f, 0.9f, 12.0f } };
        write_state.velocity = { 0.025f, 0.001f, 0.0f };
        write_state.pitch = 0.3f;
        write_state.yaw = -2.3f;
@@ -343,8 +339,7 @@ void PacketTest::testPlayerCorrection() {
 
        Entity write_entity;
        EntityState write_state;
-       write_state.chunk_pos = { 7, 2, -3 };
-       write_state.block_pos = { 1.5f, 0.9f, 12.0f };
+       write_state.pos = { { 7, 2, -3 }, { 1.5f, 0.9f, 12.0f } };
        write_state.velocity = { 0.025f, 0.001f, 0.0f };
        write_state.pitch = 0.3f;
        write_state.yaw = -2.3f;
@@ -595,11 +590,11 @@ void PacketTest::AssertEqual(
 ) {
        AssertEqual(
                message + ": bad chunk position",
-               expected.chunk_pos, actual.chunk_pos
+               expected.pos.chunk, actual.pos.chunk
        );
        AssertEqual(
                message + ": bad block position",
-               expected.block_pos, actual.block_pos, 16.0f/65535.0f // that's about the max accuracy that packing's going to give us
+               expected.pos.block, actual.pos.block, 16.0f/65535.0f // that's about the max accuracy that packing's going to give us
        );
        AssertEqual(
                message + ": bad velocity",