Skip to content

Commit 8d9fbcc

Browse files
update
Found a few more places where we want to also check for COM_UNITY_MODULES_PHYSICS2D.
1 parent 9bdbbc8 commit 8d9fbcc

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ internal void PromoteSessionOwner(ulong clientId)
264264
}
265265

266266
internal Dictionary<ulong, NetworkObject> NetworkTransformUpdate = new Dictionary<ulong, NetworkObject>();
267-
#if COM_UNITY_MODULES_PHYSICS
267+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
268268
internal Dictionary<ulong, NetworkObject> NetworkTransformFixedUpdate = new Dictionary<ulong, NetworkObject>();
269269
#endif
270270

@@ -284,7 +284,7 @@ internal void NetworkTransformRegistration(NetworkObject networkObject, bool onU
284284
NetworkTransformUpdate.Remove(networkObject.NetworkObjectId);
285285
}
286286
}
287-
#if COM_UNITY_MODULES_PHYSICS
287+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
288288
else
289289
{
290290
if (register)
@@ -341,7 +341,7 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
341341

342342
MessageManager.CleanupDisconnectedClients();
343343
AnticipationSystem.ProcessReanticipation();
344-
#if COM_UNITY_MODULES_PHYSICS
344+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
345345
foreach (var networkObjectEntry in NetworkTransformFixedUpdate)
346346
{
347347
// if not active or not spawned then skip
@@ -362,7 +362,7 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
362362
#endif
363363
}
364364
break;
365-
#if COM_UNITY_MODULES_PHYSICS
365+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
366366
case NetworkUpdateStage.FixedUpdate:
367367
{
368368
foreach (var networkObjectEntry in NetworkTransformFixedUpdate)
@@ -1112,7 +1112,7 @@ internal void Initialize(bool server)
11121112
}
11131113
#endif
11141114

1115-
#if COM_UNITY_MODULES_PHYSICS
1115+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
11161116
NetworkTransformFixedUpdate.Clear();
11171117
#endif
11181118
NetworkTransformUpdate.Clear();
@@ -1157,7 +1157,7 @@ internal void Initialize(bool server)
11571157
}
11581158

11591159
this.RegisterNetworkUpdate(NetworkUpdateStage.EarlyUpdate);
1160-
#if COM_UNITY_MODULES_PHYSICS
1160+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
11611161
this.RegisterNetworkUpdate(NetworkUpdateStage.FixedUpdate);
11621162
#endif
11631163
this.RegisterNetworkUpdate(NetworkUpdateStage.PreUpdate);

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public uint PrefabIdHash
6868
public List<NetworkTransform> NetworkTransforms { get; private set; }
6969

7070

71-
#if COM_UNITY_MODULES_PHYSICS
71+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
7272
/// <summary>
7373
/// All <see cref="NetworkRigidbodyBase"></see> component instances associated with a <see cref="NetworkObject"/> component instance.
7474
/// NOTE: This is only available if a physics package is included. If not, then this will not be available!
@@ -2621,7 +2621,7 @@ internal List<NetworkBehaviour> ChildNetworkBehaviours
26212621
networkTransform.IsNested = i != 0 && networkTransform.gameObject != gameObject;
26222622
NetworkTransforms.Add(networkTransform);
26232623
}
2624-
#if COM_UNITY_MODULES_PHYSICS
2624+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
26252625
else if (type.IsSubclassOf(typeof(NetworkRigidbodyBase)))
26262626
{
26272627
if (NetworkRigidbodies == null)
@@ -3429,7 +3429,7 @@ private void Awake()
34293429
{
34303430
m_ChildNetworkBehaviours = null;
34313431
NetworkTransforms?.Clear();
3432-
#if COM_UNITY_MODULES_PHYSICS
3432+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
34333433
NetworkRigidbodies?.Clear();
34343434
#endif
34353435
SetCachedParent(transform.parent);

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if COM_UNITY_MODULES_PHYSICS
1+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
22
using System.Collections;
33
using System.Collections.Generic;
44
using System.Linq;

com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if COM_UNITY_MODULES_PHYSICS
1+
#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
22
using System.Collections;
33
using System.Collections.Generic;
44
using System.Text;

0 commit comments

Comments
 (0)