Code refactoring

0x7c13 · Oct 15, 2023 · c587ffe · c587ffe
1 parent a18eae0
commit c587ffe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/Assets/Scripts/Engine/Core/Abstraction/IManagedObject.cs b/Assets/Scripts/Engine/Core/Abstraction/IManagedObject.cs
@@ -24,5 +24,14 @@ public interface IManagedObject
  /// Destroys the native object associated with this managed object.
  /// </summary>
  public void Destroy();
+
+ /// <summary>
+ /// Determines whether the specified managed object is equal to the current managed object.
+ /// </summary>
+ public bool Equals(IManagedObject other)
+ {
+ if (other == null) return false;
+ else return NativeObject == other.NativeObject;
+ }
  }
 }
diff --git a/Assets/Scripts/Engine/Navigation/Path.cs b/Assets/Scripts/Engine/Navigation/Path.cs
@@ -5,6 +5,7 @@
 
 namespace Engine.Navigation
 {
+ using System.Collections.Generic;
  using Pal3.Core.Contract.Enums;
 
  using Vector3 = UnityEngine.Vector3;
@@ -24,7 +25,7 @@ public sealed class Path
 
  public bool IgnoreObstacle { get; private set; }
 
- private Vector3[] _wayPoints = {};
+ private readonly List<Vector3> _wayPoints = new ();
 
  private int _currentWayPointIndex;
 
@@ -35,7 +36,7 @@ public sealed class Path
  {
  Clear();
 
- _wayPoints = wayPoints;
+ _wayPoints.AddRange(wayPoints);
  _currentWayPointIndex = 0;
 
  MovementMode = movementMode;
@@ -47,23 +48,23 @@ public void Clear()
  {
  MovementMode = 0;
  EndOfPathAction = EndOfPathActionType.Idle;
- _wayPoints = new Vector3[] {};
+ _wayPoints.Clear();
  _currentWayPointIndex = 0;
  }
 
  public bool MoveToNextWayPoint()
  {
- return ++_currentWayPointIndex < _wayPoints.Length;
+ return ++_currentWayPointIndex < _wayPoints.Count;
  }
 
  public bool IsEndOfPath()
  {
- return !(_wayPoints.Length > 0 && _currentWayPointIndex < _wayPoints.Length);
+ return !(_wayPoints.Count > 0 && _currentWayPointIndex < _wayPoints.Count);
  }
 
  public Vector3[] GetAllWayPoints()
  {
- return _wayPoints;
+ return _wayPoints.ToArray();
  }
 
  public Vector3 GetCurrentWayPoint()

diff --git a/Assets/Scripts/Pal3.Game/Actor/Controllers/ActorMovementController.cs b/Assets/Scripts/Pal3.Game/Actor/Controllers/ActorMovementController.cs
@@ -360,9 +360,7 @@ protected override void OnCollisionEnterGameEntity(IGameEntity otherGameEntity)
 
  protected override void OnCollisionExitGameEntity(IGameEntity otherGameEntity)
  {
- // We have to compare the native object pointer instead of the game entity
- // to make sure we are removing the correct collider.
- _activeColliders.RemoveWhere(_ => _.ColliderGameEntity.NativeObject == otherGameEntity.NativeObject);
+ _activeColliders.RemoveWhere(_ => _.ColliderGameEntity.Equals(otherGameEntity));
 
  if (_actionController.GetRigidBody() is { isKinematic: false } actorRigidbody)
  {