Updated some backing field direct usages with their properties. Repla…

…ced some GetComponent calls with TryGetComponent.
jadvrodrigues · Aug 29, 2023 · d851d78 · d851d78
1 parent 2356725
commit d851d78
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/Assets/CustomNavMesh/Scripts/HiddenNavMeshAgent.cs b/Assets/CustomNavMesh/Scripts/HiddenNavMeshAgent.cs
@@ -85,7 +85,7 @@ public bool IsBlocking
 
                     if (destination.HasValue)
                     {
-                        agent.SetDestination(destination.Value);
+                        Agent.SetDestination(destination.Value);
                     }
                 }
             }
@@ -121,8 +121,7 @@ NavMeshAgent Agent
         {
             if (agent == null)
             {
-                agent = GetComponent<NavMeshAgent>();
-                if (agent == null)
+                if (!TryGetComponent(out agent))
                 {
                     agent = gameObject.AddComponent<NavMeshAgent>();
                 }
@@ -142,8 +141,7 @@ NavMeshObstacle Obstacle
         {
             if (obstacle == null)
             {
-                obstacle = GetComponent<NavMeshObstacle>();
-                if (obstacle == null)
+                if (!TryGetComponent(out obstacle))
                 {
                     obstacle = gameObject.AddComponent<NavMeshObstacle>();
                 }
@@ -175,7 +173,7 @@ public bool SetDestination(Vector3 target)
         SwitchToAgent();
 
         destination = target;
-        return agent.SetDestination(target);
+        return Agent.SetDestination(target);
     }
 
     /// <summary>
@@ -226,21 +224,18 @@ public bool IsLinkedWith(CustomNavMeshAgent customAgent)
 
     protected override void OnCustomEnable()
     {
-        var meshFilter = GetComponent<MeshFilter>();
-        if (meshFilter == null)
+        if (GetComponent<MeshFilter>() == null)
         {
             gameObject.AddComponent<MeshFilter>();
         }
 
-        var meshRenderer = GetComponent<MeshRenderer>();
-        if (meshRenderer == null)
+        if (GetComponent<MeshRenderer>() == null)
         {
-            meshRenderer = gameObject.AddComponent<MeshRenderer>();
+            var meshRenderer = gameObject.AddComponent<MeshRenderer>();
             meshRenderer.sharedMaterial = CustomNavMesh.HiddenAgentMaterial;
         }
 
-        obstacle = GetComponent<NavMeshObstacle>();
-        if (obstacle == null)
+        if (!TryGetComponent(out obstacle))
         {
             obstacle = gameObject.AddComponent<NavMeshObstacle>();
             obstacle.carving = true;
@@ -332,8 +327,8 @@ void SwitchToAgent()
     {
         isBlocking = false;
 
-        obstacle.enabled = false;
-        agent.enabled = true;
+        Obstacle.enabled = false;
+        Agent.enabled = true;
 
         timer = 0.0f;
         GetComponent<MeshRenderer>().sharedMaterial = CustomNavMesh.HiddenAgentMaterial;
@@ -343,8 +338,8 @@ void SwitchToObstacle()
     {
         isBlocking = true;
 
-        agent.enabled = false;
-        obstacle.enabled = true;
+        Agent.enabled = false;
+        Obstacle.enabled = true;
 
         timer = 0.0f;
         GetComponent<MeshRenderer>().sharedMaterial = CustomNavMesh.HiddenBlockingAgentMaterial;