Skip to content

Commit ae56748

Browse files
committed
#
1 parent 6c9b905 commit ae56748

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void NetworkSerialize(NetworkSerializer serializer)
221221

222222
public void InitializeInterpolator<TPos, TRot, TScale>() where TPos : IInterpolator<float>, new() where TRot : IInterpolator<Quaternion>, new() where TScale : IInterpolator<float>, new()
223223
{
224-
AllFloatInterpolators.Clear();
224+
m_AllFloatInterpolators.Clear();
225225
if (Interpolate)
226226
{
227227
PositionXInterpolator = new TPos();
@@ -243,16 +243,15 @@ public void NetworkSerialize(NetworkSerializer serializer)
243243
ScaleZInterpolator = new NoInterpolator<float>();
244244
}
245245

246-
AllFloatInterpolators.Add(PositionXInterpolator);
247-
AllFloatInterpolators.Add(PositionYInterpolator);
248-
AllFloatInterpolators.Add(PositionZInterpolator);
249-
AllFloatInterpolators.Add(ScaleXInterpolator);
250-
AllFloatInterpolators.Add(ScaleYInterpolator);
251-
AllFloatInterpolators.Add(ScaleZInterpolator);
246+
m_AllFloatInterpolators.Add(PositionXInterpolator);
247+
m_AllFloatInterpolators.Add(PositionYInterpolator);
248+
m_AllFloatInterpolators.Add(PositionZInterpolator);
249+
m_AllFloatInterpolators.Add(ScaleXInterpolator);
250+
m_AllFloatInterpolators.Add(ScaleYInterpolator);
251+
m_AllFloatInterpolators.Add(ScaleZInterpolator);
252252
}
253253

254-
// public IInterpolator<float>[] all = new[];
255-
private readonly List<IInterpolator<float>> AllFloatInterpolators = new List<IInterpolator<float>>(6);
254+
private readonly List<IInterpolator<float>> m_AllFloatInterpolators = new List<IInterpolator<float>>(6);
256255

257256
private Transform m_Transform; // cache the transform component to reduce unnecessary bounce between managed and native
258257

@@ -553,12 +552,12 @@ private void Awake()
553552
{
554553
m_Transform = transform;
555554

556-
if (AllFloatInterpolators.Count == 0)
555+
if (m_AllFloatInterpolators.Count == 0)
557556
{
558557
InitializeInterpolator<BufferedLinearInterpolatorFloat, BufferedLinearInterpolatorQuaternion, BufferedLinearInterpolatorFloatForScale>();
559558
}
560559

561-
foreach (var interpolator in AllFloatInterpolators)
560+
foreach (var interpolator in m_AllFloatInterpolators)
562561
{
563562
interpolator.Awake();
564563
interpolator.UseFixedUpdate = UseFixedUpdate;
@@ -588,7 +587,7 @@ private void Awake()
588587

589588
public void Start()
590589
{
591-
foreach (var interpolator in AllFloatInterpolators)
590+
foreach (var interpolator in m_AllFloatInterpolators)
592591
{
593592
interpolator.Start();
594593
}
@@ -598,7 +597,7 @@ public void Start()
598597

599598
public void OnEnable()
600599
{
601-
foreach (var interpolator in AllFloatInterpolators)
600+
foreach (var interpolator in m_AllFloatInterpolators)
602601
{
603602
interpolator.OnEnable();
604603
}
@@ -612,10 +611,11 @@ public override void OnNetworkSpawn()
612611
{
613612
ResetCurrentInterpolatedState(); // useful for late joining
614613

615-
foreach (var interpolator in AllFloatInterpolators) // todo remove GC alloc this creates
614+
foreach (var interpolator in m_AllFloatInterpolators)
616615
{
617616
interpolator.OnNetworkSpawn();
618617
}
618+
619619
// todo cache network manager to remove some of the time it takes to get it
620620
RotationInterpolator.OnNetworkSpawn();
621621

@@ -627,7 +627,7 @@ private void OnDestroy()
627627
{
628628
ReplNetworkState.OnValueChanged -= OnNetworkStateChanged;
629629

630-
foreach (var interpolator in AllFloatInterpolators)
630+
foreach (var interpolator in m_AllFloatInterpolators)
631631
{
632632
interpolator.OnDestroy();
633633
}
@@ -672,7 +672,7 @@ private void FixedUpdate()
672672
ApplyNetworkStateFromAuthority(ReplNetworkState.Value);
673673
}
674674

675-
foreach (var interpolator in AllFloatInterpolators)
675+
foreach (var interpolator in m_AllFloatInterpolators)
676676
{
677677
interpolator.FixedUpdate(NetworkManager.ServerTime.FixedDeltaTime);
678678
}
@@ -696,7 +696,7 @@ private void Update()
696696
// apply interpolated value
697697
if (!IsServer && (NetworkManager.Singleton.IsConnectedClient || NetworkManager.Singleton.IsListening))
698698
{
699-
foreach (var interpolator in AllFloatInterpolators)
699+
foreach (var interpolator in m_AllFloatInterpolators)
700700
{
701701
interpolator.Update(Time.deltaTime);
702702
}

0 commit comments

Comments
 (0)