Skip to content

Commit 5af68c3

Browse files
committed
Additional fixes
1 parent ae12e5d commit 5af68c3

File tree

13 files changed

+24
-42
lines changed

13 files changed

+24
-42
lines changed

Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
136136

137137
/// <summary>
138138
/// We are using post spawn to handle any final spawn initializations.
139-
/// At this point we know all NetworkBehaviours on this instance has
140-
/// been spawned.
139+
/// At this point we know all NetworkBehaviours on this instance have been spawned.
141140
/// </summary>
142141
protected override void OnNetworkPostSpawn()
143142
{
@@ -173,8 +172,7 @@ public override void OnNetworkDespawn()
173172
{
174173
m_CharacterController.enabled = false;
175174
Camera.main.transform.SetParent(null, false);
176-
Camera.main.transform.position = m_CameraOriginalPosition;
177-
Camera.main.transform.rotation = m_CameraOriginalRotation;
175+
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
178176
}
179177
base.OnNetworkDespawn();
180178
}

Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Random = UnityEngine.Random;
66
using Debug = UnityEngine.Debug;
77

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

145145
/// <summary>
146146
/// We are using post spawn to handle any final spawn initializations.
147-
/// At this point we know all NetworkBehaviours on this instance has
148-
/// been spawned.
147+
/// At this point we know all NetworkBehaviours on this instance have been spawned.
149148
/// </summary>
150149
protected override void OnNetworkPostSpawn()
151150
{
@@ -182,14 +181,13 @@ protected override void OnNetworkPostSpawn()
182181

183182
public override void OnNetworkDespawn()
184183
{
185-
// Notify any client or server specific componant that this instance has despawned.
184+
// Notify any client or server specific component that this instance has despawned.
186185
NotifySpawnStatusChanged?.Invoke(false);
187186
if (IsLocalPlayer)
188187
{
189188
m_CharacterController.enabled = false;
190189
Camera.main.transform.SetParent(null, false);
191-
Camera.main.transform.position = m_CameraOriginalPosition;
192-
Camera.main.transform.rotation = m_CameraOriginalRotation;
190+
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
193191
}
194192
base.OnNetworkDespawn();
195193
}

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ private void SetCameraDefaults()
415415
if (Camera.main != null && Camera.main.transform.parent != null)
416416
{
417417
Camera.main.transform.SetParent(null, false);
418-
Camera.main.transform.position = m_CameraOriginalPosition;
419-
Camera.main.transform.rotation = m_CameraOriginalRotation;
418+
Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
420419
}
421420
}
422421

@@ -522,7 +521,7 @@ private void StartDedicatedServer()
522521

523522
/// <summary>
524523
/// Register callbacks when the OnServerStarted callback is invoked.
525-
/// This makes it easier to know you are registering for events only
524+
/// This makes it easier to know you are registering for events only
526525
/// when the server successfully has started.
527526
/// </summary>
528527
private void ServerStarted()
@@ -578,11 +577,11 @@ private void HandleEditorKeyCommands()
578577
#else
579578
private void HandleConsoleKeyCommands()
580579
{
581-
if (Console.KeyAvailable)
580+
if (Console.KeyAvailable)
582581
{
583582
var networkManager = NetworkManager.Singleton;
584583
var keyPressed = Console.ReadKey(true);
585-
switch(keyPressed.Key)
584+
switch(keyPressed.Key)
586585
{
587586
case ConsoleKey.X:
588587
{

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
4545
var gameObject = m_NetworkManager.IsClient ? Instantiate(NetworkPrefabOverride) : Instantiate(NetworkPrefab);
4646
// You could integrate spawn locations here and on the server side apply the spawn position at
4747
// this stage of the spawn process.
48-
gameObject.transform.position = position;
49-
gameObject.transform.rotation = rotation;
48+
gameObject.transform.SetPositionAndRotation(position, rotation);
5049
return gameObject.GetComponent<NetworkObject>();
5150
}
5251

@@ -64,4 +63,3 @@ public void Destroy(NetworkObject networkObject)
6463
Destroy(networkObject.gameObject);
6564
}
6665
}
67-

com.unity.netcode.gameobjects/Documentation~/basics/object-spawning.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ This type of dynamically spawned `NetworkObject` typically is a simple wrapper c
153153
m_prefabInstance = Instantiate(prefabToSpawn);
154154

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

159158
// Get the instance's NetworkObject and Spawn
160159
m_SpawnedNetworkObject = m_prefabInstance.GetComponent<NetworkObject>();
@@ -233,8 +232,7 @@ public class SinglePooledDynamicSpawner : NetworkBehaviour, INetworkprefabInstan
233232
public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
234233
{
235234
m_prefabInstance.SetActive(true);
236-
m_prefabInstance.transform.position = transform.position;
237-
m_prefabInstance.transform.rotation = transform.rotation;
235+
m_prefabInstance.transform.position.SetPositionAndRotation(transform.position, transform.rotation);
238236
return m_SpawnedNetworkObject;
239237
}
240238

com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,8 @@ private void ProcessSmoothing()
277277
m_PreviousAnticipatedTransform = m_AnticipatedTransform;
278278
if (!CanCommitToTransform)
279279
{
280-
transform_.position = m_AnticipatedTransform.Position;
280+
transform_.SetPositionAndRotation(m_AnticipatedTransform.Position, m_AnticipatedTransform.Rotation);
281281
transform_.localScale = m_AnticipatedTransform.Scale;
282-
transform_.rotation = m_AnticipatedTransform.Rotation;
283282
}
284283
}
285284
}
@@ -549,18 +548,16 @@ protected override void OnTransformUpdated()
549548
if (!m_OutstandingAuthorityChange)
550549
{
551550
// Keep the anticipated value unchanged, we have no updates from the server at all.
552-
transform_.position = previousAnticipatedTransform.Position;
551+
transform_.SetPositionAndRotation(previousAnticipatedTransform.Position, previousAnticipatedTransform.Rotation);
553552
transform_.localScale = previousAnticipatedTransform.Scale;
554-
transform_.rotation = previousAnticipatedTransform.Rotation;
555553
return;
556554
}
557555

558556
if (StaleDataHandling == StaleDataHandling.Ignore && m_LastAnticipaionCounter > m_LastAuthorityUpdateCounter)
559557
{
560558
// Keep the anticipated value unchanged because it is more recent than the authoritative one.
561-
transform_.position = previousAnticipatedTransform.Position;
559+
transform_.SetPositionAndRotation(previousAnticipatedTransform.Position, previousAnticipatedTransform.Rotation);
562560
transform_.localScale = previousAnticipatedTransform.Scale;
563-
transform_.rotation = previousAnticipatedTransform.Rotation;
564561
return;
565562
}
566563

com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using NUnit.Framework;
66
using Unity.Netcode.TestHelpers.Runtime;
77
using Unity.Netcode.Transports.UTP;
8-
using Unity.Networking.Transport;
98
using UnityEngine;
109
using UnityEngine.TestTools;
1110
using static Unity.Netcode.RuntimeTests.UnityTransportTestHelpers;

testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
7171
{
7272
var gameObject = GetNextSpawnObject();
7373
gameObject.SetActive(true);
74-
gameObject.transform.position = position;
75-
gameObject.transform.rotation = rotation;
74+
gameObject.transform.SetPositionAndRotation(position, rotation);
7675
return gameObject.GetComponent<NetworkObject>();
7776
}
7877

testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
128128
{
129129
var gameObject = GetNextSpawnObject();
130130
gameObject.SetActive(true);
131-
gameObject.transform.position = position;
132-
gameObject.transform.rotation = rotation;
131+
gameObject.transform.SetPositionAndRotation(position, rotation);
133132
return gameObject.GetComponent<NetworkObject>();
134133
}
135134

@@ -180,4 +179,3 @@ private IEnumerator SpawnObjects()
180179
}
181180
}
182181
}
183-

testproject/Assets/Tests/Manual/DeltaPositionNetworkTransform/LinearMotionHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ private void LateUpdate()
396396
SetNextDirection();
397397
}
398398

399-
ClientPositionVisual.transform.position = m_ClientPosition;
400-
ClientPositionVisual.transform.rotation = InLocalSpace ? transform.localRotation : transform.rotation;
399+
var rotation = InLocalSpace ? transform.localRotation : transform.rotation;
400+
ClientPositionVisual.transform.SetPositionAndRotation(m_ClientPosition, rotation);
401401
}
402402

403403
private Vector3 m_ServerPosition;

0 commit comments

Comments
 (0)