charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkTransformChild uses readyConnection.SendByChannel(msg) instead of manually constructing and finishing the message and sending raw bytes.

Browse Source
This commit is contained in:
vis2k 2018-07-25 17:58:10 +02:00
parent d7cf9dc95c
commit b27da84e81
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Unity-Technologies-networking/Runtime/Messages.cs
View File

@ -349,5 +349,26 @@ public override void Serialize(NetworkWriter writer)
writer.WritePackedUInt32((uint)hash);
}
}
class LocalChildTransformMessage : MessageBase
{
public NetworkInstanceId netId;
public uint childIndex;
public byte[] payload;
public override void Deserialize(NetworkReader reader)
{
netId = reader.ReadNetworkId();
childIndex = reader.ReadPackedUInt32();
payload = reader.ReadBytesAndSize();
}
public override void Serialize(NetworkWriter writer)
{
writer.Write(netId);
writer.WritePackedUInt32(childIndex);
writer.WriteBytesAndSize(payload);
}
}
}
#endif //ENABLE_UNET

29
Unity-Technologies-networking/Runtime/NetworkTranformChild.cs
View File

@ -1,6 +1,7 @@
#if ENABLE_UNET
using System;
using UnityEngine;
using UnityEngine.Networking.NetworkSystem;
namespace UnityEngine.Networking
{
@ -384,29 +385,27 @@ void SendTransform()
}
NetworkWriter writer = new NetworkWriter();
writer.StartMessage((short)MsgType.LocalChildTransform);
writer.Write(netId);
writer.WritePackedUInt32(m_ChildIndex);
SerializeModeTransform(writer);
LocalChildTransformMessage message = new LocalChildTransformMessage();
message.netId = netId;
message.childIndex = m_ChildIndex;
message.payload = writer.ToArray();
m_PrevPosition = m_Target.localPosition;
m_PrevRotation = m_Target.localRotation;
writer.FinishMessage();
#if UNITY_EDITOR
UnityEditor.NetworkDetailStats.IncrementStat(
UnityEditor.NetworkDetailStats.NetworkDirection.Outgoing,
(short)MsgType.LocalChildTransform, "16:LocalChildTransform", 1);
#endif
ClientScene.readyConnection.SendBytes(writer.ToArray(), GetNetworkChannel());
ClientScene.readyConnection.SendByChannel((short)MsgType.LocalChildTransform, message, GetNetworkChannel());
}
static internal void HandleChildTransform(NetworkMessage netMsg)
{
NetworkInstanceId netId = netMsg.reader.ReadNetworkId();
uint childIndex = netMsg.reader.ReadPackedUInt32();
LocalChildTransformMessage message = netMsg.ReadMessage<LocalChildTransformMessage>();
#if UNITY_EDITOR
UnityEditor.NetworkDetailStats.IncrementStat(
@ -414,7 +413,7 @@ static internal void HandleChildTransform(NetworkMessage netMsg)
(short)MsgType.LocalChildTransform, "16:LocalChildTransform", 1);
#endif
GameObject foundObj = NetworkServer.FindLocalObject(netId);
GameObject foundObj = NetworkServer.FindLocalObject(message.netId);
if (foundObj == null)
{
if (LogFilter.logError) { Debug.LogError("Received NetworkTransformChild data for GameObject that doesn't exist"); }
@ -426,13 +425,13 @@ static internal void HandleChildTransform(NetworkMessage netMsg)
if (LogFilter.logError) { Debug.LogError("HandleChildTransform no children"); }
return;
}
if (childIndex >= children.Length)
if (message.childIndex >= children.Length)
{
if (LogFilter.logError) { Debug.LogError("HandleChildTransform childIndex invalid"); }
return;
}
NetworkTransformChild foundSync = children[childIndex];
NetworkTransformChild foundSync = children[message.childIndex];
if (foundSync == null)
{
if (LogFilter.logError) { Debug.LogError("HandleChildTransform null target"); }
@ -444,13 +443,13 @@ static internal void HandleChildTransform(NetworkMessage netMsg)
return;
}
if (!netMsg.conn.clientOwnedObjects.Contains(netId))
if (!netMsg.conn.clientOwnedObjects.Contains(message.netId))
{
if (LogFilter.logWarn) { Debug.LogWarning("NetworkTransformChild netId:" + netId + " is not for a valid player"); }
if (LogFilter.logWarn) { Debug.LogWarning("NetworkTransformChild netId:" + message.netId + " is not for a valid player"); }
return;
}
foundSync.UnserializeModeTransform(netMsg.reader, false);
foundSync.UnserializeModeTransform(new NetworkReader(message.payload), false);
foundSync.m_LastClientSyncTime = Time.time;
if (!foundSync.isClient)