Merge branch 'master' into uni-22029-prefab-redux

Author: Benoit Hudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -132,7 +132,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                     }
 
                     // Instantiate the FBX file.
-                    Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
+                    Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);
                     GameObject unityGO = unityObj as GameObject;
                     if (!unityGO) {
                         continue;

Assets/FbxExporters/Editor/EditorRotate.cs

@@ -13,14 +13,14 @@
 
 namespace FbxExporters.Review
 {
-    [CustomEditor (typeof(RotateModel))]
+    [CustomEditor (typeof(FbxTurnTableBase))]
     public class EditorRotate : UnityEditor.Editor
     {
-        RotateModel model;
+        FbxTurnTableBase model;
 
         public void OnEnable ()
         {
-            model = (RotateModel)target;
+            model = (FbxTurnTableBase)target;
             EditorApplication.update += Update;
         }
 

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -65,9 +65,24 @@ public override void OnInspectorGUI() {
                         Debug.LogWarning ("Please select a location in the Assets folder");
                     } else {
                         ExportSettings.SetRelativeSavePath(relativePath);
+
+                        // Make sure focus is removed from the selectable label
+                        // otherwise it won't update
+                        GUIUtility.hotControl = 0;
+                        GUIUtility.keyboardControl = 0;
                     }
                 }
             }
+            GUILayout.EndHorizontal ();
+            GUILayout.BeginHorizontal ();
+
+            GUILayout.Label (new GUIContent (
+                "Turn Table Scene:",
+                "Scene to use for reviewing models. If none, a scene will be created on review."));
+            
+            exportSettings.turntableScene = EditorGUILayout.ObjectField (
+                exportSettings.turntableScene, typeof(SceneAsset), false
+            );
 
             GUILayout.EndHorizontal ();
             GUILayout.FlexibleSpace ();
@@ -92,6 +107,9 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         public bool mayaCompatibleNames;
         public bool centerObjects;
 
+        [SerializeField]
+        public UnityEngine.Object turntableScene;
+
         /// <summary>
         /// The path where Convert To Model will save the new fbx and prefab.
         ///
@@ -112,6 +130,21 @@ protected override void LoadDefaults()
             mayaCompatibleNames = true;
             centerObjects = true;
             convertToModelSavePath = kDefaultSavePath;
+            turntableScene = null;
+        }
+
+        public static string GetTurnTableSceneName(){
+            if (instance.turntableScene) {
+                return instance.turntableScene.name;
+            }
+            return null;
+        }
+
+        public static string GetTurnTableScenePath(){
+            if (instance.turntableScene) {
+                return AssetDatabase.GetAssetPath (instance.turntableScene);
+            }
+            return null;
         }
 
         /// <summary>

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -14,6 +14,8 @@ class Integrations
         private const string VERSION_TAG = "{Version}";
         private const string PROJECT_TAG = "{UnityProject}";
 
+        private const string FBX_EXPORT_SETTINGS_PATH = "Integrations/Autodesk/maya2017/scripts/unityFbxExportSettings.mel";
+
         public class MayaException : System.Exception {
             public MayaException() { }
             public MayaException(string message) : base(message) { }
@@ -175,8 +177,8 @@ static string AskVersion(string exePath) {
 #endif
 
         private static string MAYA_COMMANDS { get {
-            return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {4}; scriptJob -idleEvent quit;",
-                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(), (IsHeadlessInstall()?1:0));
+                return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {5}; scriptJob -idleEvent quit;",
+                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(), GetExportSettingsPath(), (IsHeadlessInstall()?1:0));
         }}
         private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
@@ -249,6 +251,16 @@ public static string GetTempSavePath()
             return System.IO.Path.Combine(Application.dataPath, FbxExporters.Review.TurnTable.TempSavePath).Replace("\\", "/");
         }
 
+        /// <summary>
+        /// Gets the path to the export settings file.
+        /// Returns an absolute path with forward slashes as path separators.
+        /// </summary>
+        /// <returns>The export settings path.</returns>
+        public static string GetExportSettingsPath()
+        {
+            return Application.dataPath + '/' + FBX_EXPORT_SETTINGS_PATH;
+        }
+
         public static string GetPackageVersion()
         {
             string result = null;

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -1,3 +1,9 @@
+// ***********************************************************************
+// Copyright (c) 2017 Unity Technologies. All rights reserved.
+//
+// Licensed under the ##LICENSENAME##.
+// See LICENSE.md file in the project root for full license information.
+// ***********************************************************************
 
 using UnityEngine;
 
@@ -10,8 +16,10 @@ public class TurnTable
         {
             const string MenuItemName = "FbxExporters/Turntable Review/Autoload Last Saved Prefab";
 
-            const string ScenesPath = "Assets";
-            const string SceneName = "FbxExporters_TurnTableReview";
+            const string DefaultScenesPath = "Assets";
+            const string DefaultSceneName = "FbxExporters_TurnTableReview";
+
+            static string SceneName = "FbxExporters_TurnTableReview";
 
             public const string TempSavePath = "_safe_to_delete";
 
@@ -48,7 +56,7 @@ private static System.IO.FileInfo GetLastSavedFile (string directoryPath, string
 
             private static string GetSceneFilePath ()
             {
-                return System.IO.Path.Combine (ScenesPath, SceneName + ".unity");
+                return System.IO.Path.Combine (DefaultScenesPath, DefaultSceneName + ".unity");
             }
 
             private static string GetLastSavedFilePath ()
@@ -83,28 +91,45 @@ private static Object LoadModel (string fbxFileName)
                 if (unityMainAsset) {
                     modelGO = UnityEditor.PrefabUtility.InstantiatePrefab (unityMainAsset) as GameObject;
 
-                    GameObject turntableGO = GameObject.Find ("TurnTable");
-                    if (turntableGO != null) {
-                        modelGO.transform.parent = turntableGO.transform;
-                        turntableGO.AddComponent<RotateModel> ();
+                    var turnTableBase = GameObject.FindObjectOfType<FbxTurnTableBase> ();
+                    GameObject turntableGO = null;
+                    if (turnTableBase != null) {
+                        turntableGO = turnTableBase.gameObject;
+                    }
 
-                        UnityEditor.Selection.objects = new GameObject[]{ turntableGO };
-                    } else {
-                        modelGO.AddComponent<RotateModel> ();
-                        UnityEditor.Selection.objects = new GameObject[]{ modelGO };
+                    if (turntableGO == null) {
+                        turntableGO = new GameObject ("TurnTableBase");
+                        turntableGO.AddComponent<FbxTurnTableBase> ();
                     }
+
+                    modelGO.transform.parent = turntableGO.transform;
+
+                    UnityEditor.Selection.objects = new GameObject[]{ turntableGO };
                 }
 
                 FrameCameraOnModel (modelGO);
 
                 return modelGO as Object;
             }
 
+            private static Bounds GetRendererBounds(GameObject modelGO)
+            {
+                var renderers = modelGO.GetComponentsInChildren<Renderer> ();
+                if (renderers.Length > 0) {
+                    var bounds = renderers [0].bounds;
+                    for (int i = 1; i < renderers.Length; i++) {
+                        bounds.Encapsulate (renderers [i].bounds);
+                    }
+                    return bounds;
+                }
+                return new Bounds ();
+            }
+
             private static void FrameCameraOnModel(GameObject modelGO)
             {
                 // Set so camera frames model
                 // Note: this code assumes the model is at 0,0,0
-                Vector3 boundsSize = modelGO.GetComponent<Renderer>().bounds.size;
+                Vector3 boundsSize = GetRendererBounds(modelGO).size;
                 float distance = Mathf.Max(boundsSize.x, boundsSize.y, boundsSize.z);
                 distance /= (2.0f * Mathf.Tan(0.5f * Camera.main.fieldOfView * Mathf.Deg2Rad));
                 Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -distance * 2.0f);
@@ -143,37 +168,47 @@ public static void LastSavedModel ()
                 System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> scenes
                       = new System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> ();
 
+                string desiredSceneName = FbxExporters.EditorTools.ExportSettings.GetTurnTableSceneName ();
+                if (string.IsNullOrEmpty (desiredSceneName)) {
+                    desiredSceneName = DefaultSceneName;
+                }
+
                 for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCount; i++) {
                     UnityEngine.SceneManagement.Scene toAdd = UnityEngine.SceneManagement.SceneManager.GetSceneAt (i);
 
                     // skip Untitled scene. 
                     // The Untitled scene cannot be unloaded, if modified, and we don't want to force the user to save it.
                     if (toAdd.name == "") continue;
 
-                    if (toAdd.name == SceneName) 
-                    {
+                    if (toAdd.name == desiredSceneName) {
                         scene = toAdd;
                         continue;
                     }
+
                     scenes.Add (toAdd);
                 }
 
                 // if turntable scene not added to list of scenes
-                if (!scene.IsValid ()) 
+                if (!scene.IsValid () || !scene.isLoaded) 
                 {
-                    // and if for some reason the turntable scene is missing create an empty scene
-                    // NOTE: we cannot use NewScene because it will force me to save the modified Untitled scene
-                    if (!System.IO.File.Exists(GetSceneFilePath ())) 
-                    {
-                        var writer = System.IO.File.CreateText (GetSceneFilePath ());
-                        writer.WriteLine ("%YAML 1.1\n%TAG !u! tag:unity3d.com,2011:");
-                        writer.Close ();
-                        UnityEditor.AssetDatabase.Refresh ();
+                    string scenePath = FbxExporters.EditorTools.ExportSettings.GetTurnTableScenePath ();
+                    if (string.IsNullOrEmpty(scenePath)) {
+                        // and if for some reason the turntable scene is missing create an empty scene
+                        // NOTE: we cannot use NewScene because it will force me to save the modified Untitled scene
+                        if (!System.IO.File.Exists (GetSceneFilePath ())) {
+                            var writer = System.IO.File.CreateText (GetSceneFilePath ());
+                            writer.WriteLine ("%YAML 1.1\n%TAG !u! tag:unity3d.com,2011:");
+                            writer.Close ();
+                            UnityEditor.AssetDatabase.Refresh ();
+                        }
+                        scenePath = GetSceneFilePath ();
                     }
 
-                    scene = UnityEditor.SceneManagement.EditorSceneManager.OpenScene (GetSceneFilePath (), UnityEditor.SceneManagement.OpenSceneMode.Additive);
+                    scene = UnityEditor.SceneManagement.EditorSceneManager.OpenScene (scenePath, UnityEditor.SceneManagement.OpenSceneMode.Additive);
                 }
 
+                SceneName = scene.name;
+
                 // save unmodified scenes (but not the untitled or turntable scene)
                 if (UnityEditor.SceneManagement.EditorSceneManager.SaveModifiedScenesIfUserWantsTo (scenes.ToArray ())) 
                 {

Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs

@@ -48,6 +48,13 @@ public void BasicTest() {
             LogNonEmptyString("package path", Editor.Integrations.GetPackagePath());
             LogNonEmptyString("package version", Editor.Integrations.GetPackageVersion());
             LogNonEmptyString("temp path", Editor.Integrations.GetTempSavePath());
+            LogNonEmptyString("export settings path", Editor.Integrations.GetExportSettingsPath ());
+
+            // test that the paths don't contain backslashes
+            Assert.IsFalse(Editor.Integrations.GetAppPath().Contains("\\"));
+            Assert.IsFalse(Editor.Integrations.GetProjectPath().Contains("\\"));
+            Assert.IsFalse(Editor.Integrations.GetTempSavePath().Contains("\\"));
+            Assert.IsFalse(Editor.Integrations.GetExportSettingsPath ().Contains("\\"));
         }
     }
 }

Assets/FbxExporters/RotateModel.cs renamed to Assets/FbxExporters/FbxTurnTableBase.cs

@@ -11,7 +11,7 @@
 
 namespace FbxExporters.Review
 {
-    public class RotateModel : MonoBehaviour
+    public class FbxTurnTableBase : MonoBehaviour
     {
 
         [Tooltip ("Rotation speed in degrees/second")]
@@ -22,11 +22,6 @@ public class RotateModel : MonoBehaviour
         private float timeOfLastUpdate = float.MaxValue;
 #endif
 
-        public float GetSpeed()
-        {
-            return speed;
-        }
-
         public void Rotate()
         {
             float deltaTime = 0;
@@ -42,8 +37,7 @@ public void Rotate()
             transform.Rotate (Vector3.up, speed * deltaTime, Space.World); 
         }
 
-        void Update ()
-        {
+        void Update () {
             Rotate ();
         }
     }

Assets/FbxExporters/README.txt

@@ -4,7 +4,7 @@ Copyright (c) 2017 Unity Technologies. All rights reserved.
 
 See LICENSE.txt file for full license information.
 
-**Version**: 0.0.9a
+**Version**: 0.0.11a
 
 Requirements
 ------------

Assets/Integrations/Autodesk/maya2017/scripts/configureUnityOneClick.mel

@@ -1,9 +1,12 @@
-global proc configureUnityOneClick(string $unityProject, string $unityApp, string $unityTempSavePath, int $headless)
+global proc configureUnityOneClick(
+    string $unityProject, string $unityApp,
+    string $unityTempSavePath, string $unityFbxExportSettings, int $headless)
 {
     // configure plugin settings
     optionVar -stringValue "UnityApp" $unityApp;
     optionVar -stringValue "UnityProject" $unityProject;
     optionVar -stringValue "UnityTempSavePath" $unityTempSavePath;
+    optionVar -stringValue "UnityFbxExportSettings" $unityFbxExportSettings;
     optionVar -intValue "UnityOneClick_Headless" $headless;
 
     // configure auto load of plugin

Assets/Integrations/Autodesk/maya2017/scripts/unityFbxExportSettings.mel

@@ -0,0 +1,25 @@
+FBXResetExport;
+
+// FBX file format
+FBXExportInAscii -v false; 
+FBXExportFileVersion -v FBX201600;
+
+// Geometry
+FBXExportSmoothMesh -v false; 
+FBXExportInstances -v true; 
+FBXExportReferencedAssetsContent -v false;
+
+// Animation
+FBXExportAnimationOnly -v false;
+
+FBXExportCameras -v false; 
+FBXExportLights -v false; 
+
+FBXExportEmbeddedTextures -v false;
+
+// Units
+FBXExportScaleFactor 1;
+FBXExportConvertUnitString cm;
+
+// Axis Conversion
+FBXExportUpAxis y;