fix

NoelStephensUnity · NoelStephensUnity · commit f69b07ccbd97 · 2025-02-11T19:25:11.000-06:00
More UTP v2x related (collections etc.) defines required.
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs
@@ -827,7 +827,11 @@ internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in N
         internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in NativeList<ulong> clientIds)
             where T : INetworkMessage
         {
+#if UTP_TRANSPORT_2_0_ABOVE
+            return SendMessage(ref message, delivery, new PointerListWrapper<ulong>(clientIds.GetUnsafePtr(), clientIds.Length));
+#else
             return SendMessage(ref message, delivery, new PointerListWrapper<ulong>((ulong*)clientIds.GetUnsafePtr(), clientIds.Length));
+#endif
         }
 
         internal unsafe void ProcessSendQueues()
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs
@@ -106,7 +106,12 @@ private void AppendDataAtTail(ArraySegment<byte> data)
         {
             unsafe
             {
+#if UTP_TRANSPORT_2_0_ABOVE
+                var writer = new DataStreamWriter(m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
+#else
                 var writer = new DataStreamWriter((byte*)m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
+#endif
+
 
                 writer.WriteInt(data.Count);
 
@@ -145,7 +150,11 @@ public bool PushMessage(ArraySegment<byte> message)
             {
                 unsafe
                 {
+#if UTP_TRANSPORT_2_0_ABOVE
+                    UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), m_Data.GetUnsafePtr() + HeadIndex, Length);
+#else
                     UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), (byte*)m_Data.GetUnsafePtr() + HeadIndex, Length);
+#endif
                 }
 
                 TailIndex = Length;
@@ -231,8 +240,12 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                 if (bytesToWrite > softMaxBytes && bytesToWrite <= writer.Capacity)
                 {
                     writer.WriteInt(messageLength);
-                    WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
 
+#if UTP_TRANSPORT_2_0_ABOVE
+                    WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+#else
+                    WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+#endif
                     return bytesToWrite;
                 }
                 else
@@ -248,7 +261,12 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                         if (bytesWritten + bytesToWrite <= softMaxBytes)
                         {
                             writer.WriteInt(messageLength);
+
+#if UTP_TRANSPORT_2_0_ABOVE
+                            WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+#else
                             WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+#endif
 
                             readerOffset += bytesToWrite;
                             bytesWritten += bytesToWrite;
@@ -292,7 +310,12 @@ public int FillWriterWithBytes(ref DataStreamWriter writer, int maxBytes = 0)
 
             unsafe
             {
+
+#if UTP_TRANSPORT_2_0_ABOVE
+                WriteBytes(ref writer, m_Data.GetUnsafePtr() + HeadIndex, copyLength);
+#else
                 WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + HeadIndex, copyLength);
+#endif
             }
 
             return copyLength;
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs
@@ -311,8 +311,11 @@ private unsafe void VerifyArrayEquality<T>(NativeList<T> value, byte* unsafePtr,
         {
             int* sizeValue = (int*)(unsafePtr + offset);
             Assert.AreEqual(value.Length, *sizeValue);
-
+#if UTP_TRANSPORT_2_0_ABOVE
+            var asTPointer = value.GetUnsafePtr();
+#else
             var asTPointer = (T*)value.GetUnsafePtr();
+#endif
             var underlyingTArray = (T*)(unsafePtr + sizeof(int) + offset);
             for (var i = 0; i < value.Length; ++i)
             {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs
@@ -2,7 +2,9 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Netcode.Transports.UTP;
+#if !UTP_TRANSPORT_2_0_ABOVE
 using Unity.Networking.Transport;
+#endif
 
 namespace Unity.Netcode.EditorTests
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs
@@ -2,7 +2,9 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Netcode.Transports.UTP;
+#if !UTP_TRANSPORT_2_0_ABOVE
 using Unity.Networking.Transport;
+#endif
 
 namespace Unity.Netcode.EditorTests
 {

Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,11 @@ internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in N`
`827`	`827`	`internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in NativeList<ulong> clientIds)`
`828`	`828`	`where T : INetworkMessage`
`829`	`829`	`{`
	`830`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`831`	`+ return SendMessage(ref message, delivery, new PointerListWrapper<ulong>(clientIds.GetUnsafePtr(), clientIds.Length));`
	`832`	`+#else`
`830`	`833`	`return SendMessage(ref message, delivery, new PointerListWrapper<ulong>((ulong*)clientIds.GetUnsafePtr(), clientIds.Length));`
	`834`	`+#endif`
`831`	`835`	`}`
`832`	`836`
`833`	`837`	`internal unsafe void ProcessSendQueues()`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,12 @@ private void AppendDataAtTail(ArraySegment<byte> data)`
`106`	`106`	`{`
`107`	`107`	`unsafe`
`108`	`108`	`{`
	`109`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`110`	`+ var writer = new DataStreamWriter(m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);`
	`111`	`+#else`
`109`	`112`	`var writer = new DataStreamWriter((byte*)m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);`
	`113`	`+#endif`
	`114`	`+`
`110`	`115`
`111`	`116`	`writer.WriteInt(data.Count);`
`112`	`117`
`@@ -145,7 +150,11 @@ public bool PushMessage(ArraySegment<byte> message)`
`145`	`150`	`{`
`146`	`151`	`unsafe`
`147`	`152`	`{`
	`153`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`154`	`+ UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), m_Data.GetUnsafePtr() + HeadIndex, Length);`
	`155`	`+#else`
`148`	`156`	`UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), (byte*)m_Data.GetUnsafePtr() + HeadIndex, Length);`
	`157`	`+#endif`
`149`	`158`	`}`
`150`	`159`
`151`	`160`	`TailIndex = Length;`
`@@ -231,8 +240,12 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes`
`231`	`240`	`if (bytesToWrite > softMaxBytes && bytesToWrite <= writer.Capacity)`
`232`	`241`	`{`
`233`	`242`	`writer.WriteInt(messageLength);`
`234`		`- WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);`
`235`	`243`
	`244`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`245`	`+ WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);`
	`246`	`+#else`
	`247`	`+ WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);`
	`248`	`+#endif`
`236`	`249`	`return bytesToWrite;`
`237`	`250`	`}`
`238`	`251`	`else`
`@@ -248,7 +261,12 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes`
`248`	`261`	`if (bytesWritten + bytesToWrite <= softMaxBytes)`
`249`	`262`	`{`
`250`	`263`	`writer.WriteInt(messageLength);`
	`264`	`+`
	`265`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`266`	`+ WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);`
	`267`	`+#else`
`251`	`268`	`WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);`
	`269`	`+#endif`
`252`	`270`
`253`	`271`	`readerOffset += bytesToWrite;`
`254`	`272`	`bytesWritten += bytesToWrite;`
`@@ -292,7 +310,12 @@ public int FillWriterWithBytes(ref DataStreamWriter writer, int maxBytes = 0)`
`292`	`310`
`293`	`311`	`unsafe`
`294`	`312`	`{`
	`313`	`+`
	`314`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`315`	`+ WriteBytes(ref writer, m_Data.GetUnsafePtr() + HeadIndex, copyLength);`
	`316`	`+#else`
`295`	`317`	`WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + HeadIndex, copyLength);`
	`318`	`+#endif`
`296`	`319`	`}`
`297`	`320`
`298`	`321`	`return copyLength;`
Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,11 @@ private unsafe void VerifyArrayEquality<T>(NativeList<T> value, byte* unsafePtr,`
`311`	`311`	`{`
`312`	`312`	`int* sizeValue = (int*)(unsafePtr + offset);`
`313`	`313`	`Assert.AreEqual(value.Length, *sizeValue);`
`314`		`-`
	`314`	`+#if UTP_TRANSPORT_2_0_ABOVE`
	`315`	`+ var asTPointer = value.GetUnsafePtr();`
	`316`	`+#else`
`315`	`317`	`var asTPointer = (T*)value.GetUnsafePtr();`
	`318`	`+#endif`
`316`	`319`	`var underlyingTArray = (T*)(unsafePtr + sizeof(int) + offset);`
`317`	`320`	`for (var i = 0; i < value.Length; ++i)`
`318`	`321`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using Unity.Collections;`
`4`	`4`	`using Unity.Netcode.Transports.UTP;`
	`5`	`+#if !UTP_TRANSPORT_2_0_ABOVE`
`5`	`6`	`using Unity.Networking.Transport;`
	`7`	`+#endif`
`6`	`8`
`7`	`9`	`namespace Unity.Netcode.EditorTests`
`8`	`10`	`{`