Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)

/// <summary>
/// We are using post spawn to handle any final spawn initializations.
/// At this point we know all NetworkBehaviours on this instance has
/// been spawned.
/// At this point we know all NetworkBehaviours on this instance have been spawned.
/// </summary>
protected override void OnNetworkPostSpawn()
{
Expand Down Expand Up @@ -173,8 +172,7 @@ public override void OnNetworkDespawn()
{
m_CharacterController.enabled = false;
Camera.main.transform.SetParent(null, false);
Camera.main.transform.position = m_CameraOriginalPosition;
Camera.main.transform.rotation = m_CameraOriginalRotation;
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
}
base.OnNetworkDespawn();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Random = UnityEngine.Random;
using Debug = UnityEngine.Debug;

#region MoverScriptNoRigidbody Custom Editor
#region MoverScriptNoRigidbody Custom Editor
#if UNITY_EDITOR
using Unity.Netcode.Editor;
using UnityEditor;
Expand Down Expand Up @@ -144,8 +144,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)

/// <summary>
/// We are using post spawn to handle any final spawn initializations.
/// At this point we know all NetworkBehaviours on this instance has
/// been spawned.
/// At this point we know all NetworkBehaviours on this instance have been spawned.
/// </summary>
protected override void OnNetworkPostSpawn()
{
Expand Down Expand Up @@ -182,14 +181,13 @@ protected override void OnNetworkPostSpawn()

public override void OnNetworkDespawn()
{
// Notify any client or server specific componant that this instance has despawned.
// Notify any client or server specific component that this instance has despawned.
NotifySpawnStatusChanged?.Invoke(false);
if (IsLocalPlayer)
{
m_CharacterController.enabled = false;
Camera.main.transform.SetParent(null, false);
Camera.main.transform.position = m_CameraOriginalPosition;
Camera.main.transform.rotation = m_CameraOriginalRotation;
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
}
base.OnNetworkDespawn();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,7 @@ private void SetCameraDefaults()
if (Camera.main != null && Camera.main.transform.parent != null)
{
Camera.main.transform.SetParent(null, false);
Camera.main.transform.position = m_CameraOriginalPosition;
Camera.main.transform.rotation = m_CameraOriginalRotation;
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
}
}

Expand Down Expand Up @@ -522,7 +521,7 @@ private void StartDedicatedServer()

/// <summary>
/// Register callbacks when the OnServerStarted callback is invoked.
/// This makes it easier to know you are registering for events only
/// This makes it easier to know you are registering for events only
/// when the server successfully has started.
/// </summary>
private void ServerStarted()
Expand Down Expand Up @@ -578,11 +577,11 @@ private void HandleEditorKeyCommands()
#else
private void HandleConsoleKeyCommands()
{
if (Console.KeyAvailable)
if (Console.KeyAvailable)
{
var networkManager = NetworkManager.Singleton;
var keyPressed = Console.ReadKey(true);
switch(keyPressed.Key)
switch(keyPressed.Key)
{
case ConsoleKey.X:
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
var gameObject = m_NetworkManager.IsClient ? Instantiate(NetworkPrefabOverride) : Instantiate(NetworkPrefab);
// You could integrate spawn locations here and on the server side apply the spawn position at
// this stage of the spawn process.
gameObject.transform.position = position;
gameObject.transform.rotation = rotation;
gameObject.transform.SetPositionAndRotation(position, rotation);
return gameObject.GetComponent<NetworkObject>();
}

Expand All @@ -64,4 +63,3 @@ public void Destroy(NetworkObject networkObject)
Destroy(networkObject.gameObject);
}
}

1 change: 1 addition & 0 deletions com.unity.netcode.gameobjects/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Additional documentation and release notes are available at [Multiplayer Documen

### Fixed

- Made a variety of small performance improvements. (#3683)

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ This type of dynamically spawned `NetworkObject` typically is a simple wrapper c
m_prefabInstance = Instantiate(prefabToSpawn);

// Optional, this example applies the spawner's position and rotation to the new instance
m_prefabInstance.transform.position = transform.position;
m_prefabInstance.transform.rotation = transform.rotation;
m_prefabInstance.transform.SetPositionAndRotation(transform.position, transform.rotation);

// Get the instance's NetworkObject and Spawn
m_SpawnedNetworkObject = m_prefabInstance.GetComponent<NetworkObject>();
Expand Down Expand Up @@ -233,8 +232,7 @@ public class SinglePooledDynamicSpawner : NetworkBehaviour, INetworkprefabInstan
public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
{
m_prefabInstance.SetActive(true);
m_prefabInstance.transform.position = transform.position;
m_prefabInstance.transform.rotation = transform.rotation;
m_prefabInstance.transform.position.SetPositionAndRotation(transform.position, transform.rotation);
return m_SpawnedNetworkObject;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1431,11 +1431,7 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass
MethodReference callMethod = rpcHandler;
if (typeDefinition.HasGenericParameters)
{
var genericTypes = new List<TypeReference>();
foreach (var parameter in typeDefinition.GenericParameters)
{
genericTypes.Add(parameter);
}
var genericTypes = new List<TypeReference>(typeDefinition.GenericParameters);
callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
}

Expand Down Expand Up @@ -3101,11 +3097,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
var callMethod = (MethodReference)methodDefinition;
if (castType.HasGenericParameters)
{
var genericTypes = new List<TypeReference>();
foreach (var parameter in castType.GenericParameters)
{
genericTypes.Add(parameter);
}
var genericTypes = new List<TypeReference>(castType.GenericParameters);
castType = castType.MakeGenericInstanceType(genericTypes.ToArray());
callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeF

private void OnEnable()
{
if (NetworkPrefabsPath == "")
if (NetworkPrefabsPath.Length == 0)
{
NetworkPrefabsPath = DefaultNetworkPrefabsPath;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private static void OnDeactivate()
if (settings.TempNetworkPrefabsPath != settings.NetworkPrefabsPath)
{
var newPath = settings.TempNetworkPrefabsPath;
if (newPath == "")
if (newPath.Length == 0)
{
newPath = NetcodeForGameObjectsProjectSettings.DefaultNetworkPrefabsPath;
settings.TempNetworkPrefabsPath = newPath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public class UnityTransportEditor : HiddenScriptEditor

private SerializedProperty m_ServerAddressProperty;
private SerializedProperty m_ServerPortProperty;
private SerializedProperty m_OverrideBindIpProperty;

private const string k_LoopbackIpv4 = "127.0.0.1";
private const string k_LoopbackIpv6 = "::1";
Expand All @@ -76,7 +75,6 @@ private void Initialize()

m_ServerAddressProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Address));
m_ServerPortProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Port));
m_OverrideBindIpProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.ServerListenAddress));
}

/// <summary>
Expand Down Expand Up @@ -129,7 +127,7 @@ public override void OnInspectorGUI()
overrideIp = EditorGUILayout.TextField("Override Bind IP (optional)", overrideIp);
if (allowRemoteConnections)
{
if (overrideIp == "")
if (overrideIp.Length == 0)
{
if (isIpV6)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,12 @@ private void DisplayNetworkManagerProperties()
// Default directory
var directory = "Assets/";
var assetPath = AssetDatabase.GetAssetPath(m_NetworkManager);
if (assetPath == "")
if (assetPath.Length == 0)
{
assetPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(m_NetworkManager);
}

if (assetPath != "")
if (assetPath.Length > 0)
{
directory = Path.GetDirectoryName(assetPath);
}
Expand All @@ -270,7 +270,7 @@ private void DisplayNetworkManagerProperties()
if (prefabStage != null)
{
var prefabPath = prefabStage.assetPath;
if (!string.IsNullOrEmpty(prefabPath))
if (prefabPath.Length > 0)
{
directory = Path.GetDirectoryName(prefabPath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ public void AnticipateState(TransformState newState)
return;
}
var transform_ = transform;
transform_.position = newState.Position;
transform_.rotation = newState.Rotation;
transform_.SetPositionAndRotation(newState.Position, newState.Rotation);
transform_.localScale = newState.Scale;
m_AnticipatedTransform = newState;
if (CanCommitToTransform)
Expand Down Expand Up @@ -278,9 +277,8 @@ private void ProcessSmoothing()
m_PreviousAnticipatedTransform = m_AnticipatedTransform;
if (!CanCommitToTransform)
{
transform_.position = m_AnticipatedTransform.Position;
transform_.SetPositionAndRotation(m_AnticipatedTransform.Position, m_AnticipatedTransform.Rotation);
transform_.localScale = m_AnticipatedTransform.Scale;
transform_.rotation = m_AnticipatedTransform.Rotation;
}
}
}
Expand Down Expand Up @@ -336,8 +334,7 @@ public void SetupForRender()
Transform.m_AnticipatedTransform = Transform.m_AuthoritativeTransform;
}

transform_.position = Transform.m_AnticipatedTransform.Position;
transform_.rotation = Transform.m_AnticipatedTransform.Rotation;
transform_.SetPositionAndRotation(Transform.m_AnticipatedTransform.Position, Transform.m_AnticipatedTransform.Rotation);
transform_.localScale = Transform.m_AnticipatedTransform.Scale;
}
}
Expand All @@ -347,8 +344,7 @@ public void SetupForUpdate()
if (Transform.CanCommitToTransform)
{
var transform_ = Transform.transform;
transform_.position = Transform.m_AuthoritativeTransform.Position;
transform_.rotation = Transform.m_AuthoritativeTransform.Rotation;
transform_.SetPositionAndRotation(Transform.m_AuthoritativeTransform.Position, Transform.m_AuthoritativeTransform.Rotation);
transform_.localScale = Transform.m_AuthoritativeTransform.Scale;
}
}
Expand Down Expand Up @@ -493,8 +489,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds
{
m_AnticipatedTransform = to;
m_PreviousAnticipatedTransform = m_AnticipatedTransform;
transform_.position = to.Position;
transform_.rotation = to.Rotation;
transform_.SetPositionAndRotation(to.Position, to.Rotation);
transform_.localScale = to.Scale;
m_SmoothDuration = 0;
m_CurrentSmoothTime = 0;
Expand All @@ -505,8 +500,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds

if (!CanCommitToTransform)
{
transform_.position = from.Position;
transform_.rotation = from.Rotation;
transform_.SetPositionAndRotation(from.Position, from.Rotation);
transform_.localScale = from.Scale;
}

Expand Down Expand Up @@ -554,18 +548,16 @@ protected override void OnTransformUpdated()
if (!m_OutstandingAuthorityChange)
{
// Keep the anticipated value unchanged, we have no updates from the server at all.
transform_.position = previousAnticipatedTransform.Position;
transform_.SetPositionAndRotation(previousAnticipatedTransform.Position, previousAnticipatedTransform.Rotation);
transform_.localScale = previousAnticipatedTransform.Scale;
transform_.rotation = previousAnticipatedTransform.Rotation;
return;
}

if (StaleDataHandling == StaleDataHandling.Ignore && m_LastAnticipaionCounter > m_LastAuthorityUpdateCounter)
{
// Keep the anticipated value unchanged because it is more recent than the authoritative one.
transform_.position = previousAnticipatedTransform.Position;
transform_.SetPositionAndRotation(previousAnticipatedTransform.Position, previousAnticipatedTransform.Rotation);
transform_.localScale = previousAnticipatedTransform.Scale;
transform_.rotation = previousAnticipatedTransform.Rotation;
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,7 @@ internal void InternalDetach()
{
// Set the original parent and origianl local position and rotation
transform.SetParent(m_DefaultParent.transform, false);
transform.localPosition = m_OriginalLocalPosition;
transform.localRotation = m_OriginalLocalRotation;
transform.SetLocalPositionAndRotation(m_OriginalLocalPosition, m_OriginalLocalRotation);
}
m_AttachState = AttachState.Detached;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public bool HasPositionChange
{
get
{
return HasPositionX | HasPositionY | HasPositionZ;
return HasPositionX || HasPositionY || HasPositionZ;
}
}

Expand Down Expand Up @@ -241,7 +241,7 @@ public bool HasRotAngleChange
{
get
{
return HasRotAngleX | HasRotAngleY | HasRotAngleZ;
return HasRotAngleX || HasRotAngleY || HasRotAngleZ;
}
}

Expand Down Expand Up @@ -301,7 +301,7 @@ public bool HasScaleChange
{
get
{
return HasScaleX | HasScaleY | HasScaleZ;
return HasScaleX || HasScaleY || HasScaleZ;
}
}

Expand Down Expand Up @@ -3950,8 +3950,7 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s
{
if (InLocalSpace)
{
transform.localPosition = pos;
transform.localRotation = rot;
transform.SetLocalPositionAndRotation(pos, rot);
}
else
{
Expand Down Expand Up @@ -4539,8 +4538,8 @@ private void UpdateTransformState()
// - If UsUnrealiable is not enabled
// - If teleporting or synchronizing
// - If sending an UnrealiableFrameSync or synchronizing the base position of the NetworkDeltaPosition
var networkDelivery = !UseUnreliableDeltas | m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame | m_LocalAuthoritativeNetworkState.IsSynchronizing
| m_LocalAuthoritativeNetworkState.UnreliableFrameSync | m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat
var networkDelivery = !UseUnreliableDeltas || m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame || m_LocalAuthoritativeNetworkState.IsSynchronizing
|| m_LocalAuthoritativeNetworkState.UnreliableFrameSync || m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat
? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;

// Server-host-dahost always sends updates to all clients (but itself)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ public void Initialize(bool warnInvalid = true)
{
foreach (var list in NetworkPrefabsLists)
{
foreach (var networkPrefab in list.PrefabList)
{
prefabs.Add(networkPrefab);
}
prefabs.AddRange(list.PrefabList);
}
}

Expand Down Expand Up @@ -154,7 +151,7 @@ public void Initialize(bool warnInvalid = true)
if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
{
var sb = new StringBuilder("Removing invalid prefabs from Network Prefab registration: ");
sb.Append(string.Join(", ", removeList));
sb.AppendJoin(", ", removeList);
NetworkLog.LogWarning(sb.ToString());
}
}
Expand Down
Loading