Merge pull request #92 from Unity-Technologies/UNI-22026-project-settings-turntable-scene

Uni 22026 set desired turntable scene from project settings

Author: vkovec

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

@@ -68,6 +68,16 @@ public override void OnInspectorGUI() {
                     }
                 }
             }
+            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 +102,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 +125,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/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,16 +91,20 @@ 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);
@@ -143,37 +155,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/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 ();
         }
     }