Modules are now applied automatically if they were setup previously and stored in DOTweenSettings

UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModulePhysics.cs

@@ -1,4 +1,4 @@
-// Author: Daniele Giardini - http://www.demigiant.com
+// Author: Daniele Giardini - http://www.demigiant.com
 // Created: 2018/07/13
 
 #if true // MODULE_MARKER

UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUtils.cs

@@ -1,4 +1,4 @@
-// Author: Daniele Giardini - http://www.demigiant.com
+// Author: Daniele Giardini - http://www.demigiant.com
 // Created: 2018/07/13
 
 using System;

_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs

@@ -45,6 +45,8 @@ namespace DG.DOTweenEditor
             );
             return AssetDeleteResult.DidNotDelete;
         }
+
+
     }
 
     public class UtilityWindowPostProcessor : AssetPostprocessor
@@ -64,6 +66,8 @@ namespace DG.DOTweenEditor
                 EditorUtils.DeleteOldDemiLibCore();
                 // Remove old legacy defines
                 DOTweenDefines.RemoveAllLegacyDefines();
+                // Reapply modules
+                DOTweenUtilityWindowModules.ApplyModulesSettings();
                 //
                 bool differentCoreVersion = EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.Id) != Application.dataPath + DOTween.Version;
                 bool differentProVersion = EditorUtils.hasPro && EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.IdPro) != Application.dataPath + EditorUtils.proVersion;

_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs

@@ -37,7 +37,7 @@ namespace DG.DOTweenEditor.UI
         // NOTE: this is also called via Reflection by UpgradeWindow
         public static void Open()
         {
-            EditorWindow window = EditorWindow.GetWindow<DOTweenUtilityWindow>(true, _Title, true);
+            DOTweenUtilityWindow window = EditorWindow.GetWindow<DOTweenUtilityWindow>(true, _Title, true);
             window.minSize = _WinSize;
             window.maxSize = _WinSize;
             window.ShowUtility();
@@ -159,7 +159,7 @@ namespace DG.DOTweenEditor.UI
             if (GUILayout.Button("<b>Setup DOTween...</b>\n(add/remove Modules)", EditorGUIUtils.btSetup)) {
 //                DOTweenDefines.Setup();
 //                _setupRequired = EditorUtils.DOTweenSetupRequired();
-                DOTweenUtilityWindowModules.Refresh(_src, true);
+                DOTweenUtilityWindowModules.ApplyModulesSettings();
                 _src.modules.showPanel = true;
                 EditorUtility.SetDirty(_src);
                 EditorUtils.DeleteLegacyNoModulesDOTweenFiles();
@@ -265,43 +265,91 @@ namespace DG.DOTweenEditor.UI
         // ===================================================================================
         // METHODS ---------------------------------------------------------------------------
 
-        void Connect(bool forceReconnect = false)
+        public static DOTweenSettings GetDOTweenSettings()
         {
-            if (_src != null && !forceReconnect) return;
+            return ConnectToSource(null, false, false);
+        }
 
+        static DOTweenSettings ConnectToSource(DOTweenSettings src, bool createIfMissing, bool fullSetup)
+        {
             LocationData assetsLD = new LocationData(EditorUtils.assetsPath + EditorUtils.pathSlash + "Resources");
             LocationData dotweenLD = new LocationData(EditorUtils.dotweenDir + "Resources");
             bool hasDemigiantDir = EditorUtils.demigiantDir != null;
             LocationData demigiantLD = hasDemigiantDir ? new LocationData(EditorUtils.demigiantDir + "Resources") : new LocationData();
 
-            if (_src == null) {
+            if (src == null) {
                 // Load eventual existing settings
-                _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
+                src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
-                if (_src == null) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
+                if (src == null) src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
-                if (_src == null && hasDemigiantDir) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
+                if (src == null && hasDemigiantDir) src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
             }
-            if (_src == null) {
+            if (src == null) {
-                // Settings don't exist. Create it in external folder
+                // Settings don't exist.
+                if (!createIfMissing) return null; // Stop here
+                // Create it in external folder
                 if (!Directory.Exists(assetsLD.dir)) AssetDatabase.CreateFolder(assetsLD.adbParentDir, "Resources");
-                _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
+                src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
             }
 
+            if (fullSetup) {
                 // Move eventual settings from previous location and setup everything correctly
-            DOTweenSettings.SettingsLocation settingsLoc = _src.storeSettingsLocation;
+                DOTweenSettings.SettingsLocation settingsLoc = src.storeSettingsLocation;
                 switch (settingsLoc) {
                 case DOTweenSettings.SettingsLocation.AssetsDirectory:
-                MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
+                    src = MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
                     break;
                 case DOTweenSettings.SettingsLocation.DOTweenDirectory:
-                MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
+                    src = MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
                     break;
                 case DOTweenSettings.SettingsLocation.DemigiantDirectory:
-                MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
+                    src = MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
                     break;
                 }
             }
 
-        void MoveSrc(LocationData[] from, LocationData to)
+            return src;
+        }
+
+        void Connect(bool forceReconnect = false)
+        {
+            if (_src != null && !forceReconnect) return;
+            _src = ConnectToSource(_src, true, true);
+
+//            LocationData assetsLD = new LocationData(EditorUtils.assetsPath + EditorUtils.pathSlash + "Resources");
+//            LocationData dotweenLD = new LocationData(EditorUtils.dotweenDir + "Resources");
+//            bool hasDemigiantDir = EditorUtils.demigiantDir != null;
+//            LocationData demigiantLD = hasDemigiantDir ? new LocationData(EditorUtils.demigiantDir + "Resources") : new LocationData();
+//
+//            if (_src == null) {
+//                // Load eventual existing settings
+//                _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
+//                if (_src == null) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
+//                if (_src == null && hasDemigiantDir) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
+//            }
+//            if (_src == null) {
+//                // Settings don't exist.
+//                if (!createSrcIfMissing) return; // Stop here
+//                // Create it in external folder
+//                if (!Directory.Exists(assetsLD.dir)) AssetDatabase.CreateFolder(assetsLD.adbParentDir, "Resources");
+//                _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
+//            }
+//
+//            // Move eventual settings from previous location and setup everything correctly
+//            DOTweenSettings.SettingsLocation settingsLoc = _src.storeSettingsLocation;
+//            switch (settingsLoc) {
+//            case DOTweenSettings.SettingsLocation.AssetsDirectory:
+//                MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
+//                break;
+//            case DOTweenSettings.SettingsLocation.DOTweenDirectory:
+//                MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
+//                break;
+//            case DOTweenSettings.SettingsLocation.DemigiantDirectory:
+//                MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
+//                break;
+//            }
+        }
+
+        static DOTweenSettings MoveSrc(LocationData[] from, LocationData to)
         {
             if (!Directory.Exists(to.dir)) AssetDatabase.CreateFolder(to.adbParentDir, "Resources");
             foreach (LocationData ld in from) {
@@ -316,7 +364,7 @@ namespace DG.DOTweenEditor.UI
                     }
                 }
             }
-            _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(to.adbFilePath, true);
+            return EditorUtils.ConnectToSourceAsset<DOTweenSettings>(to.adbFilePath, true);
         }
 
         // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs

@@ -113,6 +113,17 @@ namespace DG.DOTweenEditor.UI
 
         #endregion
 
+        #region Public Methods
+
+        // Also called via Reflection by Autorun
+        public static void ApplyModulesSettings()
+        {
+            DOTweenSettings src = DOTweenUtilityWindow.GetDOTweenSettings();
+            if (src != null) Refresh(src, true);
+        }
+
+        #endregion
+
         #region Methods
 
         public static void Refresh(DOTweenSettings src, bool applySrcSettings = false)

_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs

@@ -4,6 +4,7 @@
 // This work is subject to the terms at http://dotween.demigiant.com/license.php
 
 using System;
+using System.Reflection;
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEngine;
@@ -25,12 +26,26 @@ namespace DG.DOTweenUpgradeManager
 
         public static void OnUpdate()
         {
-            if (!UpgradeWindowIsOpen()) UpgradeWindow.Open();
+            if (!UpgradeWindowIsOpen()) {
+                ApplyModulesSettings();
+                UpgradeWindow.Open();
+            }
         }
 
         static bool UpgradeWindowIsOpen()
         {
             return Resources.FindObjectsOfTypeAll<UpgradeWindow>().Length > 0;
         }
+
+        static void ApplyModulesSettings()
+        {
+            Type doeditorT = Type.GetType("DG.DOTweenEditor.UI.DOTweenUtilityWindowModules, DOTweenEditor");
+            if (doeditorT != null) {
+                MethodInfo miOpen = doeditorT.GetMethod("ApplyModulesSettings", BindingFlags.Static | BindingFlags.Public);
+                if (miOpen != null) {
+                    miOpen.Invoke(null, null);
+                }
+            }
+        }
     }
 }

_DOTween.Assembly/DOTweenUpgradeManager/UpgradeWindow.cs

@@ -62,8 +62,12 @@ namespace DG.DOTweenUpgradeManager
             GUILayout.FlexibleSpace();
             if (GUILayout.Button("Open DOTween Utility Panel", GUILayout.Height(30))) {
                 Type doeditorT = Type.GetType("DG.DOTweenEditor.UI.DOTweenUtilityWindow, DOTweenEditor");
+                if (doeditorT != null) {
                     MethodInfo miOpen = doeditorT.GetMethod("Open", BindingFlags.Static | BindingFlags.Public);
+                    if (miOpen != null) {
                         miOpen.Invoke(null, null);
+                    }
+                }
                 EditorApplication.update -= Autorun.OnUpdate;
                 this.Close();
             }