Merge pull request #365 from Unity-Technologies/dev

Create release 2.1.1-pre.1

TestProjects/AlembicImporter/Packages/manifest.json

@@ -1,8 +1,18 @@
 {
+  "scopedRegistries": [
+    {
+      "name": "Candidates",
+      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
+      "scopes": [
+        "com.unity.package-manager-doctools"
+      ]
+    }
+  ],
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.coding": "0.1.0-preview.17",
+    "com.unity.package-manager-doctools":"1.6.1-preview",
     "com.unity.formats.alembic": "file:../../../com.unity.formats.alembic",
     "com.unity.ide.rider": "1.1.4",
     "com.unity.ide.vscode": "1.2.0",

TestProjects/AlembicRecorder/Assets/Tests/Unity.Formats.Alembic.RecorderTests.Runtime.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "Unity.Formats.Alembic.RecorderTests.Runtime",
+    "name": "Unity.Formats.Alembic.RecorderTests.Editor",
     "references": [
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
@@ -21,4 +21,4 @@
     ],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}

com.unity.formats.alembic/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changes in Alembic for Unity
 
-## [2.1.0-preview.3] - 2020-09-24
+## [2.1.1-pre.1] - 2020-10-21
 ### Feature
 - Added Unity recorder integration (compatible with Unity Recorder >= 2.2.0).
 
@@ -9,7 +9,7 @@
 - Fixed a bug that caused a crash when exporting a GameObject with a MeshRender but without a MeshFilter Component.
 - Fixed a bug where the visibility was not properly read if it was the only animated property of the object. 
 - When the timeline does discontinuous time updates (scrubbing), the alembic updates the scene synchronously.
-- Updated dependency to Burst 1.3.6 (Eliminate the need to have a C++ compiler for x86-64 Mono builds).
+- Updated optional dependency to Burst 1.1.1 or newer.
 
 ## [2.0.1-preview.1] - 2020-05-29
 ### Changes
@@ -47,7 +47,7 @@
 ### Changes
 - Fixed regression introduced in 1.0.4 where old Alembic scene instances would lose prefab connection. New scene instances made with 1.0.4 are unfortunately unrecoverable
 
-## [1.0.4] - 2019-05-2
+## [1.0.4] - 2019-05-02
 ### Changes
 - Fixed crash in the Exporter when using SwapFaces
 - Fixed Branch recording mode in the Exporter
@@ -57,7 +57,7 @@
 - Fixed regression, where absolute paths to alembic assets were stored
 - Alembic importer and Exporter correctly deals with physical Camera parameters
 
-## [1.0.3] - 2019-04-9
+## [1.0.3] - 2019-04-09
 ### Changes
 - Do not lock Alembic files when Windows
 - Fix InheritXform on files from Blender

com.unity.formats.alembic/Documentation~/ref_Recorder.md

@@ -6,7 +6,7 @@ This section covers all properties specific to the Alembic Clip Recorder type.
 > * You must install the [Unity Recorder](https://docs.unity3d.com/Packages/com.unity.recorder@latest/index.html) package (minimum version: 2.0.0) to use the Alembic Clip Recorder.
 > * To fully configure an Alembic Clip Recorder, you must also set the global Recording Properties for the capture (properties shared with the other recorders, such as the frames to record). The [Unity Recorder documentation](https://docs.unity3d.com/Packages/com.unity.recorder@latest/index.html) describes these properties in detail.
 
-![](Images/alembic-recorder-window.png)
+![](images/alembic-recorder-window.png)
 
 The Alembic Clip Recorder properties fall into three main categories:
 * [Output File](#output-file)

com.unity.formats.alembic/Editor/UnityRecorder/Recorder/AlembicRecorderSettingsEditor.cs

@@ -12,7 +12,7 @@ class AlembicRecorderSettingsEditor : RecorderEditor
         SavedBool m_foldCaptureComponents;
         SavedBool m_foldMeshComponents;
 
-        public void OnEnable()
+        protected override void OnEnable()
         {
             base.OnEnable();
             m_foldCaptureComponents = new SavedBool($"{target.GetType()}.m_foldCaptureComponents", false);

com.unity.formats.alembic/LICENSE.md

@@ -1,4 +1,4 @@
-Alembic for Unity copyright © [2019] Unity Technologies ApS
+com.unity.formats.alembic copyright © 2020 Unity Technologies ApS
 
 Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License).
 

com.unity.formats.alembic/Runtime/Scripts/Exporter/AbcAPI.cs

@@ -5,6 +5,7 @@
 
 [assembly: InternalsVisibleTo("Unity.Formats.Alembic.UnitTests.Editor")]
 [assembly: InternalsVisibleTo("Unity.Formats.Alembic.UnitTests.Runtime")]
+[assembly: InternalsVisibleTo("Unity.Formats.Alembic.RecorderTests.Editor")]
 [assembly: InternalsVisibleTo("Unity.Formats.Alembic.Tests")]
 [assembly: InternalsVisibleTo("Unity.Formats.Alembic.Editor")]
 

com.unity.formats.alembic/Runtime/Scripts/Importer/AlembicMesh.cs

@@ -292,8 +292,9 @@ public void Execute()
                 sample.FillVertexBuffer(splitData, submeshData);
             }
         }
-
+#if BURST_AVAILABLE
         [BurstCompile]
+#endif
         struct MultiplyByConstant : IJobParallelFor
         {
             [NativeDisableUnsafePtrRestriction]

com.unity.formats.alembic/Runtime/Scripts/Importer/AlembicStreamPlayer.cs

@@ -104,7 +104,7 @@ public float VertexMotionScale
         public string PathToAbc => StreamDescriptor != null ? StreamDescriptor.PathToAbc : "";
 
         /// <summary>
-        /// The stream import options.
+        /// The stream import options. NOTE: these options are shared between all instances of this asset.
         /// </summary>
         public AlembicStreamSettings Settings => StreamDescriptor != null ? StreamDescriptor.Settings : null;
 
@@ -129,7 +129,7 @@ public void UpdateImmediately(float time)
         /// </summary>
         /// <param name="newPath">Path to the new file.</param>
         /// <returns>True if the load succeeded, false otherwise.</returns>
-        public bool LoadFromFile(string newPath)
+        internal bool LoadFromFile(string newPath)
         {
             if (StreamDescriptor == null)
             {

com.unity.formats.alembic/Runtime/Scripts/Timeline/AlembicShotAsset.cs

@@ -27,7 +27,12 @@ public ExposedReference<AlembicStreamPlayer> StreamPlayer
             set { streamPlayer = value; }
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// For more information see: https://docs.unity3d.com/ScriptReference/Playables.PlayableAsset.CreatePlayable.html
+        /// </summary>
+        /// <param name="graph">The Playable Graph.</param>
+        /// <param name="owner">The GameObject containing the PlayableDirector.</param>
+        /// <returns>The playable that drives the AlembicStreamPlayer.</returns>
         public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
         {
             var playable = ScriptPlayable<AlembicShotPlayable>.Create(graph);
@@ -37,7 +42,9 @@ public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
             return playable;
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Returns the duration selected through the AlembicStreamPlayer.
+        /// </summary>
         public override double duration
         {
             get

com.unity.formats.alembic/Runtime/Unity.Formats.Alembic.Runtime.api

@@ -49,7 +49,6 @@ namespace UnityEngine.Formats.Alembic.Importer
         public float StartTime { get; set; }
         public float VertexMotionScale { get; set; }
         public AlembicStreamPlayer() {}
-        public bool LoadFromFile(string newPath);
         public void UpdateImmediately(float time);
     }
 

com.unity.formats.alembic/Runtime/Unity.Formats.Alembic.Runtime.asmdef

@@ -16,6 +16,12 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.burst",
+            "expression": "1.1.1",
+            "define": "BURST_AVAILABLE"
+        }
+    ],
     "noEngineReferences": false
-}
+}

com.unity.formats.alembic/package.json

@@ -1,7 +1,6 @@
 {
   "dependencies": {
-    "com.unity.timeline": "1.0.0",
-    "com.unity.burst": "1.3.6"
+    "com.unity.timeline": "1.0.0"
   },
   "description": "Import and export Alembic files (.abc), record and stream animations in the Alembic format directly in Unity.\n\nThe Alembic format is commonly used in animation to transfer facial, cloth, and other simulation between applications.\n\nIMPORTANT: Alembic for Unity ony supports Windows 64-bit, MacOS X and Linux 64-bit as build targets.",
   "displayName": "Alembic",
@@ -15,5 +14,5 @@
   ],
   "name": "com.unity.formats.alembic",
   "unity": "2019.3",
-  "version": "2.1.0-preview.3"
+  "version": "2.1.1-pre.1"
 }