From 706fa9ac26d608b5a958412f0d8614fd4e28c40e Mon Sep 17 00:00:00 2001 From: Griffin Teller Date: Tue, 14 Jul 2020 14:48:12 -0700 Subject: [PATCH] Finished for build and upgraded burst --- Assets/Scripts/Sensor/Lidar.cs | 2 +- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- .../BurstAotSettings_StandaloneOSX.json | 11 +++++++++++ .../BurstAotSettings_StandaloneWindows.json | 16 ++++++++++++++++ ProjectSettings/ProjectSettings.asset | 2 +- 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 ProjectSettings/BurstAotSettings_StandaloneOSX.json create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json diff --git a/Assets/Scripts/Sensor/Lidar.cs b/Assets/Scripts/Sensor/Lidar.cs index 9b0217c..30152c1 100644 --- a/Assets/Scripts/Sensor/Lidar.cs +++ b/Assets/Scripts/Sensor/Lidar.cs @@ -152,7 +152,7 @@ private void StartRaycastJobs() var commands = GetRaycastCommands(); _raycastsHandle = RaycastCommand.ScheduleBatch(commands, _raycastHits, 1); } - + [BurstCompile] private struct MatrixRotater : IJobParallelFor { diff --git a/Packages/manifest.json b/Packages/manifest.json index 150fb07..a08d6ee 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.burst": "1.2.3", + "com.unity.burst": "1.4.0-preview.2", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "2.0.2", "com.unity.ide.vscode": "1.2.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3658b45..6775497 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.2.3", + "version": "1.4.0-preview.2", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json new file mode 100644 index 0000000..ec0089d --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -0,0 +1,11 @@ +{ + "MonoBehaviour": { + "m_Enabled": true, + "m_EditorHideFlags": 0, + "m_Name": "", + "m_EditorClassIdentifier": "Unity.Burst.Editor:Unity.Burst.Editor:BurstPlatformAotSettings", + "DisableOptimisations": false, + "DisableSafetyChecks": true, + "DisableBurstCompilation": false + } +} \ No newline at end of file diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..2144f6d --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 3, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72 + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 03469d6..bae025e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -121,7 +121,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.3.4-alpha.1 + bundleVersion: 0.3.4-dev.5 preloadedAssets: - {fileID: 0} - {fileID: 0}