X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fnet%2FPacketTest.cpp;h=248bb61e07e7df6ac1aa360e79821f2e2367b1ce;hb=0d580658b896dfec07466c31ae4847455724ee95;hp=27ee32c7151773b29d7b6ade1c1cbf0a3dd0cb6b;hpb=33b37e7242e4cbfa76e4a0d6e5bb54223b541162;p=blank.git

diff --git a/tst/net/PacketTest.cpp b/tst/net/PacketTest.cpp
index 27ee32c..248bb61 100644
--- a/tst/net/PacketTest.cpp
+++ b/tst/net/PacketTest.cpp
@@ -112,12 +112,14 @@ 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.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.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);
@@ -207,13 +209,15 @@ 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.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.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 +302,13 @@ 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.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.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 +341,13 @@ 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.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.pitch = 0.3f;
+	write_state.yaw = -2.3f;
+	write_entity.SetState(write_state);
 	pack.WritePlayer(write_entity);
 
 	EntityState read_state;
@@ -673,19 +679,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)
 	);
 }