@@ -9,7 +9,7 @@ namespace Unity.Netcode.RuntimeTests
99{
1010 /// <summary>
1111 /// Validates that a half float base sync arriving after the unreliable deltas that depend on it still updates
12- /// the non-authority's base position.
12+ /// the non-authority's base position, unless a newer base has already been applied .
1313 /// </summary>
1414 [ TestFixture ( HostOrServer . Host ) ]
1515 [ TestFixture ( HostOrServer . DAHost ) ]
@@ -20,6 +20,8 @@ internal class NetworkTransformHalfFloatLateBaseTests : IntegrationTestWithAppro
2020 private const float k_DeltaStep = 0.5f ;
2121
2222 private GameObject m_TestPrefab ;
23+ private NetworkTransform m_NonAuthority ;
24+ private int m_NetworkTick ;
2325
2426 public NetworkTransformHalfFloatLateBaseTests ( HostOrServer hostOrServer ) : base ( hostOrServer )
2527 {
@@ -36,6 +38,17 @@ protected override void OnServerAndClientsCreated()
3638 base . OnServerAndClientsCreated ( ) ;
3739 }
3840
41+ private IEnumerator SpawnTestObject ( )
42+ {
43+ var authority = GetAuthorityNetworkManager ( ) ;
44+ var authorityInstance = SpawnObject ( m_TestPrefab , authority ) . GetComponent < NetworkObject > ( ) ;
45+ yield return WaitForSpawnedOnAllOrTimeOut ( authorityInstance ) ;
46+ AssertOnTimeout ( $ "Timed out waiting for { authorityInstance . name } to spawn on all clients!") ;
47+
48+ m_NonAuthority = GetNonAuthorityNetworkManager ( ) . SpawnManager . SpawnedObjects [ authorityInstance . NetworkObjectId ] . GetComponent < NetworkTransform > ( ) ;
49+ m_NetworkTick = authority . ServerTime . Tick + 10 ;
50+ }
51+
3952 private static NetworkTransform . NetworkTransformState CreateState ( NetworkDeltaPosition networkDeltaPosition , int networkTick )
4053 {
4154 return new NetworkTransform . NetworkTransformState ( )
@@ -54,46 +67,92 @@ private static NetworkTransform.NetworkTransformState CreateState(NetworkDeltaPo
5467 } ;
5568 }
5669
57- private static void Receive ( NetworkTransform nonAuthority , NetworkTransform . NetworkTransformState state )
70+ /// <summary>
71+ /// Encodes the way the authority does: crossing MaxDeltaBeforeAdjustment collapses the delta into a new base.
72+ /// </summary>
73+ private NetworkTransform . NetworkTransformState CreateBaseSync ( ref NetworkDeltaPosition networkDeltaPosition , ref Vector3 position )
5874 {
59- nonAuthority . InboundState = state ;
60- nonAuthority . TransformStateUpdate ( ) ;
75+ position = new Vector3 ( NetworkDeltaPosition . MaxDeltaBeforeAdjustment + k_DeltaStep , 0.0f , 0.0f ) ;
76+ networkDeltaPosition . UpdateFrom ( ref position , ++ m_NetworkTick ) ;
77+ Assert . IsTrue ( networkDeltaPosition . CollapsedDeltaIntoBase , "The update did not collapse into a new base!" ) ;
78+ return CreateState ( networkDeltaPosition , m_NetworkTick ) ;
79+ }
80+
81+ private void Receive ( NetworkTransform . NetworkTransformState state )
82+ {
83+ m_NonAuthority . InboundState = state ;
84+ m_NonAuthority . TransformStateUpdate ( ) ;
85+ }
86+
87+ private void AssertNonAuthorityPosition ( Vector3 position , string reason )
88+ {
89+ Assert . IsTrue ( Approximately ( m_NonAuthority . transform . position , position ) ,
90+ $ "{ m_NonAuthority . NetworkManager . name } is at { m_NonAuthority . transform . position } but the authority is at { position } . { reason } ") ;
6191 }
6292
6393 [ UnityTest ]
6494 public IEnumerator LateBaseSyncStillUpdatesBase ( )
6595 {
66- var authority = GetAuthorityNetworkManager ( ) ;
67- var authorityInstance = SpawnObject ( m_TestPrefab , authority ) . GetComponent < NetworkObject > ( ) ;
68- yield return WaitForSpawnedOnAllOrTimeOut ( authorityInstance ) ;
69- AssertOnTimeout ( $ "Timed out waiting for { authorityInstance . name } to spawn on all clients!") ;
70-
71- var nonAuthority = GetNonAuthorityNetworkManager ( ) . SpawnManager . SpawnedObjects [ authorityInstance . NetworkObjectId ] . GetComponent < NetworkTransform > ( ) ;
96+ yield return SpawnTestObject ( ) ;
7297
73- // Encode the way the authority does: crossing MaxDeltaBeforeAdjustment collapses the delta into a new base.
74- var networkTick = authority . ServerTime . Tick + 10 ;
75- var authorityDeltaPosition = new NetworkDeltaPosition ( Vector3 . zero , networkTick ) ;
76- var position = new Vector3 ( NetworkDeltaPosition . MaxDeltaBeforeAdjustment + k_DeltaStep , 0.0f , 0.0f ) ;
77- authorityDeltaPosition . UpdateFrom ( ref position , ++ networkTick ) ;
78- Assert . IsTrue ( authorityDeltaPosition . CollapsedDeltaIntoBase , "The first update did not collapse into a new base!" ) ;
79- var baseSync = CreateState ( authorityDeltaPosition , networkTick ) ;
98+ var authorityDeltaPosition = new NetworkDeltaPosition ( Vector3 . zero , m_NetworkTick ) ;
99+ var position = Vector3 . zero ;
100+ var baseSync = CreateBaseSync ( ref authorityDeltaPosition , ref position ) ;
80101
81102 position . x += k_DeltaStep ;
82- authorityDeltaPosition . UpdateFrom ( ref position , ++ networkTick ) ;
83- var firstDelta = CreateState ( authorityDeltaPosition , networkTick ) ;
103+ authorityDeltaPosition . UpdateFrom ( ref position , ++ m_NetworkTick ) ;
104+ var firstDelta = CreateState ( authorityDeltaPosition , m_NetworkTick ) ;
84105
85106 position . x += k_DeltaStep ;
86- authorityDeltaPosition . UpdateFrom ( ref position , ++ networkTick ) ;
87- var secondDelta = CreateState ( authorityDeltaPosition , networkTick ) ;
107+ authorityDeltaPosition . UpdateFrom ( ref position , ++ m_NetworkTick ) ;
108+ var secondDelta = CreateState ( authorityDeltaPosition , m_NetworkTick ) ;
88109
89110 // The unreliable delta overtakes the reliable base sync it depends on.
90- Receive ( nonAuthority , firstDelta ) ;
91- Receive ( nonAuthority , baseSync ) ;
92- Receive ( nonAuthority , secondDelta ) ;
111+ Receive ( firstDelta ) ;
112+ Receive ( baseSync ) ;
113+ Receive ( secondDelta ) ;
114+
115+ AssertNonAuthorityPosition ( position , "The late base sync was not applied, so the delta was decoded against the previous base." ) ;
116+ }
117+
118+ [ UnityTest ]
119+ public IEnumerator BaseSyncOlderThanAppliedBaseIsIgnored ( )
120+ {
121+ yield return SpawnTestObject ( ) ;
122+
123+ // The former owner's base sync, delayed past an ownership change.
124+ var formerOwnerDeltaPosition = new NetworkDeltaPosition ( Vector3 . zero , m_NetworkTick ) ;
125+ var position = Vector3 . zero ;
126+ var staleBaseSync = CreateBaseSync ( ref formerOwnerDeltaPosition , ref position ) ;
127+
128+ // The new owner teleports to its current position when it gains ownership, which sets a new base.
129+ m_NetworkTick += 10 ;
130+ position = new Vector3 ( 10.0f , 0.0f , 0.0f ) ;
131+ var teleport = new NetworkTransform . NetworkTransformState ( )
132+ {
133+ NetworkTick = m_NetworkTick ,
134+ CurrentPosition = position ,
135+ FlagStates =
136+ {
137+ HasPositionX = true ,
138+ HasPositionChange = true ,
139+ UseHalfFloatPrecision = true ,
140+ UseUnreliableDeltas = true ,
141+ IsTeleportingNextFrame = true ,
142+ ReliableSequenced = true ,
143+ } ,
144+ } ;
145+
146+ var newOwnerDeltaPosition = new NetworkDeltaPosition ( position , m_NetworkTick ) ;
147+ position . x += k_DeltaStep ;
148+ newOwnerDeltaPosition . UpdateFrom ( ref position , ++ m_NetworkTick ) ;
149+ var newOwnerDelta = CreateState ( newOwnerDeltaPosition , m_NetworkTick ) ;
150+
151+ Receive ( teleport ) ;
152+ Receive ( staleBaseSync ) ;
153+ Receive ( newOwnerDelta ) ;
93154
94- Assert . IsTrue ( Approximately ( nonAuthority . transform . position , position ) ,
95- $ "{ nonAuthority . NetworkManager . name } is at { nonAuthority . transform . position } but the authority is at { position } . " +
96- $ "The late base sync was not applied, so the delta was decoded against the previous base.") ;
155+ AssertNonAuthorityPosition ( position , "The former owner's base sync replaced the new owner's base." ) ;
97156 }
98157 }
99158}
0 commit comments