Merge pull request #89 from Unity-Technologies/UNI-23240-autoload-during-playmode

Uni 23240 autoload during playmode

Author: benoithudson

Assets/FbxExporters/Editor/EditorRotate.cs

@@ -0,0 +1,41 @@
+// ***********************************************************************
+// 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 System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace FbxExporters.Review
+{
+    [CustomEditor (typeof(RotateModel))]
+    public class EditorRotate : UnityEditor.Editor
+    {
+        RotateModel model;
+
+        public void OnEnable ()
+        {
+            model = (RotateModel)target;
+            EditorApplication.update += Update;
+        }
+
+        public void OnDisable ()
+        {
+            EditorApplication.update -= Update;
+        }
+
+        void Update ()
+        {
+            // don't do anything in play mode
+            if (model == null || EditorApplication.isPlaying) {
+                return;
+            }
+            model.Rotate ();
+        }
+    }
+}

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -5,7 +5,8 @@ namespace FbxExporters
 {
     namespace Review
     {
-        class TurnTable
+        [UnityEditor.InitializeOnLoad]
+        public class TurnTable
         {
             const string MenuItemName = "FbxExporters/Turntable Review/Autoload Last Saved Prefab";
 
@@ -86,8 +87,11 @@ private static Object LoadModel (string fbxFileName)
                     if (turntableGO != null) {
                         modelGO.transform.parent = turntableGO.transform;
                         turntableGO.AddComponent<RotateModel> ();
+
+                        UnityEditor.Selection.objects = new GameObject[]{ turntableGO };
                     } else {
                         modelGO.AddComponent<RotateModel> ();
+                        UnityEditor.Selection.objects = new GameObject[]{ modelGO };
                     }
                 }
 
@@ -214,11 +218,10 @@ public static void LastSavedModel ()
                     lightComp.shadows = LightShadows.Soft;
                 }
 
-                // maximize game window and start playing
+                // maximize game window
                 var gameWindow = GetMainGameView();
                 if (gameWindow) {
                     gameWindow.maximized = true;
-                    UnityEditor.EditorApplication.isPlaying = true;
                 } else {
                     Debug.LogWarning ("Failed to access Game Window, please restart Unity to try again.");
                 }
@@ -262,12 +265,12 @@ private static bool AutoUpdateEnabled ()
 
             private static void UpdateLastSavedModel ()
             {
-
-                if (AutoUpdateEnabled ()) {
-                    LoadLastSavedModel ();
-                } else {
+                if (!AutoUpdateEnabled ()) {
                     UnsubscribeFromEvents ();
+                    return;
                 }
+
+                LoadLastSavedModel ();
             }
         }
     }

Assets/FbxExporters/RotateModel.cs

@@ -1,14 +1,50 @@
-using System.Collections;
+// ***********************************************************************
+// 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 System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class RotateModel : MonoBehaviour {
+namespace FbxExporters.Review
+{
+    public class RotateModel : MonoBehaviour
+    {
+
+        [Tooltip ("Rotation speed in degrees/second")]
+        [SerializeField]
+        private float speed = 10f;
+
+#if UNITY_EDITOR
+        private float timeOfLastUpdate = float.MaxValue;
+#endif
+
+        public float GetSpeed()
+        {
+            return speed;
+        }
+
+        public void Rotate()
+        {
+            float deltaTime = 0;
+#if UNITY_EDITOR
+            deltaTime = Time.realtimeSinceStartup - timeOfLastUpdate;
+            if(deltaTime <= 0){
+                deltaTime = 0.001f;
+            }
+            timeOfLastUpdate = Time.realtimeSinceStartup;
+#else
+            deltaTime = Time.deltaTime;
+#endif
+            transform.Rotate (Vector3.up, speed * deltaTime, Space.World); 
+        }
 
-    [Tooltip("Rotation speed in degrees/second")]
-    [SerializeField]
-    private float speed = 10f;
-    
-    void Update () {
-        transform.Rotate (Vector3.up, speed * Time.deltaTime, Space.World);	
+        void Update ()
+        {
+            Rotate ();
+        }
     }
 }