Merge branch 'develop'

Author: micahpearlman

Editor/ZOImportZeroSim.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using UnityEngine;
 using UnityEditor;
-using UnityEditor.Experimental.AssetImporters;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using ZO.Document;
@@ -347,9 +347,9 @@ public static string MakeRelativePath(string fromPath, string toPath) {
     /// <summary>
     /// Converts a .zosim file to a text asset
     /// </summary>
-    [ScriptedImporter(1, "zosim")]
-    public class ZoSimImporter : ScriptedImporter {
-        public override void OnImportAsset(AssetImportContext ctx) {
+    [UnityEditor.AssetImporters.ScriptedImporter(1, "zosim")]
+    public class ZoSimImporter : UnityEditor.AssetImporters.ScriptedImporter {
+        public override void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext ctx) {
             TextAsset subAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
             ctx.AddObjectToAsset("text", subAsset);
             ctx.SetMainObject(subAsset);

Runtime/Scripts/Util/Extensions/IJobParallelForBatch.cs

@@ -15,7 +15,7 @@ internal struct ParallelForBatchJobStruct<T> where T : struct, IJobParallelForBa
 
             public static IntPtr Initialize() {
                 if (jobReflectionData == IntPtr.Zero)
-                    jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), JobType.ParallelFor, (ExecuteJobFunction)Execute);
+                    { jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute); }
                 return jobReflectionData;
             }
 
@@ -37,7 +37,7 @@ public unsafe static void Execute(ref T jobData, System.IntPtr additionalPtr, Sy
         }
 
         unsafe static public JobHandle ScheduleBatch<T>(this T jobData, int arrayLength, int minIndicesPerJobCount, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParallelForBatch {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForBatchJobStruct<T>.Initialize(), dependsOn, ScheduleMode.Batched);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForBatchJobStruct<T>.Initialize(), dependsOn, ScheduleMode.Parallel);
             return JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, minIndicesPerJobCount);
         }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.fsstudio.zerosim",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "displayName": "ZeroSim",
   "description": "ZeroSim ROS robotic simulator in Unity.",
   "unity": "2020.1",
@@ -29,4 +29,4 @@
     "url": "https://github.com/fsstudio-team/ZeroSimROSUnity.git"
   },
   "type": "module"
-}
+}