Skip to content

Commit b15f8a4

Browse files
committed
Addressing PR feedback
1 parent 26f6311 commit b15f8a4

File tree

1 file changed

+6
-21
lines changed

1 file changed

+6
-21
lines changed

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,39 +28,22 @@ internal struct CreateObjectMessage : INetworkMessage
2828
// to clients that already have the NetworkObject spawned
2929
internal ulong NetworkObjectId;
3030

31-
3231
private const byte k_IncludesSerializedObject = 0x01;
3332
private const byte k_UpdateObservers = 0x02;
3433
private const byte k_UpdateNewObservers = 0x04;
3534

36-
private byte m_CreateObjectMessageTypeFlags;
37-
3835
internal bool IncludesSerializedObject;
3936
internal bool UpdateObservers;
4037
internal bool UpdateNewObservers;
4138

42-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
43-
internal uint GetBitsetRepresentation()
39+
public void Serialize(FastBufferWriter writer, int targetVersion)
4440
{
4541
uint bitset = 0;
4642
if (IncludesSerializedObject) { bitset |= k_IncludesSerializedObject; }
4743
if (UpdateObservers) { bitset |= k_UpdateObservers; }
4844
if (UpdateNewObservers) { bitset |= k_UpdateNewObservers; }
49-
return bitset;
50-
}
5145

52-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
53-
internal void SetStateFromBitset(uint bitset)
54-
{
55-
IncludesSerializedObject = (bitset & k_IncludesSerializedObject) != 0;
56-
UpdateObservers = (bitset & k_UpdateObservers) != 0;
57-
UpdateNewObservers = (bitset & k_UpdateNewObservers) != 0;
58-
}
59-
60-
public void Serialize(FastBufferWriter writer, int targetVersion)
61-
{
62-
uint getBitsetRepresentation = GetBitsetRepresentation();
63-
writer.WriteValueSafe(getBitsetRepresentation);
46+
writer.WriteValueSafe(bitset);
6447

6548
if (UpdateObservers)
6649
{
@@ -98,8 +81,10 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
9881
return false;
9982
}
10083

101-
reader.ReadValueSafe(out m_CreateObjectMessageTypeFlags);
102-
SetStateFromBitset(m_CreateObjectMessageTypeFlags);
84+
reader.ReadValueSafe(out byte bitset);
85+
IncludesSerializedObject = (bitset & k_IncludesSerializedObject) != 0;
86+
UpdateObservers = (bitset & k_UpdateObservers) != 0;
87+
UpdateNewObservers = (bitset & k_UpdateNewObservers) != 0;
10388

10489
if (UpdateObservers)
10590
{

0 commit comments

Comments
 (0)