Merge pull request #472 from umasteeringgroup/MeshModifiers

Welcome now pops up at start

Author: Jaimi

UMAProject/Assets/UMA/Core/Editor/Scripts/ImportProcessor.cs

@@ -22,11 +22,11 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
                 return;
             }
 
-            
+
+            EnsureTags();
             if (!settings.Initialized)
             {
                 settings.Initialized = true;
-                EnsureTags();
                 EnsureUMAIndicators();
                 EditorUtility.SetDirty(settings);
                 AssetDatabase.SaveAssetIfDirty(settings);
@@ -37,7 +37,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
                     return;
                 }
 
-                int chosen = EditorUtility.DisplayDialogComplex("UMA " + UmaAboutWindow.umaVersion, "New UMA version imported. The global index should be rebuilt or restored (if you made a backup). (If you don't know what this means, choose 'Rebuild Index')", "Rebuild Index", "Restore from backup", "Do nothing");
+                /*int chosen = EditorUtility.DisplayDialogComplex("UMA " + UmaAboutWindow.umaVersion, "New UMA version imported. The global index should be rebuilt or restored (if you made a backup). (If you don't know what this means, choose 'Rebuild Index')", "Rebuild Index", "Restore from backup", "Do nothing");
 
                 switch (chosen)
                 {
@@ -82,7 +82,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
                     default:
                         EditorUtility.DisplayDialog("UMA " + UmaAboutWindow.umaVersion, "You can rebuild or restore the library from the Global Library window accessable from the UMA menu above.", "OK");
                         break;
-                }
+                } */
             }
         }
 

UMAProject/Assets/UMA/Core/Editor/Scripts/WelcomeToUMA.cs

@@ -12,7 +12,7 @@
 
 namespace UMA
 {
-    
+    [InitializeOnLoad]
     public class WelcomeToUMA : EditorWindow
     {
 
@@ -21,6 +21,30 @@ public static WelcomeToUMA Instance
             get; set;
         }
 
+        static WelcomeToUMA()
+        {
+            EditorApplication.delayCall += DelayedCall;
+        }
+
+        static void DelayedCall()
+        {
+            EditorApplication.update += Update;
+        }
+
+        public static void Update()
+        {
+            UMASettings settings = UMASettings.GetOrCreateSettings();
+            if (settings == null)
+            {
+                return;
+            }
+            if (settings.showWelcomeToUMA)
+            {
+                ShowWindow();
+            }
+            EditorApplication.update -= Update;
+        }
+
         [MenuItem("UMA/Welcome to UMA",false,0)]
         public static void ShowWindow()
         {
@@ -106,7 +130,7 @@ public void Error(string message)
         public bool processing = false;
         public bool initialized = false;
 
-
+        public UMASettings initialSettings;
 
 
         public void OnEnable()
@@ -164,6 +188,7 @@ public void DelayAwake()
 
             //DescriptionStyle.fixedHeight = 48;
 
+            initialSettings = UMASettings.GetOrCreateSettings();
             currentButton = 0;
             DoWelcome();
             initialized = true;
@@ -225,6 +250,26 @@ public void DrawNavigation()
             if (GUILayout.Button("Basics", GUILayout.Height(40)))
             {
                 ClearLog();
+                AddText("UMA is a runtime character creation system for Unity3D");
+                AddText("It relies on a library of indexed items to create characters");
+                AddText("The library data can be in Resources and/or in Addressable Bundles");
+                AddSeperator();
+                AddText("UMA uses a generator to create characters - UMA_GLIB");
+                AddText("This prefab needs to be in a scene for UMA to work.");
+                AddText("The generator has settings for texture merging, mesh combining, and more.");
+                AddText("To get started, use the 'Add an UMA to the current scene' button");
+                AddText("This will add an editable UMA and generator, if needed");
+                AddSeperator();
+                AddText("UMA uses recipes to define meshes, textures, and other data");
+                AddText("The following are the main base parts of an UMA:");
+                AddText("SlotData: This contains a mesh part, along with any rig parts needed.");
+                AddText("OverlayData: This contains texture parts that are colorized and combined to build textures.");
+                AddText("DNA: This is used to adjust the meshes when built, either bone modifications or blendshapes");
+                AddText("Recipes: These are used to tied slotdata and overlays together, to build skinned meshes");
+                AddText("RaceData: This defines a base recipe for the character, what wardrobe slots are available, what DNA converters are used, etc.");
+                AddSeperator();
+                AddText("We recommend to watch the videos on youtube for a deeper dive into how UMA works");
+                AddText("https://www.youtube.com/@SecretAnorak/videos");
                 // explain about the generator
                 // about the library
                 // about races
@@ -282,6 +327,20 @@ public void DrawNavigation()
                 // Links page has to be done in content window
                 currentButton = 5;
             }
+            if (initialSettings.showWelcomeToUMA)
+            {
+                if (GUILayout.Button("Turn this off!!"))
+                {
+                    currentButton = 9;
+                    ClearLog();
+                    UMASettings settings = UMASettings.GetOrCreateSettings();
+                    settings.showWelcomeToUMA = false;
+                    EditorUtility.SetDirty(settings);
+                    AddText("The welcome window will no longer show when Unity is opened");
+                    AddText("To view it at any time, you can use the 'UMA/Welcome to UMA' menu item");
+                    AddText("You can re-enable this in the UMA project settings.");
+                }
+            }
             GUILayout.EndVertical();
             GUIHelper.EndInsetArea();
         }
@@ -1482,6 +1541,8 @@ private void DoLinksPage()
             ShowLink("Wiki", "UMA Wiki", settings.WikiURL);
             ShowLink("Forum", "UMA Forum", settings.ForumURL);
             ShowLink("Asset Store", "UMA on the Asset Store", settings.AssetStoreURL);
+            ShowLink("GitHub", "UMA on GitHub", settings.GithubURL);
+            ShowLink("Youtube", "SecretAnorak's UMA Videos", settings.YoutubeURL);
         }
         #endregion
 

UMAProject/Assets/UMA/Core/Scripts/UMASettings.cs

@@ -55,6 +55,8 @@ public class UMASettings : ScriptableObject
     public string WikiURL;
     public string ForumURL;
     public string AssetStoreURL;
+    public string GithubURL;
+    public string YoutubeURL;
     [Header("Shader Folder")]
     [Tooltip("The folder where the UMA shaders are located, relative to the Assets folder. Usually UMA/Core/ShaderPackages")]
     public string ShaderFolder;
@@ -104,6 +106,12 @@ internal static void TestLoad()
         UnityEngine.Debug.Log($"LoadAssetAtPath {settings4.GetInstanceID()} loaded in " + stopwatch.ElapsedTicks + " ticks");
     }
 
+    public static UMASettings GetSettings()
+    {
+        var settings = AssetDatabase.LoadAssetAtPath<UMASettings>(customSettingsPath);
+        return settings;
+    }
+
     public static UMASettings GetOrCreateSettings()
     {
         var settings = AssetDatabase.LoadAssetAtPath<UMASettings>(customSettingsPath);

UMAProject/Assets/UMA/InternalDataStore/InGame/Resources/UMASettings.asset

@@ -57,4 +57,6 @@ MonoBehaviour:
   WikiURL: https://github.com/umasteeringgroup/UMA/wiki
   ForumURL: https://discussions.unity.com/t/uma-unity-multipurpose-avatar-on-the-asset-store-part-2/1487160
   AssetStoreURL: https://assetstore.unity.com/packages/3d/characters/uma-2-35611
+  GithubURL: https://github.com/umasteeringgroup/UMA
+  YoutubeURL: https://www.youtube.com/@SecretAnorak/videos
   ShaderFolder: UMA/Core/ShaderPackages