Skip to content

Commit d879ce3

Browse files
committed
removed dlls from root. not needed.
updated to unity 2020.2
1 parent a168b0b commit d879ce3

File tree

11 files changed

+8
-140
lines changed

11 files changed

+8
-140
lines changed

Editor/ZOImportZeroSim.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.IO;
55
using UnityEngine;
66
using UnityEditor;
7-
using UnityEditor.Experimental.AssetImporters;
7+
88
using Newtonsoft.Json;
99
using Newtonsoft.Json.Linq;
1010
using ZO.Document;
@@ -347,9 +347,9 @@ public static string MakeRelativePath(string fromPath, string toPath) {
347347
/// <summary>
348348
/// Converts a .zosim file to a text asset
349349
/// </summary>
350-
[ScriptedImporter(1, "zosim")]
351-
public class ZoSimImporter : ScriptedImporter {
352-
public override void OnImportAsset(AssetImportContext ctx) {
350+
[UnityEditor.AssetImporters.ScriptedImporter(1, "zosim")]
351+
public class ZoSimImporter : UnityEditor.AssetImporters.ScriptedImporter {
352+
public override void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext ctx) {
353353
TextAsset subAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
354354
ctx.AddObjectToAsset("text", subAsset);
355355
ctx.SetMainObject(subAsset);

Runtime/Plugins/Docker.DotNet.dll

-380 KB
Binary file not shown.

Runtime/Plugins/Docker.DotNet.dll.meta

Lines changed: 0 additions & 33 deletions
This file was deleted.
-95.4 KB
Binary file not shown.

Runtime/Plugins/Newtonsoft.Json.Bson.dll.meta

Lines changed: 0 additions & 33 deletions
This file was deleted.
-677 KB
Binary file not shown.

Runtime/Plugins/Newtonsoft.Json.dll.meta

Lines changed: 0 additions & 33 deletions
This file was deleted.

Runtime/Plugins/System.Buffers.dll

-20.4 KB
Binary file not shown.

Runtime/Plugins/System.Buffers.dll.meta

Lines changed: 0 additions & 33 deletions
This file was deleted.

Runtime/Scripts/Util/Extensions/IJobParallelForBatch.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal struct ParallelForBatchJobStruct<T> where T : struct, IJobParallelForBa
1515

1616
public static IntPtr Initialize() {
1717
if (jobReflectionData == IntPtr.Zero)
18-
jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), JobType.ParallelFor, (ExecuteJobFunction)Execute);
18+
{ jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute); }
1919
return jobReflectionData;
2020
}
2121

@@ -37,7 +37,7 @@ public unsafe static void Execute(ref T jobData, System.IntPtr additionalPtr, Sy
3737
}
3838

3939
unsafe static public JobHandle ScheduleBatch<T>(this T jobData, int arrayLength, int minIndicesPerJobCount, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParallelForBatch {
40-
var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForBatchJobStruct<T>.Initialize(), dependsOn, ScheduleMode.Batched);
40+
var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForBatchJobStruct<T>.Initialize(), dependsOn, ScheduleMode.Parallel);
4141
return JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, minIndicesPerJobCount);
4242
}
4343

0 commit comments

Comments
 (0)