Merge pull request #27 from crashkonijn/fix/collections-2-1-breaking-…

…package Fixed Collections >= 2.1 breaking package
crashkonijn · May 15, 2023 · f83a4f9 · f83a4f9
2 parents ec36688 + ac02626
commit f83a4f9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/Package/Runtime/CrashKonijn.Goap.Resolver/GraphResolver.cs b/Package/Runtime/CrashKonijn.Goap.Resolver/GraphResolver.cs
@@ -12,7 +12,12 @@ public class GraphResolver : IGraphResolver
     {
         private readonly List<Node> indexList;
         private readonly List<IAction> actionIndexList;
+
+#if UNITY_COLLECTIONS_2_1
+        private NativeParallelMultiHashMap<int, int> map;
+#else
         private NativeMultiHashMap<int, int> map;
+#endif
 
         private GraphResolverJob job;
         private JobHandle handle;
@@ -25,8 +30,12 @@ public GraphResolver(IAction[] actions, IActionKeyResolver keyResolver)
 
             this.indexList = this.graph.AllNodes.ToList();
             this.actionIndexList = this.indexList.Select(x => x.Action).ToList();
-
+
+#if UNITY_COLLECTIONS_2_1
+            var map = new NativeParallelMultiHashMap<int, int>(this.indexList.Count, Allocator.Persistent);
+#else
             var map = new NativeMultiHashMap<int, int>(this.indexList.Count, Allocator.Persistent);
+#endif
 
             for (var i = 0; i < this.indexList.Count; i++)
             {

diff --git a/Package/Runtime/CrashKonijn.Goap.Resolver/GraphResolverJob.cs b/Package/Runtime/CrashKonijn.Goap.Resolver/GraphResolverJob.cs
@@ -39,7 +39,11 @@ public int Compare(NodeData x, NodeData y)
     public struct GraphResolverJob : IJob
     {
         // Graph specific
+#if UNITY_COLLECTIONS_2_1
+        [ReadOnly] public NativeParallelMultiHashMap<int, int> Connections;
+#else
         [ReadOnly] public NativeMultiHashMap<int, int> Connections;
+#endif
 
         // Resolve specific
         [ReadOnly] public RunData RunData;

diff --git a/Package/Runtime/CrashKonijn.Goap.Resolver/ResolveHandle.cs b/Package/Runtime/CrashKonijn.Goap.Resolver/ResolveHandle.cs
@@ -12,6 +12,20 @@ public class ResolveHandle : IResolveHandle
         private GraphResolverJob job;
         private RunData runData;
 
+#if UNITY_COLLECTIONS_2_1
+        public ResolveHandle(GraphResolver graphResolver, NativeParallelMultiHashMap<int, int> connections, RunData runData)
+        {
+            this.graphResolver = graphResolver;
+            this.job = new GraphResolverJob
+            {
+                Connections = connections,
+                RunData = runData,
+                Result = new NativeList<NodeData>(Allocator.TempJob)
+            };
+
+            this.handle = this.job.Schedule();
+        }
+#else
         public ResolveHandle(GraphResolver graphResolver, NativeMultiHashMap<int, int> connections, RunData runData)
         {
             this.graphResolver = graphResolver;
@@ -24,6 +38,7 @@ public ResolveHandle(GraphResolver graphResolver, NativeMultiHashMap<int, int> c
 
             this.handle = this.job.Schedule();
         }
+#endif
 
         public IAction[] Complete()
         {

diff --git a/Package/Runtime/CrashKonijn.Goap.Resolver/com.crashkonijn.goap.resolver.asmdef b/Package/Runtime/CrashKonijn.Goap.Resolver/com.crashkonijn.goap.resolver.asmdef
@@ -13,6 +13,12 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.collections",
+            "expression": "2.1",
+            "define": "UNITY_COLLECTIONS_2_1"
+        }
+    ],
     "noEngineReferences": false
 }