revived some ugly code for compatibility

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

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/AlembicImporter/Assets/Packaging.cs b/AlembicImporter/Assets/Packaging.cs
@@ -9,7 +9,7 @@ public static void MakePackage_Alembic()
     {
         string[] files = new string[]
         {
-"Assets/UTJ",
+"Assets/UTJ/Alembic",
         };
         AssetDatabase.ExportPackage(files, "AlembicForUnity.unitypackage", ExportPackageOptions.Recurse);
     }

diff --git a/AlembicImporter/Assets/UTJ/Alembic/Editor/Importer/AlembicImporter.cs b/AlembicImporter/Assets/UTJ/Alembic/Editor/Importer/AlembicImporter.cs
@@ -121,7 +121,7 @@ public override void OnImportAsset(AssetImportContext ctx)
                 streamDescriptor.abcEndTime = abcEndTime = endTime = tr.endTime;
 
                 var streamPlayer = go.AddComponent<AlembicStreamPlayer>();
-                streamPlayer.m_streamDescriptor = streamDescriptor;
+                streamPlayer.streamDescriptor = streamDescriptor;
                 streamPlayer.m_startTime = startTime;
                 streamPlayer.m_endTime = endTime;
 

diff --git a/AlembicImporter/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamPlayerEditor.cs b/AlembicImporter/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamPlayerEditor.cs
@@ -12,14 +12,14 @@ public class AlembicStreamPlayerEditor : Editor
         public override void OnInspectorGUI()
         {   
             SerializedProperty vertexMotionScale = serializedObject.FindProperty("m_vertexMotionScale");
-            SerializedProperty streamDescriptorObj = serializedObject.FindProperty("m_streamDescriptor");
+            SerializedProperty streamDescriptorObj = serializedObject.FindProperty("streamDescriptor");
             SerializedProperty currentTime = serializedObject.FindProperty("m_currentTime");
             SerializedProperty startTime = serializedObject.FindProperty("m_startTime");
             SerializedProperty endTime = serializedObject.FindProperty("m_endTime");
             SerializedProperty asyncLoad = serializedObject.FindProperty("m_asyncLoad");
 
             var streamPlayer = target as AlembicStreamPlayer;
-            var targetStreamDesc = streamPlayer.m_streamDescriptor;
+            var targetStreamDesc = streamPlayer.streamDescriptor;
             var multipleTimeRanges = false;
             foreach (AlembicStreamPlayer player in targets)
             {

diff --git a/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamPlayer.cs b/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicStreamPlayer.cs
@@ -6,7 +6,7 @@ namespace UTJ.Alembic
     public class AlembicStreamPlayer : MonoBehaviour
     {
         public AlembicStream m_stream;
-        public AlembicStreamDescriptor m_streamDescriptor;
+        public AlembicStreamDescriptor streamDescriptor;
         [SerializeField] public double m_currentTime;
         [SerializeField] public double m_startTime = double.MinValue;
         [SerializeField] public double m_endTime = double.MaxValue;
@@ -20,16 +20,16 @@ public class AlembicStreamPlayer : MonoBehaviour
 
         void OnValidate()
         {
-            if (m_streamDescriptor == null) return;
-            m_startTime = Mathf.Clamp((float)m_startTime, (float)m_streamDescriptor.abcStartTime, (float)m_streamDescriptor.abcEndTime);
-            m_endTime = Mathf.Clamp((float)m_endTime, (float)m_startTime, (float)m_streamDescriptor.abcEndTime);
+            if (streamDescriptor == null) return;
+            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();
             m_forceUpdate = true;
         }
 
         void Update()
         {
-            if (m_stream == null || m_streamDescriptor == null)
+            if (m_stream == null || streamDescriptor == null)
                 return;
 
             ClampTime();
@@ -67,9 +67,9 @@ private void ClampTime()
 
         public void LoadStream()
         {
-            if (m_streamDescriptor == null)
+            if (streamDescriptor == null)
                 return;
-            m_stream = new AlembicStream(gameObject, m_streamDescriptor);
+            m_stream = new AlembicStream(gameObject, streamDescriptor);
             m_stream.AbcLoad();
             m_forceUpdate = true;
         }