diff --git a/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp index 3f6ea283a3..6d43a2a82d 100644 --- a/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp +++ b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp @@ -122,6 +122,9 @@ namespace UnitTest } }; + static constexpr float BLEND_FACTOR_SCALE = 1.1f; + static constexpr uint32_t TIME_SCALE = 10; + DeltaDataContainer TestDeltaContainer() { DeltaDataContainer testContainer; @@ -133,8 +136,8 @@ namespace UnitTest { testContainer.m_container[i].m_packetId = AzNetworking::PacketId(i); testContainer.m_container[i].m_id = i; - testContainer.m_container[i].m_timeMs = AZ::TimeMs(i * 10); - testContainer.m_container[i].m_blendFactor = 1.1f * i; + testContainer.m_container[i].m_timeMs = AZ::TimeMs(i * TIME_SCALE); + testContainer.m_container[i].m_blendFactor = BLEND_FACTOR_SCALE * i; growVector.push_back(i); testContainer.m_container[i].m_growVector = growVector; shrinkVector.resize(testContainer.m_container.array_size - i); diff --git a/Gems/Multiplayer/Code/Tests/NetworkInputTests.cpp b/Gems/Multiplayer/Code/Tests/NetworkInputTests.cpp index 02bb50fe4e..64381bf195 100644 --- a/Gems/Multiplayer/Code/Tests/NetworkInputTests.cpp +++ b/Gems/Multiplayer/Code/Tests/NetworkInputTests.cpp @@ -63,6 +63,9 @@ namespace Multiplayer AZStd::unique_ptr m_root; }; + constexpr float BLEND_FACTOR_SCALE = 1.1f; + constexpr uint32_t TIME_SCALE = 10; + TEST_F(NetworkInputTests, NetworkInputMembers) { const NetworkEntityHandle handle(m_root->m_entity.get(), m_networkEntityTracker.get()); @@ -72,13 +75,13 @@ namespace Multiplayer { inArray[i].SetClientInputId(ClientInputId(i)); inArray[i].SetHostFrameId(HostFrameId(i)); - inArray[i].SetHostBlendFactor(i * 1.1f); - inArray[i].SetHostTimeMs(AZ::TimeMs(i * 10)); + inArray[i].SetHostBlendFactor(i * BLEND_FACTOR_SCALE); + inArray[i].SetHostTimeMs(AZ::TimeMs(i * TIME_SCALE)); EXPECT_EQ(inArray[i].GetClientInputId(), ClientInputId(i)); EXPECT_EQ(inArray[i].GetHostFrameId(), HostFrameId(i)); - EXPECT_NEAR(inArray[i].GetHostBlendFactor(), i * 1.1f, 0.001f); - EXPECT_EQ(inArray[i].GetHostTimeMs(), AZ::TimeMs(i * 10)); + EXPECT_NEAR(inArray[i].GetHostBlendFactor(), i * BLEND_FACTOR_SCALE, 0.001f); + EXPECT_EQ(inArray[i].GetHostTimeMs(), AZ::TimeMs(i * TIME_SCALE)); } for (uint32_t i = 0; i < NetworkInputArray::MaxElements; ++i) @@ -88,7 +91,7 @@ namespace Multiplayer HostFrameId& hid = inArray[i].ModifyHostFrameId(); hid = HostFrameId(i * 2); AZ::TimeMs& time = inArray[i].ModifyHostTimeMs(); - time = AZ::TimeMs(i * 20); + time = AZ::TimeMs(i * 2 * TIME_SCALE); EXPECT_EQ(inArray[i].GetClientInputId(), cid); EXPECT_EQ(inArray[i].GetHostFrameId(), hid); @@ -105,8 +108,8 @@ namespace Multiplayer { inArray[i].SetClientInputId(ClientInputId(i)); inArray[i].SetHostFrameId(HostFrameId(i)); - inArray[i].SetHostBlendFactor(i * 1.1f); - inArray[i].SetHostTimeMs(AZ::TimeMs(i * 10)); + inArray[i].SetHostBlendFactor(i * BLEND_FACTOR_SCALE); + inArray[i].SetHostTimeMs(AZ::TimeMs(i * TIME_SCALE)); } AZStd::array buffer; @@ -139,8 +142,8 @@ namespace Multiplayer { inArray[i].SetClientInputId(ClientInputId(i)); inArray[i].SetHostFrameId(HostFrameId(i)); - inArray[i].SetHostBlendFactor(i * 1.1f); - inArray[i].SetHostTimeMs(AZ::TimeMs(i * 10)); + inArray[i].SetHostBlendFactor(i * BLEND_FACTOR_SCALE); + inArray[i].SetHostTimeMs(AZ::TimeMs(i * TIME_SCALE)); inHistory.PushBack(inArray[i]); } @@ -152,8 +155,8 @@ namespace Multiplayer NetworkInput input = inHistory.Front(); EXPECT_EQ(input.GetClientInputId(), ClientInputId(i)); EXPECT_EQ(input.GetHostFrameId(), HostFrameId(i)); - EXPECT_NEAR(input.GetHostBlendFactor(), i * 1.1f, 0.001f); - EXPECT_EQ(input.GetHostTimeMs(), AZ::TimeMs(i * 10)); + EXPECT_NEAR(input.GetHostBlendFactor(), i * BLEND_FACTOR_SCALE, 0.001f); + EXPECT_EQ(input.GetHostTimeMs(), AZ::TimeMs(i * TIME_SCALE)); inHistory.PopFront(); } @@ -170,8 +173,8 @@ namespace Multiplayer { inArray[i].SetClientInputId(ClientInputId(i)); inArray[i].SetHostFrameId(HostFrameId(i)); - inArray[i].SetHostBlendFactor(i * 1.1f); - inArray[i].SetHostTimeMs(AZ::TimeMs(i * 10)); + inArray[i].SetHostBlendFactor(i * BLEND_FACTOR_SCALE); + inArray[i].SetHostTimeMs(AZ::TimeMs(i * TIME_SCALE)); inVector.PushBack(inArray[i]); }