Merge pull request #404 from Unity-Technologies/UNI-47629-Fixing_obsolete_APIs

UNI-47629 Fixed obsolete API calls

Author: inwoods

Assets/com.unity.formats.fbx.tests/FbxAnimationTest.cs

@@ -74,13 +74,6 @@ public static IEnumerable ContinuousRotationTestCases {
             }
         }
 
-        // test key tangents
-        public static IEnumerable KeyTangentsTestCases {
-            get {
-                yield return new TestCaseData (new float [3] { 0f, 4f, 5f }, new Vector3 [3] { new Vector3 (-100, 100, 0), new Vector3 (0f, 0.0f, 0f), new Vector3 (25f, 0f, 0f) }, new Vector3 [3] { new Vector3 (0, 0, 0), new Vector3 (0f, 0f, 16.9f), new Vector3 (0f, 0f, 0f) }).Returns (6);
-            }
-        }
-
         public static IEnumerable SkinnedMeshTestCases {
             get {
                 yield return "Models/DefaultMale/Male_DyingHitFromBack_Blend_T3_Cut01_James.fbx";
@@ -303,33 +296,6 @@ public virtual int Compare(Keyframe a, Keyframe b)
             }
         }
 
-        public class KeyTangentComparer : IComparer<Keyframe>
-        {
-            public int CompareKeyTangents(Keyframe a, Keyframe b)
-            {
-                bool result = true;
-
-                result &= a.time.Equals(b.time);
-                #if DEBUG_UNITTEST
-                Debug.Log(string.Format("{2} a.time: {0}, b.time: {1}", a.time, b.time,result));
-                #endif
-                // TODO : use AnimationUtility.GetLeftTangentMode 
-                // requires reference to AnimationCurve and keyindex
-                result &= (a.tangentMode == b.tangentMode);
-                #if DEBUG_UNITTEST
-                Debug.Log(string.Format("{2} a.tangentMode={0} b.tangentMode={1}", 
-                    ((AnimationUtility.TangentMode)a.tangentMode).ToString(),
-                    ((AnimationUtility.TangentMode)b.tangentMode).ToString(),result));
-                #endif
-                return result ? 0 : 1;
-            }
-
-            public int Compare(Keyframe a, Keyframe b)
-            {
-                return CompareKeyTangents(a,b);
-            }
-        }
-
         public class AnimTester
         {
             public FbxAnimationTest.KeyData keyData;
@@ -754,30 +720,6 @@ public int ContinuousRotationAnimTest (RotationCurveType rotCurveType, float []
             return tester.DoIt();
         }
 
-        [Description("Uni-35935 key tangents")]
-        [Test, TestCaseSource (typeof (AnimationTestDataClass), "KeyTangentsTestCases")]
-        public int KeyTangentsAnimTest (float [] keyTimesInSeconds, Vector3 [] keyPosValues, Vector3 [] keyRotValues)
-        {
-            System.Type componentType = typeof(Transform);
-
-            if (keyRotValues == null)
-            {
-                keyRotValues = new Vector3[keyPosValues.Length];
-            }
-                
-            string[] propertyNames = null;
-            string testName = componentType.ToString () + "_KeyTangents";
-            RotationCurveType rotCurveType = RotationCurveType.kEuler;
-                
-            testName += "_Euler";
-            propertyNames = AnimationTestDataClass.m_rotationEulerNames.Concat(AnimationTestDataClass.m_translationNames).ToArray();
-
-            KeyData keyData = new TransformKeyData { RotationType = rotCurveType, propertyNames = propertyNames, componentType = componentType, keyTimes = keyTimesInSeconds, keyPosValues = keyPosValues, keyEulerValues = keyRotValues };
-
-            var tester = new AnimTester {keyData=keyData, testName=testName, path=GetRandomFbxFilePath (), keyComparer=new KeyTangentComparer()};
-            return tester.DoIt();
-        }
-
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "ComponentTestCases")]
         public int ComponentAnimTest (System.Type componentType)
         {

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs

@@ -316,7 +316,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,
                 string prefabFullPath = null)
             {
                 if(PrefabUtility.GetPrefabType(instance) == PrefabType.PrefabInstance) {
-                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetPrefabParent(instance));
+                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetCorrespondingObjectFromSource(instance));
                 }
 
                 // Otherwise, create a new prefab. First choose its filename/path.
@@ -388,7 +388,7 @@ public static GameObject GetFbxAssetOrNull(GameObject go) {
                 switch(unityPrefabType) {
                 case PrefabType.ModelPrefabInstance:
                     if (go.Equals(PrefabUtility.FindPrefabRoot (go))) {
-                        return PrefabUtility.GetPrefabParent(go) as GameObject;
+                        return PrefabUtility.GetCorrespondingObjectFromSource(go) as GameObject;
                     } else {
                         return null;
                     }

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs

@@ -1288,7 +1288,7 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx
                 if (unityPrefabType != PrefabType.PrefabInstance &&
                     unityPrefabType != PrefabType.ModelPrefabInstance) return false;
 
-                Object unityPrefabParent = PrefabUtility.GetPrefabParent (unityGo);
+                Object unityPrefabParent = PrefabUtility.GetCorrespondingObjectFromSource(unityGo);
 
                 if (Verbose)
                     Debug.Log (string.Format ("exporting instance {0}({1})", unityGo.name, unityPrefabParent.name));

Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabAutoUpdater.cs

@@ -257,7 +257,7 @@ public static bool OnValidateMenuItem()
             bool containsLinkedPrefab = false;
             foreach (GameObject selectedObject in selection)
             {
-                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(selectedObject) as GameObject;
+                GameObject prefab = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(selectedObject) as GameObject;
                 if (prefab && prefab.GetComponentInChildren<FbxPrefab>())
                 {
                     containsLinkedPrefab = true;
@@ -281,7 +281,7 @@ public static void UpdateLinkedPrefab(GameObject prefabOrInstance)
                 prefab = prefabOrInstance;
                 break;
             case PrefabType.PrefabInstance:
-                prefab = PrefabUtility.GetPrefabParent(prefabOrInstance) as GameObject;
+                prefab = PrefabUtility.GetCorrespondingObjectFromSource(prefabOrInstance) as GameObject;
                 break;
             default:
                 return;
@@ -1407,7 +1407,7 @@ void CompareAndUpdate()
                         m_fbxPrefab.gameObject));
                 }
                 var fbxPrefabInstance = prefabInstanceRoot.GetComponentsInChildren<FbxPrefab>().FirstOrDefault(
-                    fbxPrefab => UnityEditor.PrefabUtility.GetPrefabParent(fbxPrefab) == m_fbxPrefab);
+                    fbxPrefab => UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(fbxPrefab) == m_fbxPrefab);
                 if (!fbxPrefabInstance) {
                     throw new System.Exception(string.Format("Internal error: couldn't find the right FbxPrefab after instantiating."));
                 }

Packages/com.unity.formats.fbx/Editor/Scripts/ReviewLastSavedModel.cs

@@ -300,8 +300,8 @@ public static UnityEditor.EditorWindow GetMainGameView()
             private static void SubscribeToEvents ()
             {
                 // ensure we only subscribe once
-                UnityEditor.EditorApplication.hierarchyWindowChanged -= UpdateLastSavedModel;
-                UnityEditor.EditorApplication.hierarchyWindowChanged += UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged -= UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged += UpdateLastSavedModel;
             }
 
             private static void UnsubscribeFromEvents ()
@@ -311,7 +311,7 @@ private static void UnsubscribeFromEvents ()
                 LastModel = null;
                 LastFilePath = null;
 
-                UnityEditor.EditorApplication.hierarchyWindowChanged -= UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged -= UpdateLastSavedModel;
             }
 
             private static bool AutoUpdateEnabled ()