Merge pull request #287 from Unity-Technologies/Uni-35933-DisablingAutoUpdater

Uni 35933 disabling auto updater

Author: benoithudson

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2620,7 +2620,7 @@ static void OnContextItem (MenuCommand command)
             }
 
             /// <summary>
-            // Validate the menu item defined by the function above.
+            /// Validate the menu item defined by the function above.
             /// </summary>
             [MenuItem (MenuItemName, true, 30)]
             public static bool OnValidateMenuItem ()
@@ -2635,6 +2635,7 @@ public static void DisplayNoSelectionDialog()
                     "No GameObjects selected for export.", 
                     "Ok");
             }
+
             //
             // export mesh info from Unity
             //

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -5,6 +5,8 @@
 using UnityEditor;
 using System.Linq;
 using System;
+using FbxExporters.Editor;
+using UnityEngine.TestTools;
 
 namespace FbxExporters
 {
@@ -30,14 +32,18 @@ namespace FbxExporters
         #else
         public const string FBX_PREFAB_FILE = "/UnityFbxPrefab.dll";
         #endif
+
+        const string MenuItemName = "GameObject/Update from FBX";
+        public static bool runningUnitTest = false;
+
         public static string FindFbxPrefabAssetPath()
         {
             // Find guids that are scripts that look like FbxPrefab.
             // That catches FbxPrefabTest too, so we have to make sure.
             var allGuids = AssetDatabase.FindAssets("FbxPrefab t:MonoScript");
-            foreach(var guid in allGuids) {
+            foreach (var guid in allGuids) {
                 var path = AssetDatabase.GUIDToAssetPath(guid);
-                if (path.EndsWith (FBX_PREFAB_FILE)) {
+                if (path.EndsWith(FBX_PREFAB_FILE)) {
                     return path;
                 }
             }
@@ -65,7 +71,7 @@ public static bool MayHaveFbxPrefabToFbxAsset(string prefabPath,
             var depPaths = AssetDatabase.GetDependencies(prefabPath, recursive: false);
             bool dependsOnFbxPrefab = false;
             bool dependsOnImportedFbx = false;
-            foreach(var dep in depPaths) {
+            foreach (var dep in depPaths) {
                 if (dep == fbxPrefabScriptPath) {
                     if (dependsOnImportedFbx) { return true; }
                     dependsOnFbxPrefab = true;
@@ -79,7 +85,7 @@ public static bool MayHaveFbxPrefabToFbxAsset(string prefabPath,
             return false;
         }
 
-        static void OnPostprocessAllAssets(string [] imported, string [] deleted, string [] moved, string [] movedFrom)
+        static void OnPostprocessAllAssets(string[] imported, string[] deleted, string[] moved, string[] movedFrom)
         {
             // Do not start if Auto Updater is disabled in FBX Exporter Settings
             if (!FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled)
@@ -92,9 +98,12 @@ static void OnPostprocessAllAssets(string [] imported, string [] deleted, string
             // Did we import an fbx file at all?
             // Optimize to not allocate in the common case of 'no'
             HashSet<string> fbxImported = null;
-            foreach(var fbxModel in imported) {
+            foreach (var fbxModel in imported) {
                 if (IsFbxAsset(fbxModel)) {
-                    if (fbxImported == null) { fbxImported = new HashSet<string>(); }
+                    if (fbxImported == null)
+                    {
+                        fbxImported = new HashSet<string>();
+                    }
                     fbxImported.Add(fbxModel);
                     //Debug.Log("Tracking fbx asset " + fbxModel);
                 } else {
@@ -116,7 +125,7 @@ static void OnPostprocessAllAssets(string [] imported, string [] deleted, string
             //
             var fbxPrefabScriptPath = FindFbxPrefabAssetPath();
             var allObjectGuids = AssetDatabase.FindAssets("t:GameObject");
-            foreach(var guid in allObjectGuids) {
+            foreach (var guid in allObjectGuids) {
                 var prefabPath = AssetDatabase.GUIDToAssetPath(guid);
                 if (!IsPrefabAsset(prefabPath)) {
                     //Debug.Log("Not a prefab: " + prefabPath);
@@ -140,8 +149,8 @@ static void OnPostprocessAllAssets(string [] imported, string [] deleted, string
                     //Debug.LogWarning("FbxPrefab reimport: failed to update prefab " + prefabPath);
                     continue;
                 }
-                foreach(var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>()) {
-                    var fbxPrefabUtility = new FbxPrefabUtility (fbxPrefabComponent);
+                foreach (var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>()) {
+                    var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
                     if (!fbxPrefabUtility.WantsAutoUpdate()) {
                         //Debug.Log("Not auto-updating " + prefabPath);
                         continue;
@@ -156,8 +165,89 @@ static void OnPostprocessAllAssets(string [] imported, string [] deleted, string
                 }
             }
         }
+        /// <summary>
+        /// Add an option "Update from FBX" in the contextual GameObject menu.
+        /// </summary>
+        [MenuItem(MenuItemName, false,31)]
+        static void OnContextItem(MenuCommand command)
+        {
+            GameObject[] selection = null;
+
+            if (command == null || command.context == null)
+            {
+                // We were actually invoked from the top GameObject menu, so use the selection.
+                selection = Selection.GetFiltered<GameObject>(SelectionMode.Editable | SelectionMode.TopLevel);
+            }
+            else
+            {
+                // We were invoked from the right-click menu, so use the context of the context menu.
+                var selected = command.context as GameObject;
+                if (selected)
+                {
+                    selection = new GameObject[] { selected };
+                }
+            }
+
+            foreach (GameObject selectedObject in selection)
+            {
+                UpdateLinkedPrefab(selectedObject);
+            }
+        }
+
+        /// <summary>
+        /// Validate the menu item defined by the function above.
+        /// </summary>
+        [MenuItem(MenuItemName, true,31)]
+        public static bool OnValidateMenuItem()
+        {
+            GameObject[] selection = Selection.gameObjects;
+
+            if (selection == null || selection.Length == 0)
+            {
+                return false;
+            }
+
+            bool containsLinkedPrefab = false;
+            foreach (GameObject selectedObject in selection)
+            {
+                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(selectedObject) as GameObject;
+                if (prefab && prefab.GetComponentInChildren<FbxPrefab>())
+                {
+                    containsLinkedPrefab = true;
+                    break;
+                }
+            }
+
+            return containsLinkedPrefab;
+        }
 
 
+        static void DisplayNoSelectionDialog(string message)
+        {
+            UnityEditor.EditorUtility.DisplayDialog(
+                string.Format("{0} Warning", ModelExporter.PACKAGE_UI_NAME),
+                message,
+                "Ok");
+        }
+
+        /// <summary>
+        /// Launch the manual update of the linked prefab specified
+        /// </summary>
+        public static void UpdateLinkedPrefab(GameObject prefabInstance)
+        {
+            GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(prefabInstance) as GameObject;
+            if (!prefab)
+            {
+                return;
+            }
+
+            foreach (var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>())
+            {
+                var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
+                fbxPrefabUtility.SyncPrefab();
+            }
+        }
+
         public class FbxPrefabUtility{
 
             private FbxPrefab m_fbxPrefab;

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -215,8 +215,10 @@ public class FbxPrefabAutoUpdaterToggleTest : ExporterTestBase
         [SetUp]
         public void Init()
         {
+            // Save the initial setting for the auto updater toggle and disable it for the unit test
             isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
             FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = false;
+            FbxPrefabAutoUpdater.runningUnitTest = true;
         }
 
         [Test]
@@ -265,13 +267,58 @@ public void RemappingTest()
             Assert.IsTrue(cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh != null);
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "Sphere");
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Testing Manual update on true prefab
+            GameObject[] selection = new GameObject[] { cubePrefabInstance };
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(selection[0]);
+            Assert.IsTrue(cubePrefabInstance != null);
+            Assert.IsTrue(cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh != null);
+            Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "SphereFBX");
+            Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Testing Manual update on some random object that isn't a prefab at all, the gameobject shouldn't be modified. No error is returned
+            GameObject quad = GameObject.CreatePrimitive(PrimitiveType.Quad);
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(quad);
+            Assert.IsTrue(quad != null);
+            Assert.IsTrue(quad.GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Testing Manual update on some random prefab that doesn't have an FbxPrefab in it, the prefab shouldn't be modified. No error is returned
+            GameObject capsule = GameObject.CreatePrimitive(PrimitiveType.Capsule);
+            // Convert to linked prefab instance (auto-updating prefab)
+            string prefabPath = GetRandomPrefabAssetPath();
+            GameObject capsuleInstance = PrefabUtility.CreatePrefab(prefabPath, capsule);
+            FbxPrefabAutoUpdater.UpdateLinkedPrefab(capsuleInstance);
+            Assert.IsTrue(capsuleInstance != null);
+            Assert.IsTrue(capsuleInstance.GetComponent<MeshFilter>().sharedMesh != null);
+
+            // Check the menu returns true because sphere3 is a linked prefab
+            GameObject cylinder3 = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            GameObject sphere3 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere3.transform.SetParent(cylinder3.transform);
+            GameObject sphere3Instance = ConvertToModel.Convert(sphere3, fbxFullPath: filePath);
+            Selection.objects = new GameObject[] { sphere3Instance };
+            Assert.IsTrue(FbxPrefabAutoUpdater.OnValidateMenuItem());
+
+            // Check the contextual menu returns false because there is no linked prefab in the selection, an error is returned
+            GameObject cylinder4 = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+            GameObject sphere4 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere4.transform.SetParent(cylinder4.transform);
+            Selection.objects = new GameObject[] { cylinder4, sphere4 };
+            Assert.IsFalse(FbxPrefabAutoUpdater.OnValidateMenuItem());
+
+            // Assert is true because sphere 3 instance is a linked prefab and all the selection is taken into account
+            sphere3Instance.transform.SetParent(quad.transform);
+            Selection.objects = new GameObject[] { quad, sphere3Instance };
+            Assert.IsTrue(FbxPrefabAutoUpdater.OnValidateMenuItem());
         }
 
 
         [TearDown]
         public void stopTest()
         {
+            // Put back the initial setting for the auto-updater toggle
             FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+            FbxPrefabAutoUpdater.runningUnitTest = false;
         }
     }
 }