Skip to content

fix: fixedstring byte writing and comparing #2992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 6, 2024
Merged

fix: fixedstring byte writing and comparing #2992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a342c8d
yupdate
NoelStephensUnity Jul 23, 2024
e09804a
fix
NoelStephensUnity Jul 27, 2024
e376f65
fix
NoelStephensUnity Jul 27, 2024
82ce5e2
style
NoelStephensUnity Jul 27, 2024
eba6d0c
Merge branch 'develop' into fix/fixedstring-byte-writing-and-comparing
NoelStephensUnity Jul 30, 2024
b39bc3a
Update CHANGELOG.md
NoelStephensUnity Jul 30, 2024
8a0297e
Merge branch 'develop' into fix/fixedstring-byte-writing-and-comparing
NoelStephensUnity Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public enum StaleDataHandling
#pragma warning restore IDE0001
[Serializable]
[GenerateSerializationForGenericParameter(0)]
[GenerateSerializationForType(typeof(byte))]
public class AnticipatedNetworkVariable<T> : NetworkVariableBase
{
[SerializeField]
Expand Down
1 change: 0 additions & 1 deletion com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ namespace Unity.Netcode
/// <typeparam name="T">the unmanaged type for <see cref="NetworkVariable{T}"/> </typeparam>
[Serializable]
[GenerateSerializationForGenericParameter(0)]
[GenerateSerializationForType(typeof(byte))]
public class NetworkVariable<T> : NetworkVariableBase
{
/// <summary>
Expand Down
12 changes: 2 additions & 10 deletions com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previo
{
var val = value[i];
var prevVal = previousValue[i];
if (!NetworkVariableSerialization<byte>.AreEqual(ref val, ref prevVal))
if (val != prevVal)
{
++numChanges;
changes.Set(i);
Expand All @@ -723,19 +723,11 @@ public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previo
unsafe
{
byte* ptr = value.GetUnsafePtr();
byte* prevPtr = previousValue.GetUnsafePtr();
for (int i = 0; i < value.Length; ++i)
{
if (changes.IsSet(i))
{
if (i < previousValue.Length)
{
NetworkVariableSerialization<byte>.WriteDelta(writer, ref ptr[i], ref prevPtr[i]);
}
else
{
NetworkVariableSerialization<byte>.Write(writer, ref ptr[i]);
}
writer.WriteByteSafe(ptr[i]);
}
}
}
Expand Down