improve compatibility

Unity-Technologies · Jan 31, 2018 · 4de1ad0 · 4de1ad0
1 parent 37cefd0
commit 4de1ad0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamDescriptor.cs b/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamDescriptor.cs
@@ -9,8 +9,8 @@ public class AlembicStreamDescriptor : ScriptableObject
         [SerializeField] public AlembicStreamSettings settings = new AlembicStreamSettings();
         [SerializeField] public bool hasVaryingTopology = false;
         [SerializeField] public bool hasAcyclicFramerate = false;
-        [SerializeField] public double abcStartTime = 0.0f;
-        [SerializeField] public double abcEndTime = 0.0f;
+        [SerializeField] public double abcStartTime = double.MinValue;
+        [SerializeField] public double abcEndTime = double.MaxValue;
 
         public double duration { get { return abcEndTime - abcStartTime; } }
     }

diff --git a/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamPlayer.cs b/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamPlayer.cs
@@ -18,9 +18,19 @@ public class AlembicStreamPlayer : MonoBehaviour
 
         public double duration { get { return m_endTime - m_startTime; } }
 
+        void Start()
+        {
+            OnValidate();
+        }
+
         void OnValidate()
         {
-            if (streamDescriptor == null) return;
+            if (streamDescriptor == null || m_stream == null)
+                return;
+            if (streamDescriptor.abcStartTime == double.MinValue)
+                streamDescriptor.abcStartTime = m_stream.abcTimeRange.startTime;
+            if (streamDescriptor.abcEndTime == double.MaxValue)
+                streamDescriptor.abcEndTime = m_stream.abcTimeRange.endTime;
             m_startTime = Mathf.Clamp((float)m_startTime, (float)streamDescriptor.abcStartTime, (float)streamDescriptor.abcEndTime);
             m_endTime = Mathf.Clamp((float)m_endTime, (float)m_startTime, (float)streamDescriptor.abcEndTime);
             ClampTime();