glm backwards compatibility

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

diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp
index 27ee32c7151773b29d7b6ade1c1cbf0a3dd0cb6b..cf76d151520ee1c38618a6edb40ef352419faddb 100644 (file)
--- a/tst/net/PacketTest.cpp
+++ b/tst/net/PacketTest.cpp
@@ -1,5 +1,6 @@
 #include "PacketTest.hpp"
 
+#include "geometry/const.hpp"
 #include "model/Model.hpp"
 #include "world/Entity.hpp"
 
@@ -112,12 +113,13 @@ void PacketTest::testJoin() {
 
        Entity write_entity;
        write_entity.ID(534574);
-       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().pitch = 0.3f;
-       write_entity.GetState().yaw = -2.3f;
+       EntityState write_state;
+       write_state.pos = { { 7, 2, -3 }, { 1.5f, 0.9f, 12.0f } };
+       write_state.velocity = { 0.025f, 0.001f, 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);
        uint32_t read_id = 0;
        EntityState read_state;
        pack.WritePlayer(write_entity);
@@ -161,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;
@@ -207,13 +208,14 @@ void PacketTest::testSpawnEntity() {
        write_entity.ID(534574);
        Model model;
        model.ID(23);
+       model.Enumerate();
        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().pitch = 0.3f;
-       write_entity.GetState().yaw = -2.3f;
+       EntityState write_state;
+       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;
+       write_entity.SetState(write_state);
        write_entity.Bounds({{ -1, -1, -1 }, { 1, 1, 1 }});
        write_entity.WorldCollidable(true);
        write_entity.Name("blah");
@@ -298,12 +300,12 @@ void PacketTest::testEntityUpdate() {
 
        Entity write_entity;
        write_entity.ID(8567234);
-       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().pitch = 0.3f;
-       write_entity.GetState().yaw = -2.3f;
+       EntityState write_state;
+       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;
+       write_entity.SetState(write_state);
        pack.WriteEntity(write_entity, write_base, 1);
        pack.WriteEntity(write_entity, write_base, 0);
        pack.WriteEntity(write_entity, write_base, 2);
@@ -336,12 +338,12 @@ void PacketTest::testPlayerCorrection() {
        );
 
        Entity write_entity;
-       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().pitch = 0.3f;
-       write_entity.GetState().yaw = -2.3f;
+       EntityState write_state;
+       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;
+       write_entity.SetState(write_state);
        pack.WritePlayer(write_entity);
 
        EntityState read_state;
@@ -588,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",
@@ -673,19 +675,19 @@ void PacketTest::AssertEqual(
 ) {
        CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
                message + " (W component)",
-               expected.w, actual.w, numeric_limits<float>::epsilon()
+               expected.w, actual.w, (1.0f / 32767.0f)
        );
        CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
                message + " (X component)",
-               expected.x, actual.x, numeric_limits<float>::epsilon()
+               expected.x, actual.x, (1.0f / 32767.0f)
        );
        CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
                message + " (Y component)",
-               expected.y, actual.y, numeric_limits<float>::epsilon()
+               expected.y, actual.y, (1.0f / 32767.0f)
        );
        CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
                message + " (Z component)",
-               expected.z, actual.z, numeric_limits<float>::epsilon()
+               expected.z, actual.z, (1.0f / 32767.0f)
        );
 }