Skip to content

Commit 00eda77

Browse files
NoelStephensUnityNoelStephensUnity
committed
MTT-367 Finalizing some adjustment to conform to the naming standards. Predominantly updating member property names and formating related changes.
1 parent d130e99 commit 00eda77

9 files changed

Lines changed: 250 additions & 254 deletions

File tree

‎com.unity.multiplayer.mlapi/Runtime/Core/MessageBatcher.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ private int PopLength(in BitStream messageStream)
7878
/// <param name="list">the list to fill</param>
7979
private static void FillTargetList(in FrameQueueItem item, ref ulong[] list)
8080
{
81-
switch (item.QueueItemType)
81+
switch (item.queueItemType)
8282
{
83-
case RPCQueueManager.QueueItemType.ServerRpc:
83+
case RpcQueueContainer.QueueItemType.ServerRpc:
8484
Array.Resize(ref list, 1);
85-
list[0] = item.NetworkId;
85+
list[0] = item.networkId;
8686
break;
87-
case RPCQueueManager.QueueItemType.ClientRpc:
87+
case RpcQueueContainer.QueueItemType.ClientRpc:
8888
// copy the list
89-
list = item.ClientIds.ToArray();
89+
list = item.clientIds.ToArray();
9090
break;
9191
default:
9292
break;
@@ -120,32 +120,32 @@ public void QueueItem(in FrameQueueItem item)
120120
Writer.WriteBit(false); // Encrypted
121121
Writer.WriteBit(false); // Authenticated
122122

123-
switch (item.QueueItemType)
123+
switch (item.queueItemType)
124124
{
125125
// 6 bits are used for the message type, which is an MLAPIConstants
126-
case RPCQueueManager.QueueItemType.ServerRpc:
126+
case RpcQueueContainer.QueueItemType.ServerRpc:
127127
Writer.WriteBits(MLAPIConstants.MLAPI_SERVER_RPC, 6); // MessageType
128128
break;
129-
case RPCQueueManager.QueueItemType.ClientRpc:
129+
case RpcQueueContainer.QueueItemType.ClientRpc:
130130
Writer.WriteBits(MLAPIConstants.MLAPI_CLIENT_RPC, 6); // MessageType
131131
break;
132132
}
133133
}
134134

135135
// write the amounts of bytes that are coming up
136-
PushLength(item.MessageData.Count, ref Writer);
136+
PushLength(item.messageData.Count, ref Writer);
137137

138138
// write the message to send
139139
// todo: is there a faster alternative to .ToArray()
140-
Writer.WriteBytes(item.MessageData.ToArray(), item.MessageData.Count);
140+
Writer.WriteBytes(item.messageData.ToArray(), item.messageData.Count);
141141

142-
ProfilerStatManager.bytesSent.Record((int)item.MessageData.Count);
142+
ProfilerStatManager.bytesSent.Record((int)item.messageData.Count);
143143
ProfilerStatManager.rpcsSent.Record();
144144
}
145145
}
146146

147147
public delegate void SendCallbackType(ulong clientId, SendStream messageStream);
148-
public delegate void ReceiveCallbackType(BitStream messageStream, MLAPI.RPCQueueManager.QueueItemType messageType, ulong clientId, float time);
148+
public delegate void ReceiveCallbackType(BitStream messageStream, MLAPI.RpcQueueContainer.QueueItemType messageType, ulong clientId, float time);
149149

150150
/// <summary>
151151
/// SendItems
@@ -185,7 +185,7 @@ public void SendItems(int threshold, SendCallbackType sendCallback)
185185
/// <param name="messageType"> the message type to pass back to callback</param>
186186
/// <param name="clientId"> the clientId to pass back to callback</param>
187187
/// <param name="receiveTime"> the packet receive time to pass back to callback</param>
188-
public int ReceiveItems(in BitStream messageStream, ReceiveCallbackType receiveCallback, MLAPI.RPCQueueManager.QueueItemType messageType, ulong clientId, float receiveTime)
188+
public int ReceiveItems(in BitStream messageStream, ReceiveCallbackType receiveCallback, MLAPI.RpcQueueContainer.QueueItemType messageType, ulong clientId, float receiveTime)
189189
{
190190
do
191191
{

‎com.unity.multiplayer.mlapi/Runtime/Core/NetworkedBehaviour.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ internal BitWriter BeginSendServerRpc(ServerRpcSendParams sendParams, bool isRel
5353
{
5454
var rpcQueueMananger = NetworkingManager.Singleton.RpcQueueManager;
5555

56-
var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RPCQueueManager.QueueItemType.ServerRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkingManager.Singleton.ServerClientId, null);
56+
var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RpcQueueContainer.QueueItemType.ServerRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkingManager.Singleton.ServerClientId, null);
5757
writer.WriteUInt64Packed(NetworkId); // NetworkObjectId
5858
writer.WriteUInt16Packed(GetBehaviourId()); // NetworkBehaviourId
5959
return writer;
@@ -74,7 +74,7 @@ internal BitWriter BeginSendClientRpc(ClientRpcSendParams sendParams, bool isRel
7474
//This will start a new queue item entry and will then return the writer to the current frame's stream
7575
var rpcQueueMananger = NetworkingManager.Singleton.RpcQueueManager;
7676

77-
var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RPCQueueManager.QueueItemType.ClientRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkId, sendParams.TargetClientIds ?? NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray());
77+
var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RpcQueueContainer.QueueItemType.ClientRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkId, sendParams.TargetClientIds ?? NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray());
7878
writer.WriteUInt64Packed(NetworkId); // NetworkObjectId
7979
writer.WriteUInt16Packed(GetBehaviourId()); // NetworkBehaviourId
8080
return writer;

‎com.unity.multiplayer.mlapi/Runtime/Core/NetworkingManager.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class NetworkingManager : MonoBehaviour
7070
[HideInInspector]
7171
public bool LoopbackEnabled;
7272

73-
public RPCQueueContainer RpcQueueManager { get; private set; }
73+
public RpcQueueContainer RpcQueueManager { get; private set; }
7474

7575
/// <summary>
7676
/// A synchronized time, represents the time in seconds since the server application started. Is replicated across all clients
@@ -689,7 +689,7 @@ private void Shutdown()
689689

690690
private void Awake()
691691
{
692-
RpcQueueManager = new RPCQueueContainer(LoopbackEnabled);
692+
RpcQueueManager = new RpcQueueContainer(LoopbackEnabled);
693693
//Note: Since frame history is not being used, this is set to 0
694694
//To test frame history, increase the number to (n) where n > 0
695695
RpcQueueManager.Initialize(0);
@@ -766,7 +766,7 @@ private void NetworkPreUpdate()
766766

767767
private void NetworkFixedUpdate()
768768
{
769-
RpcQueueManager?.ProcessAndFlushRPCQueue(RPCQueueContainer.RPCQueueProcessingTypes.Receive);
769+
RpcQueueManager?.ProcessAndFlushRPCQueue(RpcQueueContainer.RPCQueueProcessingTypes.Receive);
770770
}
771771

772772
/// <summary>
@@ -856,7 +856,7 @@ private void NetworkUpdate()
856856
/// </summary>
857857
private void NetworkLateUpdate()
858858
{
859-
RpcQueueManager?.ProcessAndFlushRPCQueue(RPCQueueContainer.RPCQueueProcessingTypes.Send);
859+
RpcQueueManager?.ProcessAndFlushRPCQueue(RpcQueueContainer.RPCQueueProcessingTypes.Send);
860860
}
861861

862862
internal void UpdateNetworkTime(ulong clientId, float netTime, float receiveTime, bool warp = false)
@@ -1165,7 +1165,7 @@ internal void HandleIncomingData(ulong clientId, string channelName, ArraySegmen
11651165
{
11661166
if (IsServer)
11671167
{
1168-
batcher.ReceiveItems(messageStream, ReceiveCallback, RPCQueueManager.QueueItemType.ServerRpc, clientId, receiveTime);
1168+
batcher.ReceiveItems(messageStream, ReceiveCallback, RpcQueueContainer.QueueItemType.ServerRpc, clientId, receiveTime);
11691169
}
11701170
ProfilerStatManager.rpcBatchesRcvd.Record();
11711171
break;
@@ -1174,7 +1174,7 @@ internal void HandleIncomingData(ulong clientId, string channelName, ArraySegmen
11741174
{
11751175
if (IsClient)
11761176
{
1177-
batcher.ReceiveItems(messageStream, ReceiveCallback, RPCQueueManager.QueueItemType.ClientRpc, clientId, receiveTime);
1177+
batcher.ReceiveItems(messageStream, ReceiveCallback, RpcQueueContainer.QueueItemType.ClientRpc, clientId, receiveTime);
11781178
}
11791179
ProfilerStatManager.rpcBatchesRcvd.Record();
11801180
break;
@@ -1192,10 +1192,10 @@ internal void HandleIncomingData(ulong clientId, string channelName, ArraySegmen
11921192
#endif
11931193
}
11941194

1195-
private static void ReceiveCallback(BitStream messageStream, MLAPI.RPCQueueManager.QueueItemType messageType, ulong clientId, float receiveTime)
1195+
private static void ReceiveCallback(BitStream messageStream, MLAPI.RpcQueueContainer.QueueItemType messageType, ulong clientId, float receiveTime)
11961196
{
11971197
#if DEVELOPMENT_BUILD || UNITY_EDITOR
1198-
if (messageType == RPCQueueManager.QueueItemType.ServerRpc)
1198+
if (messageType == RpcQueueContainer.QueueItemType.ServerRpc)
11991199
{
12001200
s_MLAPIServerSTDRPCQueued.Begin();
12011201
}
@@ -1206,7 +1206,7 @@ private static void ReceiveCallback(BitStream messageStream, MLAPI.RPCQueueManag
12061206
#endif
12071207
InternalMessageHandler.RPCReceiveQueueItem(clientId, messageStream, receiveTime, messageType);
12081208
#if DEVELOPMENT_BUILD || UNITY_EDITOR
1209-
if (messageType == RPCQueueManager.QueueItemType.ServerRpc)
1209+
if (messageType == RpcQueueContainer.QueueItemType.ServerRpc)
12101210
{
12111211
s_MLAPIServerSTDRPCQueued.End();
12121212
}
@@ -1227,9 +1227,9 @@ public static void InvokeRpc(FrameQueueItem queueItem)
12271227
#if DEVELOPMENT_BUILD || UNITY_EDITOR
12281228
s_InvokeRPC.Begin();
12291229
#endif
1230-
var networkObjectId = queueItem.StreamReader.ReadUInt64Packed();
1231-
var networkBehaviourId = queueItem.StreamReader.ReadUInt16Packed();
1232-
var networkMethodId = queueItem.StreamReader.ReadUInt32Packed();
1230+
var networkObjectId = queueItem.streamReader.ReadUInt64Packed();
1231+
var networkBehaviourId = queueItem.streamReader.ReadUInt16Packed();
1232+
var networkMethodId = queueItem.streamReader.ReadUInt32Packed();
12331233

12341234
if (__ntable.ContainsKey(networkMethodId))
12351235
{
@@ -1239,7 +1239,7 @@ public static void InvokeRpc(FrameQueueItem queueItem)
12391239
var networkBehaviour = networkObject.GetBehaviourAtOrderIndex(networkBehaviourId);
12401240
if (ReferenceEquals(networkBehaviour, null)) return;
12411241

1242-
__ntable[networkMethodId](networkBehaviour, queueItem.StreamReader, queueItem.NetworkId);
1242+
__ntable[networkMethodId](networkBehaviour, queueItem.streamReader, queueItem.networkId);
12431243
}
12441244

12451245
#if DEVELOPMENT_BUILD || UNITY_EDITOR

‎com.unity.multiplayer.mlapi/Runtime/Core/RPCQueue/FrameQueueItem.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ namespace MLAPI
1313
/// </summary>
1414
public struct FrameQueueItem
1515
{
16-
public RPCQueueContainer.QueueItemType QueueItemType;
17-
public SecuritySendFlags SendFlags;
18-
public ulong NetworkId; //Sender's network Identifier
19-
public string Channel;
20-
public ulong[] ClientIds; //Server invoked Client RPCs only
21-
public long StreamSize;
22-
public PooledBitWriter StreamWriter;
23-
public PooledBitReader StreamReader;
24-
public PooledBitStream ItemStream;
25-
public ArraySegment<byte> MessageData;
16+
public RpcQueueContainer.QueueItemType queueItemType;
17+
public SecuritySendFlags sendFlags;
18+
public ulong networkId; //Sender's network Identifier
19+
public string channel;
20+
public ulong[] clientIds; //Server invoked Client RPCs only
21+
public long streamSize;
22+
public float timeStamp;
23+
public PooledBitWriter streamWriter;
24+
public PooledBitReader streamReader;
25+
public PooledBitStream itemStream;
26+
public ArraySegment<byte> messageData;
2627
}
2728
}

0 commit comments

Comments
 (0)