job-assist version bump

Nebukam · Dec 2, 2021 · f5ef506 · f5ef506
1 parent f1ced03
commit f5ef506
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 47 deletions.
diff --git a/Runtime/Jobs/AgentKDTreeProcessor.cs b/Runtime/Jobs/AgentKDTreeProcessor.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using Unity.Collections;
 
 namespace Nebukam.ORCA
@@ -51,11 +52,8 @@ protected override void Prepare(ref AgentKDTreeJob job, float delta)
             }
 
             int agentCount = 2 * m_agentProvider.outputAgents.Length;
-            if (m_outputTree.Length != agentCount)
-            {
-                m_outputTree.Dispose();
-                m_outputTree = new NativeArray<AgentTreeNode>(agentCount, Allocator.Persistent);
-            }
+
+            MakeLength(ref m_outputTree, agentCount);
 
             job.m_inputAgents = m_agentProvider.outputAgents;
             job.m_outputTree = m_outputTree;

diff --git a/Runtime/Jobs/AgentProvider.cs b/Runtime/Jobs/AgentProvider.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Mathematics;
@@ -73,11 +74,7 @@ protected override void Prepare(ref Unemployed job, float delta)
 
             int agentCount = m_lockedAgents.Count;
 
-            if (m_outputAgents.Length != agentCount)
-            {
-                m_outputAgents.Dispose();
-                m_outputAgents = new NativeArray<AgentData>(agentCount, Allocator.Persistent);
-            }
+            MakeLength(ref m_outputAgents, agentCount);
 
             m_maxRadius = 0f;
 

diff --git a/Runtime/Jobs/ORCALinesProcessor.cs b/Runtime/Jobs/ORCALinesProcessor.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using Unity.Collections;
 
 namespace Nebukam.ORCA
@@ -88,11 +89,8 @@ protected override int Prepare(ref ORCALinesJob job, float delta)
             }
 
             int agentCount = m_agentProvider.outputAgents.Length;
-            if (m_results.Length != agentCount)
-            {
-                m_results.Dispose();
-                m_results = new NativeArray<AgentDataResult>(agentCount, Allocator.Persistent);
-            }
+
+            MakeLength(ref m_results, agentCount);
 
             //Agent data
             job.m_inputAgents = m_agentProvider.outputAgents;

diff --git a/Runtime/Jobs/ObstacleKDTreeProcessor.cs b/Runtime/Jobs/ObstacleKDTreeProcessor.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using Unity.Collections;
 
 namespace Nebukam.ORCA
@@ -66,12 +67,8 @@ protected override void Prepare(ref ObstacleKDTreeJob job, float delta)
                 job.m_recompute = true;
 
                 int obsCount = 2 * m_obstaclesProvider.referenceObstacles.Length;
-                if (m_outputTree.Length != obsCount)
-                {
-                    m_outputTree.Dispose();
-                    m_outputTree = new NativeArray<ObstacleTreeNode>(obsCount, Allocator.Persistent);
-                }
 
+                MakeLength(ref m_outputTree, obsCount);
             }
             else
             {

diff --git a/Runtime/Jobs/ObstacleProvider.cs b/Runtime/Jobs/ObstacleProvider.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using Unity.Collections;
 
 namespace Nebukam.ORCA
@@ -75,13 +76,7 @@ protected override void Prepare(ref Unemployed job, float delta)
             int obsCount = m_obstacles == null ? 0 : m_obstacles.Count,
              refCount = m_referenceObstacles.Length, vCount = 0;
 
-            if (m_outputObstacleInfos.Length != obsCount)
-            {
-                m_outputObstacleInfos.Dispose();
-                m_outputObstacleInfos = new NativeArray<ObstacleInfos>(obsCount, Allocator.Persistent);
-
-                m_recompute = true;
-            }
+            m_recompute = !MakeLength(ref m_outputObstacleInfos, obsCount);
 
             Obstacle o;
             ObstacleInfos infos;
@@ -111,14 +106,8 @@ protected override void Prepare(ref Unemployed job, float delta)
                 }
             }
 
-            if (refCount != vCount)
-            {
-                m_referenceObstacles.Dispose();
-                m_referenceObstacles = new NativeArray<ObstacleVertexData>(vCount, Allocator.Persistent);
-
-                m_outputObstacles.Dispose();
-                m_outputObstacles = new NativeArray<ObstacleVertexData>(vCount, Allocator.Persistent);
-            }
+            MakeLength(ref m_referenceObstacles, vCount);
+            MakeLength(ref m_outputObstacles, vCount);
 
             ObstacleVertexData oData;
             int gIndex = 0, index = 0, vCountMinusOne, firstIndex, lastIndex;

diff --git a/Runtime/Jobs/RaycastProvider.cs b/Runtime/Jobs/RaycastProvider.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Mathematics;
@@ -71,11 +72,7 @@ protected override void Prepare(ref Unemployed job, float delta)
 
             int raycastCount = m_lockedRaycasts.Count;
 
-            if (m_outputRaycast.Length != raycastCount)
-            {
-                m_outputRaycast.Dispose();
-                m_outputRaycast = new NativeArray<RaycastData>(raycastCount, Allocator.Persistent);
-            }
+            MakeLength(ref m_outputRaycast, raycastCount);
 
             Raycast r;
             float3 pos, dir;

diff --git a/Runtime/Jobs/RaycastsProcessor.cs b/Runtime/Jobs/RaycastsProcessor.cs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 using Nebukam.JobAssist;
+using static Nebukam.JobAssist.CollectionsUtils;
 using System.Collections.Generic;
 using Unity.Collections;
 using static Unity.Mathematics.math;
@@ -86,11 +87,8 @@ protected override int Prepare(ref RaycastsJob job, float delta)
             }
 
             int rayCount = m_raycastProvider.outputRaycasts.Length;
-            if (m_results.Length != rayCount)
-            {
-                m_results.Dispose();
-                m_results = new NativeArray<RaycastResult>(rayCount, Allocator.Persistent);
-            }
+
+            MakeLength(ref m_results, rayCount);
 
             job.m_plane = plane;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.nebukam.orca",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "displayName": "N:ORCA",
   "description": "Optimal Reciprocal Collision Avoidance",
   "unity": "2019.4",
@@ -28,7 +28,7 @@
   },
   "gitDependencies": {
     "com.nebukam.common": "https://github.com/Nebukam/com.nebukam.common.git#0.0.1",
-    "com.nebukam.job-assist": "https://github.com/Nebukam/com.nebukam.job-assist.git#1.0.1"
+    "com.nebukam.job-assist": "https://github.com/Nebukam/com.nebukam.job-assist.git#1.0.5"
   },
   "samples": [
     {