com.unity.netcode.gameobjects@1.1.0
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). ## [1.1.0] - 2022-10-21 ### Added - Added `NetworkManager.IsApproved` flag that is set to `true` a client has been approved.(#2261) - `UnityTransport` now provides a way to set the Relay server data directly from the `RelayServerData` structure (provided by the Unity Transport package) throuh its `SetRelayServerData` method. This allows making use of the new APIs in UTP 1.3 that simplify integration of the Relay SDK. (#2235) - IPv6 is now supported for direct connections when using `UnityTransport`. (#2232) - Added WebSocket support when using UTP 2.0 with `UseWebSockets` property in the `UnityTransport` component of the `NetworkManager` allowing to pick WebSockets for communication. When building for WebGL, this selection happens automatically. (#2201) - Added position, rotation, and scale to the `ParentSyncMessage` which provides users the ability to specify the final values on the server-side when `OnNetworkObjectParentChanged` is invoked just before the message is created (when the `Transform` values are applied to the message). (#2146) - Added `NetworkObject.TryRemoveParent` method for convenience purposes opposed to having to cast null to either `GameObject` or `NetworkObject`. (#2146) ### Changed - Updated `UnityTransport` dependency on `com.unity.transport` to 1.3.0. (#2231) - The send queues of `UnityTransport` are now dynamically-sized. This means that there shouldn't be any need anymore to tweak the 'Max Send Queue Size' value. In fact, this field is now removed from the inspector and will not be serialized anymore. It is still possible to set it manually using the `MaxSendQueueSize` property, but it is not recommended to do so aside from some specific needs (e.g. limiting the amount of memory used by the send queues in very constrained environments). (#2212) - As a consequence of the above change, the `UnityTransport.InitialMaxSendQueueSize` field is now deprecated. There is no default value anymore since send queues are dynamically-sized. (#2212) - The debug simulator in `UnityTransport` is now non-deterministic. Its random number generator used to be seeded with a constant value, leading to the same pattern of packet drops, delays, and jitter in every run. (#2196) - `NetworkVariable<>` now supports managed `INetworkSerializable` types, as well as other managed types with serialization/deserialization delegates registered to `UserNetworkVariableSerialization<T>.WriteValue` and `UserNetworkVariableSerialization<T>.ReadValue` (#2219) - `NetworkVariable<>` and `BufferSerializer<BufferSerializerReader>` now deserialize `INetworkSerializable` types in-place, rather than constructing new ones. (#2219) ### Fixed - Fixed `NetworkManager.ApprovalTimeout` will not timeout due to slower client synchronization times as it now uses the added `NetworkManager.IsApproved` flag to determined if the client has been approved or not.(#2261) - Fixed issue caused when changing ownership of objects hidden to some clients (#2242) - Fixed issue where an in-scene placed NetworkObject would not invoke NetworkBehaviour.OnNetworkSpawn if the GameObject was disabled when it was despawned. (#2239) - Fixed issue where clients were not rebuilding the `NetworkConfig` hash value for each unique connection request. (#2226) - Fixed the issue where player objects were not taking the `DontDestroyWithOwner` property into consideration when a client disconnected. (#2225) - Fixed issue where `SceneEventProgress` would not complete if a client late joins while it is still in progress. (#2222) - Fixed issue where `SceneEventProgress` would not complete if a client disconnects. (#2222) - Fixed issues with detecting if a `SceneEventProgress` has timed out. (#2222) - Fixed issue #1924 where `UnityTransport` would fail to restart after a first failure (even if what caused the initial failure was addressed). (#2220) - Fixed issue where `NetworkTransform.SetStateServerRpc` and `NetworkTransform.SetStateClientRpc` were not honoring local vs world space settings when applying the position and rotation. (#2203) - Fixed ILPP `TypeLoadException` on WebGL on MacOS Editor and potentially other platforms. (#2199) - Implicit conversion of NetworkObjectReference to GameObject will now return null instead of throwing an exception if the referenced object could not be found (i.e., was already despawned) (#2158) - Fixed warning resulting from a stray NetworkAnimator.meta file (#2153) - Fixed Connection Approval Timeout not working client side. (#2164) - Fixed issue where the `WorldPositionStays` parenting parameter was not being synchronized with clients. (#2146) - Fixed issue where parented in-scene placed `NetworkObject`s would fail for late joining clients. (#2146) - Fixed issue where scale was not being synchronized which caused issues with nested parenting and scale when `WorldPositionStays` was true. (#2146) - Fixed issue with `NetworkTransform.ApplyTransformToNetworkStateWithInfo` where it was not honoring axis sync settings when `NetworkTransformState.IsTeleportingNextFrame` was true. (#2146) - Fixed issue with `NetworkTransform.TryCommitTransformToServer` where it was not honoring the `InLocalSpace` setting. (#2146) - Fixed ClientRpcs always reporting in the profiler view as going to all clients, even when limited to a subset of clients by `ClientRpcParams`. (#2144) - Fixed RPC codegen failing to choose the correct extension methods for `FastBufferReader` and `FastBufferWriter` when the parameters were a generic type (i.e., List<int>) and extensions for multiple instantiations of that type have been defined (i.e., List<int> and List<string>) (#2142) - Fixed the issue where running a server (i.e. not host) the second player would not receive updates (unless a third player joined). (#2127) - Fixed issue where late-joining client transition synchronization could fail when more than one transition was occurring.(#2127) - Fixed throwing an exception in `OnNetworkUpdate` causing other `OnNetworkUpdate` calls to not be executed. (#1739) - Fixed synchronization when Time.timeScale is set to 0. This changes timing update to use unscaled deltatime. Now network updates rate are independent from the local time scale. (#2171) - Fixed not sending all NetworkVariables to all clients when a client connects to a server. (#1987) - Fixed IsOwner/IsOwnedByServer being wrong on the server after calling RemoveOwnership (#2211)
This commit is contained in:
@@ -1,14 +1,19 @@
|
||||
#if COM_UNITY_MODULES_ANIMATION
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Unity.Collections;
|
||||
using Unity.Collections.LowLevel.Unsafe;
|
||||
using UnityEngine;
|
||||
#if UNITY_EDITOR
|
||||
using UnityEditor.Animations;
|
||||
#endif
|
||||
|
||||
namespace Unity.Netcode.Components
|
||||
{
|
||||
internal class NetworkAnimatorStateChangeHandler : INetworkUpdateSystem
|
||||
{
|
||||
private NetworkAnimator m_NetworkAnimator;
|
||||
private bool m_IsServer;
|
||||
|
||||
/// <summary>
|
||||
/// This removes sending RPCs from within RPCs when the
|
||||
@@ -32,7 +37,14 @@ namespace Unity.Netcode.Components
|
||||
|
||||
foreach (var sendEntry in m_SendTriggerUpdates)
|
||||
{
|
||||
m_NetworkAnimator.SendAnimTriggerClientRpc(sendEntry.AnimationTriggerMessage, sendEntry.ClientRpcParams);
|
||||
if (!sendEntry.SendToServer)
|
||||
{
|
||||
m_NetworkAnimator.SendAnimTriggerClientRpc(sendEntry.AnimationTriggerMessage, sendEntry.ClientRpcParams);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_NetworkAnimator.SendAnimTriggerServerRpc(sendEntry.AnimationTriggerMessage);
|
||||
}
|
||||
}
|
||||
m_SendTriggerUpdates.Clear();
|
||||
}
|
||||
@@ -44,8 +56,8 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
case NetworkUpdateStage.PreUpdate:
|
||||
{
|
||||
// Only the server forwards messages and synchronizes players
|
||||
if (m_NetworkAnimator.NetworkManager.IsServer)
|
||||
// Only the owner or the server send messages
|
||||
if (m_NetworkAnimator.IsOwner || m_IsServer)
|
||||
{
|
||||
// Flush any pending messages
|
||||
FlushMessages();
|
||||
@@ -125,6 +137,7 @@ namespace Unity.Netcode.Components
|
||||
|
||||
private struct TriggerUpdate
|
||||
{
|
||||
public bool SendToServer;
|
||||
public ClientRpcParams ClientRpcParams;
|
||||
public NetworkAnimator.AnimationTriggerMessage AnimationTriggerMessage;
|
||||
}
|
||||
@@ -134,11 +147,23 @@ namespace Unity.Netcode.Components
|
||||
/// <summary>
|
||||
/// Invoked when a server needs to forward an update to a Trigger state
|
||||
/// </summary>
|
||||
internal void SendTriggerUpdate(NetworkAnimator.AnimationTriggerMessage animationTriggerMessage, ClientRpcParams clientRpcParams = default)
|
||||
internal void QueueTriggerUpdateToClient(NetworkAnimator.AnimationTriggerMessage animationTriggerMessage, ClientRpcParams clientRpcParams = default)
|
||||
{
|
||||
m_SendTriggerUpdates.Add(new TriggerUpdate() { ClientRpcParams = clientRpcParams, AnimationTriggerMessage = animationTriggerMessage });
|
||||
}
|
||||
|
||||
internal void QueueTriggerUpdateToServer(NetworkAnimator.AnimationTriggerMessage animationTriggerMessage)
|
||||
{
|
||||
m_SendTriggerUpdates.Add(new TriggerUpdate() { AnimationTriggerMessage = animationTriggerMessage, SendToServer = true });
|
||||
}
|
||||
|
||||
private Queue<NetworkAnimator.AnimationMessage> m_AnimationMessageQueue = new Queue<NetworkAnimator.AnimationMessage>();
|
||||
|
||||
internal void AddAnimationMessageToProcessQueue(NetworkAnimator.AnimationMessage message)
|
||||
{
|
||||
m_AnimationMessageQueue.Enqueue(message);
|
||||
}
|
||||
|
||||
internal void DeregisterUpdate()
|
||||
{
|
||||
NetworkUpdateLoop.UnregisterNetworkUpdate(this, NetworkUpdateStage.PreUpdate);
|
||||
@@ -147,34 +172,266 @@ namespace Unity.Netcode.Components
|
||||
internal NetworkAnimatorStateChangeHandler(NetworkAnimator networkAnimator)
|
||||
{
|
||||
m_NetworkAnimator = networkAnimator;
|
||||
m_IsServer = networkAnimator.NetworkManager.IsServer;
|
||||
NetworkUpdateLoop.RegisterNetworkUpdate(this, NetworkUpdateStage.PreUpdate);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// NetworkAnimator enables remote synchronization of <see cref="UnityEngine.Animator"/> state for on network objects.
|
||||
/// </summary>
|
||||
[AddComponentMenu("Netcode/" + nameof(NetworkAnimator))]
|
||||
[AddComponentMenu("Netcode/Network Animator")]
|
||||
[RequireComponent(typeof(Animator))]
|
||||
public class NetworkAnimator : NetworkBehaviour
|
||||
public class NetworkAnimator : NetworkBehaviour, ISerializationCallbackReceiver
|
||||
|
||||
{
|
||||
internal struct AnimationMessage : INetworkSerializable
|
||||
[Serializable]
|
||||
internal class TransitionStateinfo
|
||||
{
|
||||
// state hash per layer. if non-zero, then Play() this animation, skipping transitions
|
||||
internal bool Transition;
|
||||
public int Layer;
|
||||
public int OriginatingState;
|
||||
public int DestinationState;
|
||||
public float TransitionDuration;
|
||||
public int TriggerNameHash;
|
||||
public int TransitionIndex;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Used to build the destination state to transition info table
|
||||
/// </summary>
|
||||
[HideInInspector]
|
||||
[SerializeField]
|
||||
internal List<TransitionStateinfo> TransitionStateInfoList;
|
||||
|
||||
// Used to get the associated transition information required to synchronize late joining clients with transitions
|
||||
// [Layer][DestinationState][TransitionStateInfo]
|
||||
private Dictionary<int, Dictionary<int, TransitionStateinfo>> m_DestinationStateToTransitioninfo = new Dictionary<int, Dictionary<int, TransitionStateinfo>>();
|
||||
|
||||
/// <summary>
|
||||
/// Builds the m_DestinationStateToTransitioninfo lookup table
|
||||
/// </summary>
|
||||
private void BuildDestinationToTransitionInfoTable()
|
||||
{
|
||||
foreach (var entry in TransitionStateInfoList)
|
||||
{
|
||||
if (!m_DestinationStateToTransitioninfo.ContainsKey(entry.Layer))
|
||||
{
|
||||
m_DestinationStateToTransitioninfo.Add(entry.Layer, new Dictionary<int, TransitionStateinfo>());
|
||||
}
|
||||
var destinationStateTransitionInfo = m_DestinationStateToTransitioninfo[entry.Layer];
|
||||
if (!destinationStateTransitionInfo.ContainsKey(entry.DestinationState))
|
||||
{
|
||||
destinationStateTransitionInfo.Add(entry.DestinationState, entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates the TransitionStateInfoList table
|
||||
/// </summary>
|
||||
private void BuildTransitionStateInfoList()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
if (UnityEditor.EditorApplication.isUpdating)
|
||||
{
|
||||
return;
|
||||
}
|
||||
TransitionStateInfoList = new List<TransitionStateinfo>();
|
||||
var animatorController = m_Animator.runtimeAnimatorController as AnimatorController;
|
||||
if (animatorController == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (int x = 0; x < animatorController.layers.Length; x++)
|
||||
{
|
||||
var layer = animatorController.layers[x];
|
||||
|
||||
for (int y = 0; y < layer.stateMachine.states.Length; y++)
|
||||
{
|
||||
var animatorState = layer.stateMachine.states[y].state;
|
||||
var transitions = layer.stateMachine.GetStateMachineTransitions(layer.stateMachine);
|
||||
for (int z = 0; z < animatorState.transitions.Length; z++)
|
||||
{
|
||||
var transition = animatorState.transitions[z];
|
||||
if (transition.conditions.Length == 0 && transition.isExit)
|
||||
{
|
||||
// We don't need to worry about exit transitions with no conditions
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var condition in transition.conditions)
|
||||
{
|
||||
var parameterName = condition.parameter;
|
||||
var parameters = animatorController.parameters;
|
||||
foreach (var parameter in parameters)
|
||||
{
|
||||
switch (parameter.type)
|
||||
{
|
||||
case AnimatorControllerParameterType.Trigger:
|
||||
{
|
||||
// Match the condition with an existing trigger
|
||||
if (parameterName == parameter.name)
|
||||
{
|
||||
var transitionInfo = new TransitionStateinfo()
|
||||
{
|
||||
Layer = x,
|
||||
OriginatingState = animatorState.nameHash,
|
||||
DestinationState = transition.destinationState.nameHash,
|
||||
TransitionDuration = transition.duration,
|
||||
TriggerNameHash = parameter.nameHash,
|
||||
TransitionIndex = z
|
||||
};
|
||||
TransitionStateInfoList.Add(transitionInfo);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
BuildDestinationToTransitionInfoTable();
|
||||
}
|
||||
|
||||
public void OnBeforeSerialize()
|
||||
{
|
||||
BuildTransitionStateInfoList();
|
||||
}
|
||||
|
||||
internal struct AnimationState : INetworkSerializable
|
||||
{
|
||||
// Not to be serialized, used for processing the animation state
|
||||
internal bool HasBeenProcessed;
|
||||
internal int StateHash;
|
||||
internal float NormalizedTime;
|
||||
internal int Layer;
|
||||
internal float Weight;
|
||||
|
||||
// For synchronizing transitions
|
||||
internal bool Transition;
|
||||
// The StateHash is where the transition starts
|
||||
// and the DestinationStateHash is the destination state
|
||||
internal int DestinationStateHash;
|
||||
|
||||
public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
|
||||
{
|
||||
serializer.SerializeValue(ref StateHash);
|
||||
serializer.SerializeValue(ref NormalizedTime);
|
||||
serializer.SerializeValue(ref Layer);
|
||||
serializer.SerializeValue(ref Weight);
|
||||
if (serializer.IsWriter)
|
||||
{
|
||||
var writer = serializer.GetFastBufferWriter();
|
||||
var writeSize = FastBufferWriter.GetWriteSize(Transition);
|
||||
writeSize += FastBufferWriter.GetWriteSize(StateHash);
|
||||
writeSize += FastBufferWriter.GetWriteSize(NormalizedTime);
|
||||
writeSize += FastBufferWriter.GetWriteSize(Layer);
|
||||
writeSize += FastBufferWriter.GetWriteSize(Weight);
|
||||
if (Transition)
|
||||
{
|
||||
writeSize += FastBufferWriter.GetWriteSize(DestinationStateHash);
|
||||
}
|
||||
|
||||
if (!writer.TryBeginWrite(writeSize))
|
||||
{
|
||||
throw new OverflowException($"[{GetType().Name}] Could not serialize: Out of buffer space.");
|
||||
}
|
||||
|
||||
writer.WriteValue(Transition);
|
||||
writer.WriteValue(StateHash);
|
||||
writer.WriteValue(NormalizedTime);
|
||||
writer.WriteValue(Layer);
|
||||
writer.WriteValue(Weight);
|
||||
if (Transition)
|
||||
{
|
||||
writer.WriteValue(DestinationStateHash);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var reader = serializer.GetFastBufferReader();
|
||||
// Begin reading the Transition flag
|
||||
if (!reader.TryBeginRead(FastBufferWriter.GetWriteSize(Transition)))
|
||||
{
|
||||
throw new OverflowException($"[{GetType().Name}] Could not deserialize: Out of buffer space.");
|
||||
}
|
||||
reader.ReadValue(out Transition);
|
||||
|
||||
// Now determine what remains to be read
|
||||
var readSize = FastBufferWriter.GetWriteSize(StateHash);
|
||||
readSize += FastBufferWriter.GetWriteSize(NormalizedTime);
|
||||
readSize += FastBufferWriter.GetWriteSize(Layer);
|
||||
readSize += FastBufferWriter.GetWriteSize(Weight);
|
||||
if (Transition)
|
||||
{
|
||||
readSize += FastBufferWriter.GetWriteSize(DestinationStateHash);
|
||||
}
|
||||
|
||||
// Now read the remaining information about this AnimationState
|
||||
if (!reader.TryBeginRead(readSize))
|
||||
{
|
||||
throw new OverflowException($"[{GetType().Name}] Could not deserialize: Out of buffer space.");
|
||||
}
|
||||
|
||||
reader.ReadValue(out StateHash);
|
||||
reader.ReadValue(out NormalizedTime);
|
||||
reader.ReadValue(out Layer);
|
||||
reader.ReadValue(out Weight);
|
||||
if (Transition)
|
||||
{
|
||||
reader.ReadValue(out DestinationStateHash);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal struct AnimationMessage : INetworkSerializable
|
||||
{
|
||||
// Not to be serialized, used for processing the animation message
|
||||
internal bool HasBeenProcessed;
|
||||
|
||||
// This is preallocated/populated in OnNetworkSpawn for all instances in the event ownership or
|
||||
// authority changes. When serializing, IsDirtyCount determines how many AnimationState entries
|
||||
// should be serialized from the list. When deserializing the list is created and populated with
|
||||
// only the number of AnimationStates received which is dictated by the deserialized IsDirtyCount.
|
||||
internal List<AnimationState> AnimationStates;
|
||||
|
||||
// Used to determine how many AnimationState entries we are sending or receiving
|
||||
internal int IsDirtyCount;
|
||||
|
||||
public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
|
||||
{
|
||||
var animationState = new AnimationState();
|
||||
if (serializer.IsReader)
|
||||
{
|
||||
AnimationStates = new List<AnimationState>();
|
||||
|
||||
serializer.SerializeValue(ref IsDirtyCount);
|
||||
// Since we create a new AnimationMessage when deserializing
|
||||
// we need to create new animation states for each incoming
|
||||
// AnimationState being updated
|
||||
for (int i = 0; i < IsDirtyCount; i++)
|
||||
{
|
||||
animationState = new AnimationState();
|
||||
serializer.SerializeValue(ref animationState);
|
||||
AnimationStates.Add(animationState);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// When writing, only send the counted dirty animation states
|
||||
serializer.SerializeValue(ref IsDirtyCount);
|
||||
for (int i = 0; i < IsDirtyCount; i++)
|
||||
{
|
||||
animationState = AnimationStates[i];
|
||||
serializer.SerializeNetworkSerializable(ref animationState);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,7 +480,8 @@ namespace Unity.Netcode.Components
|
||||
return true;
|
||||
}
|
||||
|
||||
// Animators only support up to 32 params
|
||||
// Animators only support up to 32 parameters
|
||||
// TODO: Look into making this a range limited property
|
||||
private const int k_MaxAnimationParams = 32;
|
||||
|
||||
private int[] m_TransitionHash;
|
||||
@@ -269,9 +527,9 @@ namespace Unity.Netcode.Components
|
||||
m_NetworkAnimatorStateChangeHandler = null;
|
||||
}
|
||||
|
||||
if (IsServer)
|
||||
if (m_CachedNetworkManager != null)
|
||||
{
|
||||
NetworkManager.OnClientConnectedCallback -= OnClientConnectedCallback;
|
||||
m_CachedNetworkManager.OnClientConnectedCallback -= OnClientConnectedCallback;
|
||||
}
|
||||
|
||||
if (m_CachedAnimatorParameters != null && m_CachedAnimatorParameters.IsCreated)
|
||||
@@ -293,40 +551,64 @@ namespace Unity.Netcode.Components
|
||||
private List<int> m_ParametersToUpdate;
|
||||
private List<ulong> m_ClientSendList;
|
||||
private ClientRpcParams m_ClientRpcParams;
|
||||
private AnimationMessage m_AnimationMessage;
|
||||
|
||||
/// <summary>
|
||||
/// Used for integration test to validate that the
|
||||
/// AnimationMessage.AnimationStates remains the same
|
||||
/// size as the layer count.
|
||||
/// </summary>
|
||||
internal AnimationMessage GetAnimationMessage()
|
||||
{
|
||||
return m_AnimationMessage;
|
||||
}
|
||||
|
||||
// Only used in Cleanup
|
||||
private NetworkManager m_CachedNetworkManager;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override void OnNetworkSpawn()
|
||||
{
|
||||
if (IsOwner || IsServer)
|
||||
int layers = m_Animator.layerCount;
|
||||
|
||||
// Initializing the below arrays for everyone handles an issue
|
||||
// when running in owner authoritative mode and the owner changes.
|
||||
m_TransitionHash = new int[layers];
|
||||
m_AnimationHash = new int[layers];
|
||||
m_LayerWeights = new float[layers];
|
||||
|
||||
if (IsServer)
|
||||
{
|
||||
int layers = m_Animator.layerCount;
|
||||
m_TransitionHash = new int[layers];
|
||||
m_AnimationHash = new int[layers];
|
||||
m_LayerWeights = new float[layers];
|
||||
m_ClientSendList = new List<ulong>(128);
|
||||
m_ClientRpcParams = new ClientRpcParams();
|
||||
m_ClientRpcParams.Send = new ClientRpcSendParams();
|
||||
m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
|
||||
|
||||
if (IsServer)
|
||||
{
|
||||
NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
|
||||
}
|
||||
// Cache the NetworkManager instance to remove the OnClientConnectedCallback subscription
|
||||
m_CachedNetworkManager = NetworkManager;
|
||||
NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
|
||||
}
|
||||
// We initialize the m_AnimationMessage for all instances in the event that
|
||||
// ownership or authority changes during runtime.
|
||||
m_AnimationMessage = new AnimationMessage();
|
||||
m_AnimationMessage.AnimationStates = new List<AnimationState>();
|
||||
|
||||
// Store off our current layer weights
|
||||
for (int layer = 0; layer < m_Animator.layerCount; layer++)
|
||||
// Store off our current layer weights and create our animation
|
||||
// state entries per layer.
|
||||
for (int layer = 0; layer < m_Animator.layerCount; layer++)
|
||||
{
|
||||
// We create an AnimationState per layer to preallocate the maximum
|
||||
// number of possible AnimationState changes we could send in one
|
||||
// AnimationMessage.
|
||||
m_AnimationMessage.AnimationStates.Add(new AnimationState());
|
||||
float layerWeightNow = m_Animator.GetLayerWeight(layer);
|
||||
if (layerWeightNow != m_LayerWeights[layer])
|
||||
{
|
||||
float layerWeightNow = m_Animator.GetLayerWeight(layer);
|
||||
if (layerWeightNow != m_LayerWeights[layer])
|
||||
{
|
||||
m_LayerWeights[layer] = layerWeightNow;
|
||||
}
|
||||
}
|
||||
|
||||
if (IsServer)
|
||||
{
|
||||
m_ClientSendList = new List<ulong>(128);
|
||||
m_ClientRpcParams = new ClientRpcParams();
|
||||
m_ClientRpcParams.Send = new ClientRpcSendParams();
|
||||
m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
|
||||
m_LayerWeights[layer] = layerWeightNow;
|
||||
}
|
||||
}
|
||||
|
||||
// Build our reference parameter values to detect when they change
|
||||
var parameters = m_Animator.parameters;
|
||||
m_CachedAnimatorParameters = new NativeArray<AnimatorParamCache>(parameters.Length, Allocator.Persistent);
|
||||
m_ParametersToUpdate = new List<int>(parameters.Length);
|
||||
@@ -373,6 +655,7 @@ namespace Unity.Netcode.Components
|
||||
m_NetworkAnimatorStateChangeHandler = new NetworkAnimatorStateChangeHandler(this);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override void OnNetworkDespawn()
|
||||
{
|
||||
Cleanup();
|
||||
@@ -393,18 +676,25 @@ namespace Unity.Netcode.Components
|
||||
m_ParametersToUpdate.Add(i);
|
||||
}
|
||||
SendParametersUpdate(m_ClientRpcParams);
|
||||
|
||||
// Reset the dirty count before synchronizing the newly connected client with all layers
|
||||
m_AnimationMessage.IsDirtyCount = 0;
|
||||
|
||||
for (int layer = 0; layer < m_Animator.layerCount; layer++)
|
||||
{
|
||||
AnimatorStateInfo st = m_Animator.GetCurrentAnimatorStateInfo(layer);
|
||||
|
||||
var stateHash = st.fullPathHash;
|
||||
var normalizedTime = st.normalizedTime;
|
||||
var totalSpeed = st.speed * st.speedMultiplier;
|
||||
var adjustedNormalizedMaxTime = totalSpeed > 0.0f ? 1.0f / totalSpeed : 0.0f;
|
||||
// NOTE:
|
||||
// When synchronizing, for now we will just complete the transition and
|
||||
// synchronize the player to the next state being transitioned into
|
||||
if (m_Animator.IsInTransition(layer))
|
||||
var isInTransition = m_Animator.IsInTransition(layer);
|
||||
|
||||
// Grab one of the available AnimationState entries so we can fill it with the current
|
||||
// layer's animation state.
|
||||
var animationState = m_AnimationMessage.AnimationStates[layer];
|
||||
|
||||
// Synchronizing transitions with trigger conditions for late joining clients is now
|
||||
// handled by cross fading between the late joining client's current layer's AnimationState
|
||||
// and the transition's destination AnimationState.
|
||||
if (isInTransition)
|
||||
{
|
||||
var tt = m_Animator.GetAnimatorTransitionInfo(layer);
|
||||
var nextState = m_Animator.GetNextAnimatorStateInfo(layer);
|
||||
@@ -422,23 +712,39 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
normalizedTime = 0.0f;
|
||||
}
|
||||
|
||||
stateHash = nextState.fullPathHash;
|
||||
|
||||
// Use the destination state to transition info lookup table to see if this is a transition we can
|
||||
// synchronize using cross fading
|
||||
if (m_DestinationStateToTransitioninfo.ContainsKey(layer))
|
||||
{
|
||||
if (m_DestinationStateToTransitioninfo[layer].ContainsKey(nextState.shortNameHash))
|
||||
{
|
||||
var destinationInfo = m_DestinationStateToTransitioninfo[layer][nextState.shortNameHash];
|
||||
stateHash = destinationInfo.OriginatingState;
|
||||
// Set the destination state to cross fade to from the originating state
|
||||
animationState.DestinationStateHash = destinationInfo.DestinationState;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var animMsg = new AnimationMessage
|
||||
{
|
||||
Transition = m_Animator.IsInTransition(layer),
|
||||
StateHash = stateHash,
|
||||
NormalizedTime = normalizedTime,
|
||||
Layer = layer,
|
||||
Weight = m_LayerWeights[layer]
|
||||
};
|
||||
// Server always send via client RPC
|
||||
SendAnimStateClientRpc(animMsg, m_ClientRpcParams);
|
||||
animationState.Transition = isInTransition; // The only time this could be set to true
|
||||
animationState.StateHash = stateHash; // When a transition, this is the originating/starting state
|
||||
animationState.NormalizedTime = normalizedTime;
|
||||
animationState.Layer = layer;
|
||||
animationState.Weight = m_LayerWeights[layer];
|
||||
|
||||
// Apply the changes
|
||||
m_AnimationMessage.AnimationStates[layer] = animationState;
|
||||
}
|
||||
// Send all animation states
|
||||
m_AnimationMessage.IsDirtyCount = m_Animator.layerCount;
|
||||
SendAnimStateClientRpc(m_AnimationMessage, m_ClientRpcParams);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Required for the server to synchronize newly joining players
|
||||
/// </summary>
|
||||
private void OnClientConnectedCallback(ulong playerId)
|
||||
{
|
||||
m_NetworkAnimatorStateChangeHandler.SynchronizeClient(playerId);
|
||||
@@ -461,46 +767,57 @@ namespace Unity.Netcode.Components
|
||||
|
||||
if (m_Animator.runtimeAnimatorController == null)
|
||||
{
|
||||
if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
Debug.LogError($"[{GetType().Name}] Could not find an assigned {nameof(RuntimeAnimatorController)}! Cannot check {nameof(Animator)} for changes in state!");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
int stateHash;
|
||||
float normalizedTime;
|
||||
|
||||
// This sends updates only if a layer change or transition is happening
|
||||
// Reset the dirty count before checking for AnimationState updates
|
||||
m_AnimationMessage.IsDirtyCount = 0;
|
||||
|
||||
// This sends updates only if a layer's state has changed
|
||||
for (int layer = 0; layer < m_Animator.layerCount; layer++)
|
||||
{
|
||||
AnimatorStateInfo st = m_Animator.GetCurrentAnimatorStateInfo(layer);
|
||||
var totalSpeed = st.speed * st.speedMultiplier;
|
||||
var adjustedNormalizedMaxTime = totalSpeed > 0.0f ? 1.0f / totalSpeed : 0.0f;
|
||||
|
||||
// determine if we have reached the end of our state time, if so we can skip
|
||||
if (st.normalizedTime >= adjustedNormalizedMaxTime)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!CheckAnimStateChanged(out stateHash, out normalizedTime, layer))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var animMsg = new AnimationMessage
|
||||
{
|
||||
Transition = m_Animator.IsInTransition(layer),
|
||||
StateHash = stateHash,
|
||||
NormalizedTime = normalizedTime,
|
||||
Layer = layer,
|
||||
Weight = m_LayerWeights[layer]
|
||||
};
|
||||
// If we made it here, then we need to synchronize this layer's animation state.
|
||||
// Get one of the preallocated AnimationState entries and populate it with the
|
||||
// current layer's state.
|
||||
var animationState = m_AnimationMessage.AnimationStates[m_AnimationMessage.IsDirtyCount];
|
||||
|
||||
animationState.Transition = false; // Only used during synchronization
|
||||
animationState.StateHash = stateHash;
|
||||
animationState.NormalizedTime = normalizedTime;
|
||||
animationState.Layer = layer;
|
||||
animationState.Weight = m_LayerWeights[layer];
|
||||
|
||||
// Apply the changes
|
||||
m_AnimationMessage.AnimationStates[m_AnimationMessage.IsDirtyCount] = animationState;
|
||||
m_AnimationMessage.IsDirtyCount++;
|
||||
}
|
||||
|
||||
// Send an AnimationMessage only if there are dirty AnimationStates to send
|
||||
if (m_AnimationMessage.IsDirtyCount > 0)
|
||||
{
|
||||
if (!IsServer && IsOwner)
|
||||
{
|
||||
SendAnimStateServerRpc(animMsg);
|
||||
SendAnimStateServerRpc(m_AnimationMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
SendAnimStateClientRpc(animMsg);
|
||||
SendAnimStateClientRpc(m_AnimationMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -596,7 +913,7 @@ namespace Unity.Netcode.Components
|
||||
/// <summary>
|
||||
/// Checks if any of the Animator's states have changed
|
||||
/// </summary>
|
||||
private unsafe bool CheckAnimStateChanged(out int stateHash, out float normalizedTime, int layer)
|
||||
private bool CheckAnimStateChanged(out int stateHash, out float normalizedTime, int layer)
|
||||
{
|
||||
stateHash = 0;
|
||||
normalizedTime = 0;
|
||||
@@ -746,9 +1063,9 @@ namespace Unity.Netcode.Components
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Applies the AnimationMessage state to the Animator
|
||||
/// Applies the AnimationState state to the Animator
|
||||
/// </summary>
|
||||
private unsafe void UpdateAnimationState(AnimationMessage animationState)
|
||||
internal void UpdateAnimationState(AnimationState animationState)
|
||||
{
|
||||
if (animationState.StateHash == 0)
|
||||
{
|
||||
@@ -756,9 +1073,46 @@ namespace Unity.Netcode.Components
|
||||
}
|
||||
|
||||
var currentState = m_Animator.GetCurrentAnimatorStateInfo(animationState.Layer);
|
||||
if (currentState.fullPathHash != animationState.StateHash || m_Animator.IsInTransition(animationState.Layer) != animationState.Transition)
|
||||
// If it is a transition, then we are synchronizing transitions in progress when a client late joins
|
||||
if (animationState.Transition)
|
||||
{
|
||||
m_Animator.Play(animationState.StateHash, animationState.Layer, animationState.NormalizedTime);
|
||||
// We should have all valid entries for any animation state transition update
|
||||
// Verify the AnimationState's assigned Layer exists
|
||||
if (m_DestinationStateToTransitioninfo.ContainsKey(animationState.Layer))
|
||||
{
|
||||
// Verify the inner-table has the destination AnimationState name hash
|
||||
if (m_DestinationStateToTransitioninfo[animationState.Layer].ContainsKey(animationState.DestinationStateHash))
|
||||
{
|
||||
// Make sure we are on the originating/starting state we are going to cross fade into
|
||||
if (currentState.shortNameHash == animationState.StateHash)
|
||||
{
|
||||
// Get the transition state information
|
||||
var transitionStateInfo = m_DestinationStateToTransitioninfo[animationState.Layer][animationState.DestinationStateHash];
|
||||
|
||||
// Cross fade from the current to the destination state for the transitions duration while starting at the server's current normalized time of the transition
|
||||
m_Animator.CrossFade(transitionStateInfo.DestinationState, transitionStateInfo.TransitionDuration, transitionStateInfo.Layer, 0.0f, animationState.NormalizedTime);
|
||||
}
|
||||
else if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogWarning($"Current State Hash ({currentState.fullPathHash}) != AnimationState.StateHash ({animationState.StateHash})");
|
||||
}
|
||||
}
|
||||
else if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) sub-table does not contain destination state ({animationState.DestinationStateHash})!");
|
||||
}
|
||||
}
|
||||
else if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) does not exist!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (currentState.fullPathHash != animationState.StateHash)
|
||||
{
|
||||
m_Animator.Play(animationState.StateHash, animationState.Layer, animationState.NormalizedTime);
|
||||
}
|
||||
}
|
||||
m_Animator.SetLayerWeight(animationState.Layer, animationState.Weight);
|
||||
}
|
||||
@@ -781,7 +1135,7 @@ namespace Unity.Netcode.Components
|
||||
return;
|
||||
}
|
||||
UpdateParameters(parametersUpdate);
|
||||
if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
|
||||
if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))
|
||||
{
|
||||
m_ClientSendList.Clear();
|
||||
m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
|
||||
@@ -811,11 +1165,11 @@ namespace Unity.Netcode.Components
|
||||
/// The server sets its local state and then forwards the message to the remaining clients
|
||||
/// </summary>
|
||||
[ServerRpc]
|
||||
private unsafe void SendAnimStateServerRpc(AnimationMessage animSnapshot, ServerRpcParams serverRpcParams = default)
|
||||
private unsafe void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpcParams serverRpcParams = default)
|
||||
{
|
||||
if (IsServerAuthoritative())
|
||||
{
|
||||
m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animSnapshot);
|
||||
m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animationMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -823,15 +1177,21 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
return;
|
||||
}
|
||||
UpdateAnimationState(animSnapshot);
|
||||
if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
|
||||
|
||||
foreach (var animationState in animationMessage.AnimationStates)
|
||||
{
|
||||
UpdateAnimationState(animationState);
|
||||
}
|
||||
|
||||
m_NetworkAnimatorStateChangeHandler.AddAnimationMessageToProcessQueue(animationMessage);
|
||||
if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))
|
||||
{
|
||||
m_ClientSendList.Clear();
|
||||
m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
|
||||
m_ClientSendList.Remove(serverRpcParams.Receive.SenderClientId);
|
||||
m_ClientSendList.Remove(NetworkManager.ServerClientId);
|
||||
m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
|
||||
m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animSnapshot, m_ClientRpcParams);
|
||||
m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animationMessage, m_ClientRpcParams);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -840,16 +1200,25 @@ namespace Unity.Netcode.Components
|
||||
/// Internally-called RPC client receiving function to update some animation state on a client
|
||||
/// </summary>
|
||||
[ClientRpc]
|
||||
private unsafe void SendAnimStateClientRpc(AnimationMessage animSnapshot, ClientRpcParams clientRpcParams = default)
|
||||
private unsafe void SendAnimStateClientRpc(AnimationMessage animationMessage, ClientRpcParams clientRpcParams = default)
|
||||
{
|
||||
if (IsServer)
|
||||
// This should never happen
|
||||
if (IsHost)
|
||||
{
|
||||
if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogWarning("Detected the Host is sending itself animation updates! Please report this issue.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
var isServerAuthoritative = IsServerAuthoritative();
|
||||
if (!isServerAuthoritative && !IsOwner || isServerAuthoritative)
|
||||
{
|
||||
UpdateAnimationState(animSnapshot);
|
||||
foreach (var animationState in animationMessage.AnimationStates)
|
||||
{
|
||||
UpdateAnimationState(animationState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -858,44 +1227,67 @@ namespace Unity.Netcode.Components
|
||||
/// The server sets its local state and then forwards the message to the remaining clients
|
||||
/// </summary>
|
||||
[ServerRpc]
|
||||
private void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerMessage, ServerRpcParams serverRpcParams = default)
|
||||
internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerMessage, ServerRpcParams serverRpcParams = default)
|
||||
{
|
||||
// If it is server authoritative
|
||||
if (IsServerAuthoritative())
|
||||
{
|
||||
m_NetworkAnimatorStateChangeHandler.SendTriggerUpdate(animationTriggerMessage);
|
||||
// The only condition where this should (be allowed to) happen is when the owner sends the server a trigger message
|
||||
if (OwnerClientId == serverRpcParams.Receive.SenderClientId)
|
||||
{
|
||||
m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToClient(animationTriggerMessage);
|
||||
}
|
||||
else if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogWarning($"[Server Authoritative] Detected the a non-authoritative client is sending the server animation trigger updates. If you recently changed ownership of the {name} object, then this could be the reason.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Ignore if a non-owner sent this.
|
||||
if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
|
||||
{
|
||||
if (NetworkManager.LogLevel == LogLevel.Developer)
|
||||
{
|
||||
NetworkLog.LogWarning($"[Owner Authoritative] Detected the a non-authoritative client is sending the server animation trigger updates. If you recently changed ownership of the {name} object, then this could be the reason.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
// trigger the animation locally on the server...
|
||||
m_Animator.SetBool(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
|
||||
|
||||
if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
|
||||
// set the trigger locally on the server
|
||||
InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
|
||||
|
||||
// send the message to all non-authority clients excluding the server and the owner
|
||||
if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))
|
||||
{
|
||||
m_ClientSendList.Clear();
|
||||
m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
|
||||
m_ClientSendList.Remove(serverRpcParams.Receive.SenderClientId);
|
||||
m_ClientSendList.Remove(NetworkManager.ServerClientId);
|
||||
m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
|
||||
m_NetworkAnimatorStateChangeHandler.SendTriggerUpdate(animationTriggerMessage, m_ClientRpcParams);
|
||||
m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToClient(animationTriggerMessage, m_ClientRpcParams);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// See above <see cref="m_LastTriggerHash"/>
|
||||
/// </summary>
|
||||
private void InternalSetTrigger(int hash, bool isSet = true)
|
||||
{
|
||||
m_Animator.SetBool(hash, isSet);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Internally-called RPC client receiving function to update a trigger when the server wants to forward
|
||||
/// a trigger for a client to play / reset
|
||||
/// </summary>
|
||||
/// <param name="animSnapshot">the payload containing the trigger data to apply</param>
|
||||
/// <param name="animationTriggerMessage">the payload containing the trigger data to apply</param>
|
||||
/// <param name="clientRpcParams">unused</param>
|
||||
[ClientRpc]
|
||||
internal void SendAnimTriggerClientRpc(AnimationTriggerMessage animationTriggerMessage, ClientRpcParams clientRpcParams = default)
|
||||
{
|
||||
m_Animator.SetBool(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
|
||||
InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -923,14 +1315,20 @@ namespace Unity.Netcode.Components
|
||||
var animTriggerMessage = new AnimationTriggerMessage() { Hash = hash, IsTriggerSet = setTrigger };
|
||||
if (IsServer)
|
||||
{
|
||||
SendAnimTriggerClientRpc(animTriggerMessage);
|
||||
/// <see cref="UpdatePendingTriggerStates"/> as to why we queue
|
||||
m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToClient(animTriggerMessage);
|
||||
if (!IsHost)
|
||||
{
|
||||
InternalSetTrigger(hash);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SendAnimTriggerServerRpc(animTriggerMessage);
|
||||
/// <see cref="UpdatePendingTriggerStates"/> as to why we queue
|
||||
m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToServer(animTriggerMessage);
|
||||
if (!IsServerAuthoritative())
|
||||
{
|
||||
m_Animator.SetTrigger(hash);
|
||||
InternalSetTrigger(hash);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ namespace Unity.Netcode.Components
|
||||
/// </summary>
|
||||
[RequireComponent(typeof(Rigidbody))]
|
||||
[RequireComponent(typeof(NetworkTransform))]
|
||||
[AddComponentMenu("Netcode/Network Rigidbody")]
|
||||
public class NetworkRigidbody : NetworkBehaviour
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -9,6 +9,7 @@ namespace Unity.Netcode.Components
|
||||
/// </summary>
|
||||
[RequireComponent(typeof(Rigidbody2D))]
|
||||
[RequireComponent(typeof(NetworkTransform))]
|
||||
[AddComponentMenu("Netcode/Network Rigidbody 2D")]
|
||||
public class NetworkRigidbody2D : NetworkBehaviour
|
||||
{
|
||||
private Rigidbody2D m_Rigidbody;
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace Unity.Netcode.Components
|
||||
/// The replicated value will be automatically be interpolated (if active) and applied to the underlying GameObject's transform.
|
||||
/// </summary>
|
||||
[DisallowMultipleComponent]
|
||||
[AddComponentMenu("Netcode/" + nameof(NetworkTransform))]
|
||||
[AddComponentMenu("Netcode/Network Transform")]
|
||||
[DefaultExecutionOrder(100000)] // this is needed to catch the update time after the transform was updated by user scripts
|
||||
public class NetworkTransform : NetworkBehaviour
|
||||
{
|
||||
@@ -282,14 +282,7 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
// Go ahead and mark the local state dirty or not dirty as well
|
||||
/// <see cref="TryCommitTransformToServer"/>
|
||||
if (HasPositionChange || HasRotAngleChange || HasScaleChange)
|
||||
{
|
||||
IsDirty = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
IsDirty = false;
|
||||
}
|
||||
IsDirty = HasPositionChange || HasRotAngleChange || HasScaleChange;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -458,19 +451,6 @@ namespace Unity.Netcode.Components
|
||||
return m_LastSentState;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculated when spawned, this is used to offset a newly received non-authority side state by 1 tick duration
|
||||
/// in order to end the extrapolation for that state's values.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Example:
|
||||
/// NetworkState-A is received, processed, and measurements added
|
||||
/// NetworkState-A is duplicated (NetworkState-A-Post) and its sent time is offset by the tick frequency
|
||||
/// One tick later, NetworkState-A-Post is applied to end that delta's extrapolation.
|
||||
/// <see cref="OnNetworkStateChanged"/> to see how NetworkState-A-Post doesn't get excluded/missed
|
||||
/// </remarks>
|
||||
private double m_TickFrequency;
|
||||
|
||||
/// <summary>
|
||||
/// This will try to send/commit the current transform delta states (if any)
|
||||
/// </summary>
|
||||
@@ -495,14 +475,16 @@ namespace Unity.Netcode.Components
|
||||
}
|
||||
else // Non-Authority
|
||||
{
|
||||
var position = InLocalSpace ? transformToCommit.localPosition : transformToCommit.position;
|
||||
var rotation = InLocalSpace ? transformToCommit.localRotation : transformToCommit.rotation;
|
||||
// We are an owner requesting to update our state
|
||||
if (!m_CachedIsServer)
|
||||
{
|
||||
SetStateServerRpc(transformToCommit.position, transformToCommit.rotation, transformToCommit.localScale, false);
|
||||
SetStateServerRpc(position, rotation, transformToCommit.localScale, false);
|
||||
}
|
||||
else // Server is always authoritative (including owner authoritative)
|
||||
{
|
||||
SetStateClientRpc(transformToCommit.position, transformToCommit.rotation, transformToCommit.localScale, false);
|
||||
SetStateClientRpc(position, rotation, transformToCommit.localScale, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -528,37 +510,24 @@ namespace Unity.Netcode.Components
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes the interpolators with the current transform values
|
||||
/// </summary>
|
||||
private void ResetInterpolatedStateToCurrentAuthoritativeState()
|
||||
{
|
||||
var serverTime = NetworkManager.ServerTime.Time;
|
||||
|
||||
// TODO: Look into a better way to communicate the entire state for late joining clients.
|
||||
// Since the replicated network state will just be the most recent deltas and not the entire state.
|
||||
//m_PositionXInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.PositionX, serverTime);
|
||||
//m_PositionYInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.PositionY, serverTime);
|
||||
//m_PositionZInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.PositionZ, serverTime);
|
||||
|
||||
//m_RotationInterpolator.ResetTo(Quaternion.Euler(m_LocalAuthoritativeNetworkState.RotAngleX, m_LocalAuthoritativeNetworkState.RotAngleY, m_LocalAuthoritativeNetworkState.RotAngleZ), serverTime);
|
||||
|
||||
//m_ScaleXInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.ScaleX, serverTime);
|
||||
//m_ScaleYInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.ScaleY, serverTime);
|
||||
//m_ScaleZInterpolator.ResetTo(m_LocalAuthoritativeNetworkState.ScaleZ, serverTime);
|
||||
|
||||
// NOTE ABOUT THIS CHANGE:
|
||||
// !!! This will exclude any scale changes because we currently do not spawn network objects with scale !!!
|
||||
// Regarding Scale: It will be the same scale as the default scale for the object being spawned.
|
||||
var position = InLocalSpace ? transform.localPosition : transform.position;
|
||||
m_PositionXInterpolator.ResetTo(position.x, serverTime);
|
||||
m_PositionYInterpolator.ResetTo(position.y, serverTime);
|
||||
m_PositionZInterpolator.ResetTo(position.z, serverTime);
|
||||
|
||||
var rotation = InLocalSpace ? transform.localRotation : transform.rotation;
|
||||
m_RotationInterpolator.ResetTo(rotation, serverTime);
|
||||
|
||||
// TODO: (Create Jira Ticket) Synchronize local scale during NetworkObject synchronization
|
||||
// (We will probably want to byte pack TransformData to offset the 3 float addition)
|
||||
m_ScaleXInterpolator.ResetTo(transform.localScale.x, serverTime);
|
||||
m_ScaleYInterpolator.ResetTo(transform.localScale.y, serverTime);
|
||||
m_ScaleZInterpolator.ResetTo(transform.localScale.z, serverTime);
|
||||
var scale = transform.localScale;
|
||||
m_ScaleXInterpolator.ResetTo(scale.x, serverTime);
|
||||
m_ScaleYInterpolator.ResetTo(scale.y, serverTime);
|
||||
m_ScaleZInterpolator.ResetTo(scale.z, serverTime);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -609,63 +578,63 @@ namespace Unity.Netcode.Components
|
||||
isDirty = true;
|
||||
}
|
||||
|
||||
if (SyncPositionX && Mathf.Abs(networkState.PositionX - position.x) >= PositionThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncPositionX && (Mathf.Abs(networkState.PositionX - position.x) >= PositionThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.PositionX = position.x;
|
||||
networkState.HasPositionX = true;
|
||||
isPositionDirty = true;
|
||||
}
|
||||
|
||||
if (SyncPositionY && Mathf.Abs(networkState.PositionY - position.y) >= PositionThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncPositionY && (Mathf.Abs(networkState.PositionY - position.y) >= PositionThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.PositionY = position.y;
|
||||
networkState.HasPositionY = true;
|
||||
isPositionDirty = true;
|
||||
}
|
||||
|
||||
if (SyncPositionZ && Mathf.Abs(networkState.PositionZ - position.z) >= PositionThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncPositionZ && (Mathf.Abs(networkState.PositionZ - position.z) >= PositionThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.PositionZ = position.z;
|
||||
networkState.HasPositionZ = true;
|
||||
isPositionDirty = true;
|
||||
}
|
||||
|
||||
if (SyncRotAngleX && Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleX, rotAngles.x)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncRotAngleX && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleX, rotAngles.x)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.RotAngleX = rotAngles.x;
|
||||
networkState.HasRotAngleX = true;
|
||||
isRotationDirty = true;
|
||||
}
|
||||
|
||||
if (SyncRotAngleY && Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleY, rotAngles.y)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncRotAngleY && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleY, rotAngles.y)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.RotAngleY = rotAngles.y;
|
||||
networkState.HasRotAngleY = true;
|
||||
isRotationDirty = true;
|
||||
}
|
||||
|
||||
if (SyncRotAngleZ && Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleZ, rotAngles.z)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncRotAngleZ && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleZ, rotAngles.z)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.RotAngleZ = rotAngles.z;
|
||||
networkState.HasRotAngleZ = true;
|
||||
isRotationDirty = true;
|
||||
}
|
||||
|
||||
if (SyncScaleX && Mathf.Abs(networkState.ScaleX - scale.x) >= ScaleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncScaleX && (Mathf.Abs(networkState.ScaleX - scale.x) >= ScaleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.ScaleX = scale.x;
|
||||
networkState.HasScaleX = true;
|
||||
isScaleDirty = true;
|
||||
}
|
||||
|
||||
if (SyncScaleY && Mathf.Abs(networkState.ScaleY - scale.y) >= ScaleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncScaleY && (Mathf.Abs(networkState.ScaleY - scale.y) >= ScaleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.ScaleY = scale.y;
|
||||
networkState.HasScaleY = true;
|
||||
isScaleDirty = true;
|
||||
}
|
||||
|
||||
if (SyncScaleZ && Mathf.Abs(networkState.ScaleZ - scale.z) >= ScaleThreshold || networkState.IsTeleportingNextFrame)
|
||||
if (SyncScaleZ && (Mathf.Abs(networkState.ScaleZ - scale.z) >= ScaleThreshold || networkState.IsTeleportingNextFrame))
|
||||
{
|
||||
networkState.ScaleZ = scale.z;
|
||||
networkState.HasScaleZ = true;
|
||||
@@ -1014,7 +983,6 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
m_CachedIsServer = IsServer;
|
||||
m_CachedNetworkManager = NetworkManager;
|
||||
m_TickFrequency = 1.0 / NetworkManager.NetworkConfig.TickRate;
|
||||
|
||||
Initialize();
|
||||
|
||||
@@ -1150,8 +1118,7 @@ namespace Unity.Netcode.Components
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.position = pos;
|
||||
transform.rotation = rot;
|
||||
transform.SetPositionAndRotation(pos, rot);
|
||||
}
|
||||
transform.localScale = scale;
|
||||
m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;
|
||||
@@ -1169,11 +1136,7 @@ namespace Unity.Netcode.Components
|
||||
private void SetStateClientRpc(Vector3 pos, Quaternion rot, Vector3 scale, bool shouldTeleport, ClientRpcParams clientRpcParams = default)
|
||||
{
|
||||
// Server dictated state is always applied
|
||||
transform.position = pos;
|
||||
transform.rotation = rot;
|
||||
transform.localScale = scale;
|
||||
m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;
|
||||
TryCommitTransform(transform, m_CachedNetworkManager.LocalTime.Time);
|
||||
SetStateInternal(pos, rot, scale, shouldTeleport);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1190,12 +1153,7 @@ namespace Unity.Netcode.Components
|
||||
{
|
||||
(pos, rot, scale) = OnClientRequestChange(pos, rot, scale);
|
||||
}
|
||||
|
||||
transform.position = pos;
|
||||
transform.rotation = rot;
|
||||
transform.localScale = scale;
|
||||
m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;
|
||||
TryCommitTransform(transform, m_CachedNetworkManager.LocalTime.Time);
|
||||
SetStateInternal(pos, rot, scale, shouldTeleport);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user