From 57072f2165278b03147d919de0fe233051b9056d Mon Sep 17 00:00:00 2001 From: Ludovic LEROUGE - TheRed Games Date: Thu, 14 Mar 2024 10:11:46 +0100 Subject: [PATCH 1/2] feat: add quickstart panel and sorting --- package/Editor/CompositionEditor.meta | 2 +- .../CompositionEditor.cs.meta | 2 +- package/Editor/DataBuilder.meta | 2 +- .../Editor/DataBuilder/DataBuilder.cs.meta | 2 +- .../Editor/DataBuilder/DepthMap.shader.meta | 2 +- package/Editor/EditorGUI.meta | 2 +- package/Editor/EditorGUI/CustomStyle.cs.meta | 2 +- package/Editor/Fonts.meta | 2 +- package/Editor/Fonts/Poppins.meta | 2 +- package/Editor/ImageEditor.meta | 2 +- .../Editor/ImageEditor/ImageEditor.cs.meta | 2 +- .../Editor/ImageEditor/ImageEditorUI.cs.meta | 2 +- package/Editor/Images.meta | 2 +- .../Editor/Images/ImageDataClasses.cs.meta | 2 +- package/Editor/Images/Images.cs.meta | 2 +- package/Editor/Images/ImagesUI.cs.meta | 2 +- package/Editor/InpaintingEditor.meta | 2 +- .../InpaintingEditor/InpaintingEditor.cs.meta | 2 +- .../InpaintingEditorUI.cs.meta | 2 +- package/Editor/LayerEditor.meta | 2 +- .../LayerEditor/ContextMenuActions.cs.meta | 2 +- .../Editor/LayerEditor/LayerEditor.cs.meta | 2 +- .../LayerEditor/LayerEditorRightPanel.cs.meta | 2 +- package/Editor/Models.meta | 2 +- package/Editor/Models/Models.cs | 216 ++++++++++++++++-- package/Editor/Models/Models.cs.meta | 2 +- package/Editor/Models/ModelsUI.cs | 46 ++-- package/Editor/Models/ModelsUI.cs.meta | 2 +- package/Editor/PackageExport.cs.meta | 2 +- package/Editor/PixelEditor.meta | 2 +- .../Editor/PixelEditor/PixelEditor.cs.meta | 2 +- .../Editor/PixelEditor/PixelEditorUI.cs.meta | 2 +- package/Editor/Plugins.meta | 2 +- package/Editor/Plugins/APIPricing.cs.meta | 2 +- package/Editor/Plugins/ApiClient.cs.meta | 2 +- package/Editor/Plugins/CommonUtils.cs.meta | 2 +- package/Editor/Plugins/RestSharp.meta | 2 +- .../RestSharp/RestSharp.Unity.asmdef.meta | 2 +- .../Plugins/RestSharp/RestSharp.dll.meta | 2 +- .../RestSharp/RestSharpException.cs.meta | 2 +- .../RestSharp/RestSharpExtensions.cs.meta | 2 +- package/Editor/Presets.meta | 2 +- ...efault Isometric Tile Importer.preset.meta | 2 +- ...efault Rectangle Tile Importer.preset.meta | 2 +- ...enario Default Sprite Importer.preset.meta | 2 +- ...nario Default Texture Importer.preset.meta | 2 +- package/Editor/PromptImages.meta | 2 +- .../Editor/PromptImages/TileCreator.cs.meta | 2 +- package/Editor/PromptWindow.meta | 2 +- .../PromptWindow/PromptBuilderWindow.cs.meta | 2 +- .../Editor/PromptWindow/PromptWindow.cs.meta | 2 +- .../PromptWindow/PromptWindowUI.cs.meta | 2 +- package/Editor/PromptWindow/Views.meta | 2 +- .../PromptWindow/Views/ControlNetView.cs.meta | 2 +- .../Views/ImageSettingsView.cs.meta | 2 +- .../Views/NegativePromptView.cs.meta | 2 +- .../PromptWindow/Views/PromptView.cs.meta | 2 +- package/Editor/Settings.meta | 2 +- .../Editor/Settings/PluginSettings.cs.meta | 2 +- package/Editor/UpscaleEditor.meta | 2 +- .../UpscaleEditor/UpscaleEditor.cs.meta | 2 +- .../UpscaleEditor/UpscaleEditorUI.cs.meta | 2 +- package/Editor/_CustomStyle.meta | 2 +- .../Editor/_CustomStyle/CustomStyle.cs.meta | 2 +- package/Editor/_Services.meta | 2 +- .../_Services/BackgroundRemoval.cs.meta | 2 +- package/Editor/_Services/DataCache.cs.meta | 2 +- .../Editor/_Services/PromptFetcher.cs.meta | 2 +- ...om.scenarioinc.scenario.editor.asmdef.meta | 2 +- 69 files changed, 291 insertions(+), 105 deletions(-) diff --git a/package/Editor/CompositionEditor.meta b/package/Editor/CompositionEditor.meta index ed1984a..ffb14e9 100644 --- a/package/Editor/CompositionEditor.meta +++ b/package/Editor/CompositionEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 87c959bf169af034bbfe382240cd044c +guid: 9411fb18b0d306a48a6d32ef15ce66b6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/CompositionEditor/CompositionEditor.cs.meta b/package/Editor/CompositionEditor/CompositionEditor.cs.meta index 575b571..4587ea3 100644 --- a/package/Editor/CompositionEditor/CompositionEditor.cs.meta +++ b/package/Editor/CompositionEditor/CompositionEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d31f9afe4b84ec44a2223bacd81204f +guid: b34d2853de96f6d40b5f6222069ae870 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/DataBuilder.meta b/package/Editor/DataBuilder.meta index f254131..9c88b89 100644 --- a/package/Editor/DataBuilder.meta +++ b/package/Editor/DataBuilder.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 791fff2cfa736204ba136e660fc26290 +guid: c26a3fb6c21e4d5499f1fd48d67de597 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/DataBuilder/DataBuilder.cs.meta b/package/Editor/DataBuilder/DataBuilder.cs.meta index 1b4f05c..7656036 100644 --- a/package/Editor/DataBuilder/DataBuilder.cs.meta +++ b/package/Editor/DataBuilder/DataBuilder.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d89cc0a340e6ef4da957d05b1f53d12 +guid: 4d8af2e46df56d743a7c117980158cef MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/DataBuilder/DepthMap.shader.meta b/package/Editor/DataBuilder/DepthMap.shader.meta index 2532938..f63e0f2 100644 --- a/package/Editor/DataBuilder/DepthMap.shader.meta +++ b/package/Editor/DataBuilder/DepthMap.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3337dd0a7035da4ca26d42be0c4b90f +guid: 231b8570dd71dcc49958c802e6d70bd7 ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/package/Editor/EditorGUI.meta b/package/Editor/EditorGUI.meta index 926d8c0..39a50dd 100644 --- a/package/Editor/EditorGUI.meta +++ b/package/Editor/EditorGUI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 31df96e01fb0845469d33a35397bd672 +guid: a92a88a5740cf8c4682ee328af667ba5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/EditorGUI/CustomStyle.cs.meta b/package/Editor/EditorGUI/CustomStyle.cs.meta index ab99c49..455e0d6 100644 --- a/package/Editor/EditorGUI/CustomStyle.cs.meta +++ b/package/Editor/EditorGUI/CustomStyle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26cb0901163dfd245b77e0aaac38283c +guid: b32e7b23c083e3b4f91e102a7894d30e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Fonts.meta b/package/Editor/Fonts.meta index 50af6bc..4846961 100644 --- a/package/Editor/Fonts.meta +++ b/package/Editor/Fonts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 917be593f94fd864491eda13db59224b +guid: c0489ca3c9f55bc4186379d3fcc62eb8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Fonts/Poppins.meta b/package/Editor/Fonts/Poppins.meta index 62ce0fe..ac4e7c9 100644 --- a/package/Editor/Fonts/Poppins.meta +++ b/package/Editor/Fonts/Poppins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a21e5e1f079f48445bcfb0b41af6fdce +guid: a5d8798ca877be14ba9071ecc2be7e7b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/ImageEditor.meta b/package/Editor/ImageEditor.meta index b4ff26f..37649d4 100644 --- a/package/Editor/ImageEditor.meta +++ b/package/Editor/ImageEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d57b25b4b520d7c44af4cd4efc6866d5 +guid: 75a6debc86e2f9c498e032a8f9795b1b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/ImageEditor/ImageEditor.cs.meta b/package/Editor/ImageEditor/ImageEditor.cs.meta index f6e8ed9..77860ba 100644 --- a/package/Editor/ImageEditor/ImageEditor.cs.meta +++ b/package/Editor/ImageEditor/ImageEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9aea59e940fba542a235fccc883fc86 +guid: 8356bcd26b11b3b4297a5a5a3b313dec MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/ImageEditor/ImageEditorUI.cs.meta b/package/Editor/ImageEditor/ImageEditorUI.cs.meta index 18eaf49..aa0a9a2 100644 --- a/package/Editor/ImageEditor/ImageEditorUI.cs.meta +++ b/package/Editor/ImageEditor/ImageEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32f367c17519fdc4e982448c7d6593b7 +guid: d14fb732f1abd414195b969da3dba1f5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images.meta b/package/Editor/Images.meta index 688490c..6ac042c 100644 --- a/package/Editor/Images.meta +++ b/package/Editor/Images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 731d9101d27a31241890dd4399f30f50 +guid: 0d3ffca05d7cc5641bbc0cc5d81d1e76 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Images/ImageDataClasses.cs.meta b/package/Editor/Images/ImageDataClasses.cs.meta index e9c61f5..fbdbd6b 100644 --- a/package/Editor/Images/ImageDataClasses.cs.meta +++ b/package/Editor/Images/ImageDataClasses.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30d006ec26fb39a468edfbc7eb255438 +guid: 94206f6ffa4e05f4c8c82acb2bc93672 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images/Images.cs.meta b/package/Editor/Images/Images.cs.meta index 401ef41..79055f7 100644 --- a/package/Editor/Images/Images.cs.meta +++ b/package/Editor/Images/Images.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9802ed81e999ee4295c742ef1c79dfc +guid: 1922c98080ca5fc4cba2b1c2f06777f6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images/ImagesUI.cs.meta b/package/Editor/Images/ImagesUI.cs.meta index d994252..9cce78b 100644 --- a/package/Editor/Images/ImagesUI.cs.meta +++ b/package/Editor/Images/ImagesUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c81362bc9992e8746af9f5b0cbff0963 +guid: 27c6eb53b8cde7043ab8366fd590ed44 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/InpaintingEditor.meta b/package/Editor/InpaintingEditor.meta index 818bf24..e33a1b0 100644 --- a/package/Editor/InpaintingEditor.meta +++ b/package/Editor/InpaintingEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73953f6c9d655cd4ab3b3c56ea4aa781 +guid: 3126a05afa528f047838c3ac90c502b9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta b/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta index cc5ffa4..71fca43 100644 --- a/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta +++ b/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c295a2d98590b141a17778c7ed3d01d +guid: c0d0d1e945c9e034a8c8b7cdec59badc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta b/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta index a0b0b16..a68ed91 100644 --- a/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta +++ b/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26ecf587abc27c2499f109c221404104 +guid: 9fcb40f000979d249b0835d51adc4524 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor.meta b/package/Editor/LayerEditor.meta index eddfcd7..f62c3e1 100644 --- a/package/Editor/LayerEditor.meta +++ b/package/Editor/LayerEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd3382f62edf85c499f412531516124f +guid: 4d0d133bf127df3488076879e7898c5a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/LayerEditor/ContextMenuActions.cs.meta b/package/Editor/LayerEditor/ContextMenuActions.cs.meta index fd6e21c..ef5ab5c 100644 --- a/package/Editor/LayerEditor/ContextMenuActions.cs.meta +++ b/package/Editor/LayerEditor/ContextMenuActions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05aba7df292542f4688a5b7d13d00810 +guid: d453718498e22b24c9ad8bbede02f10e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor/LayerEditor.cs.meta b/package/Editor/LayerEditor/LayerEditor.cs.meta index 38f3757..8f0f0c5 100644 --- a/package/Editor/LayerEditor/LayerEditor.cs.meta +++ b/package/Editor/LayerEditor/LayerEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d49909f6e8a3eac49b56d4bd0ee29f20 +guid: d0a67ff4a1a66054d8105628bc0213a1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta b/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta index dc9d4df..dfda337 100644 --- a/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta +++ b/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1396980cd97bda64681edc51d0f1d29a +guid: c9feec80f36f1694cb1723faaca72f7b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Models.meta b/package/Editor/Models.meta index c7b6aeb..4627cb9 100644 --- a/package/Editor/Models.meta +++ b/package/Editor/Models.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 16c42135ef382264ab9ee4b75aa6e535 +guid: f7e5ed1f1c2a44445bac098af73b7c34 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Models/Models.cs b/package/Editor/Models/Models.cs index 87b15c5..8109a2a 100644 --- a/package/Editor/Models/Models.cs +++ b/package/Editor/Models/Models.cs @@ -12,12 +12,15 @@ public class Models : EditorWindow #region Public Fields + public static List modelsQuickStart = new(); public static List modelsPrivate = new(); public static List modelsPublic = new(); + public static List texturesQuickStart = new(); public static List texturesPrivate = new(); public static List texturesPublic = new(); + public static string privacyQuickStart = "quickstart"; public static string privacyPrivate = "private"; public static string privacyPublic = "public"; @@ -71,44 +74,94 @@ public static void SetTab(string privacySetting) { CurrentPrivacy = privacySetting; isProcessing = false; - if (privacySetting == privacyPrivate) + switch (privacySetting) { - PopulatePrivateModels(); - } - else - { - PopulatePublicModels(); + case string str when str.Equals(privacyQuickStart): + PopulateQuickStartModels(); + break; + + case string str when str.Equals(privacyPrivate): + PopulatePrivateModels(); + break; + + case string str when str.Equals(privacyPublic): + PopulatePublicModels(); + break; + + default: + break; } } + /// + /// Check which tab is selected, is it Private one ? + /// + /// True or False public static bool IsPrivateTab() { return CurrentPrivacy == privacyPrivate; } + /// + /// Check which tab is selected, is it Quickstart one ? + /// + /// True or False + public static bool IsQuickStartTab() + { + return CurrentPrivacy == privacyQuickStart; + } + + /// + /// Depending from the tab selected returned correct models list. + /// + /// Models list depending from the tab public static List GetModels() { - return (IsPrivateTab()) ? modelsPrivate : modelsPublic; + if (IsQuickStartTab()) + { + return modelsQuickStart; + } + else + { + return (IsPrivateTab()) ? modelsPrivate : modelsPublic; + } } + /// + /// Depending from the tab selected returned correct textures list. + /// + /// Textures list depending from the tab public static List GetTextures() { - return (IsPrivateTab()) ? texturesPrivate : texturesPublic; + if (IsQuickStartTab()) + { + return texturesQuickStart; + } + else + { + return (IsPrivateTab()) ? texturesPrivate : texturesPublic; + } } public static string CurrentPrivacy { - get => EditorPrefs.GetString("privacy", privacyPrivate); + get => EditorPrefs.GetString("privacy", privacyQuickStart); set => EditorPrefs.SetString("privacy", value); } - public static string PagniationTokenPrivate + public static string PaginationTokenQuickStart + { + get => EditorPrefs.GetString("paginationTokenQuickStart", ""); + set => EditorPrefs.SetString("paginationTokenQuickStart", value); + } + + public static string PaginationTokenPrivate { get => EditorPrefs.GetString("paginationTokenPrivate", ""); set => EditorPrefs.SetString("paginationTokenPrivate", value); } - public static string PagniationTokenPublic + public static string PaginationTokenPublic { get => EditorPrefs.GetString("paginationTokenPublic", ""); set => EditorPrefs.SetString("paginationTokenPublic", value); @@ -129,6 +182,7 @@ private static async void PopulatePublicModels() modelsPublic.Clear(); await FetchAllPublicModels(); FetchAllPublicTextures(); + modelsUI.RedrawPage(0); } @@ -137,9 +191,63 @@ private static async void PopulatePrivateModels() modelsPrivate.Clear(); await FetchAllPrivateModels(); FetchAllPrivateTextures(); + + modelsUI.RedrawPage(0); + } + + /// + /// On Selected quickstart models tab, launch a request and get all quickstart models + /// + private static async void PopulateQuickStartModels() + { + modelsQuickStart.Clear(); + //modelsPrivate.Clear(); //To remove + //modelsPublic.Clear(); // to remove + await FetchAllQuickStartModels(); + FetchAllQuickStartTextures(); modelsUI.RedrawPage(0); } + /// + /// Processing to get all quickstart textures + /// + private static void FetchAllQuickStartTextures() + { + foreach (var item in modelsQuickStart) + { + string downloadUrl = null; + + if (item.thumbnail != null && !string.IsNullOrEmpty(item.thumbnail.url)) + { + downloadUrl = item.thumbnail.url; + } + else if (item.trainingImages != null && item.trainingImages.Count > 0) + { + downloadUrl = item.trainingImages[0].downloadUrl; + } + + if (string.IsNullOrEmpty(downloadUrl)) continue; + + var texturePair = new TexturePair() + { + name = item.name, + texture = null, + }; + + texturesQuickStart.Add(texturePair); + + CommonUtils.FetchTextureFromURL(downloadUrl, texture => + { + texturePair.texture = texture; + }); + + if (window != null) { window.Repaint(); } + } + } + + /// + /// Processing to get all private textures + /// private static void FetchAllPrivateTextures() { foreach (var item in modelsPrivate) @@ -174,6 +282,9 @@ private static void FetchAllPrivateTextures() } } + /// + /// Processing to get all public textures. + /// private static void FetchAllPublicTextures() { @@ -209,19 +320,75 @@ private static void FetchAllPublicTextures() } } - private static async Task FetchAllPrivateModels() + /// + /// Processing to get all quickstart models + /// + /// + private static async Task FetchAllQuickStartModels() { if (!isProcessing) { + while (true) + { + isProcessing = true; + string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPublic}"; + + if (!string.IsNullOrEmpty(PaginationTokenQuickStart)) + { + endpoint += $"&paginationToken={PaginationTokenQuickStart}"; + } + + string response = await ApiClient.RestGetAsync(endpoint); + if (response is null) { return; } + + var modelsResponse = JsonConvert.DeserializeObject(response); + if (modelsResponse is null) { return; } + // Treat incoming models + for (int i = 0; i < modelsResponse.models.Count; i++) + { + if (modelsResponse.models[i].tags.Contains("Unity")) + { + modelsQuickStart.Add(modelsResponse.models[i]); + } + } + + if (modelsResponse.nextPaginationToken is null || + PaginationTokenQuickStart == modelsResponse.nextPaginationToken) + { + PaginationTokenQuickStart = ""; + Debug.Log("no next page to fetch."); + } + else + { + PaginationTokenQuickStart = modelsResponse.nextPaginationToken; + Debug.Log("fetching next page data..."); + continue; + } + + break; + } + + isProcessing = false; + } + } + + /// + /// Processing to get all private models. + /// + /// + private static async Task FetchAllPrivateModels() + { + if (!isProcessing) + { while (true) { isProcessing = true; string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPrivate}"; - if (!string.IsNullOrEmpty(PagniationTokenPrivate)) + if (!string.IsNullOrEmpty(PaginationTokenPrivate)) { - endpoint += $"&paginationToken={PagniationTokenPrivate}"; + endpoint += $"&paginationToken={PaginationTokenPrivate}"; } string response = await ApiClient.RestGetAsync(endpoint); @@ -233,14 +400,14 @@ private static async Task FetchAllPrivateModels() modelsPrivate.AddRange(modelsResponse.models); if (modelsResponse.nextPaginationToken is null || - PagniationTokenPrivate == modelsResponse.nextPaginationToken) + PaginationTokenPrivate == modelsResponse.nextPaginationToken) { - PagniationTokenPrivate = ""; + PaginationTokenPrivate = ""; Debug.Log("no next page to fetch."); } else { - PagniationTokenPrivate = modelsResponse.nextPaginationToken; + PaginationTokenPrivate = modelsResponse.nextPaginationToken; Debug.Log("fetching next page data..."); continue; } @@ -252,6 +419,10 @@ private static async Task FetchAllPrivateModels() } } + /// + /// Processing to get all public models + /// + /// private static async Task FetchAllPublicModels() { if (!isProcessing) @@ -261,9 +432,9 @@ private static async Task FetchAllPublicModels() isProcessing = true; string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPublic}"; - if (!string.IsNullOrEmpty(PagniationTokenPublic)) + if (!string.IsNullOrEmpty(PaginationTokenPublic)) { - endpoint += $"&paginationToken={PagniationTokenPublic}"; + endpoint += $"&paginationToken={PaginationTokenPublic}"; } string response = await ApiClient.RestGetAsync(endpoint); @@ -285,14 +456,14 @@ private static async Task FetchAllPublicModels() //* modelsPublic.AddRange(modelsResponse.models); if (modelsResponse.nextPaginationToken is null || - PagniationTokenPublic == modelsResponse.nextPaginationToken) + PaginationTokenPublic == modelsResponse.nextPaginationToken) { - PagniationTokenPublic = ""; + PaginationTokenPublic = ""; Debug.Log("no next page to fetch."); } else { - PagniationTokenPublic = modelsResponse.nextPaginationToken; + PaginationTokenPublic = modelsResponse.nextPaginationToken; Debug.Log("fetching next page data..."); continue; } @@ -318,6 +489,7 @@ public class ModelData public string id { get; set; } public string name { get; set; } public string type { get; set; } + public string[] tags { get; set; } public ClassData classData { get; set; } public string privacy { get; set; } public string status { get; set; } diff --git a/package/Editor/Models/Models.cs.meta b/package/Editor/Models/Models.cs.meta index a9166b5..db92bdb 100644 --- a/package/Editor/Models/Models.cs.meta +++ b/package/Editor/Models/Models.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66ecde249d145564e95925296dffe276 +guid: e10cffdd1b67cc24db80a1828a12f5d2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Models/ModelsUI.cs b/package/Editor/Models/ModelsUI.cs index a67edc2..5a148ca 100644 --- a/package/Editor/Models/ModelsUI.cs +++ b/package/Editor/Models/ModelsUI.cs @@ -32,8 +32,14 @@ public class ModelsUI private void SetFirstPage() { pageModels.Clear(); - - selectedTab = (Models.IsPrivateTab()) ? 0 : 1; + if (IsQuickStartTab()) + { + selectedTab = 0; + } + else + { + selectedTab = (IsPrivateTab()) ? 1 : 2; + } showPreviousButton = false; showNextButton = false; @@ -50,7 +56,7 @@ private void SetNextPage() currentPage++; - var models = Models.GetModels(); + var models = GetModels(); if (firstImageIndex + maxModelsPerPage > models.Count) { @@ -85,7 +91,7 @@ private void UpdatePage() { pageModels.Clear(); - var models = Models.GetModels(); + var models = GetModels(); for (int i = firstImageIndex; i < firstImageIndex + maxModelsPerPage; i++) { @@ -112,7 +118,7 @@ public void OnGUI(Rect position) if (drawTabs) { - string[] tabs = { "Private Models", "Public Models" }; + string[] tabs = { "Quickstart Models", "Private Models", "Public Models" }; HandleTabSelection(tabs); } @@ -153,7 +159,7 @@ private void DrawModelsGrid(Rect position) float boxWidth = (position.width - (padding * 2) * itemsPerRow) / itemsPerRow; float boxHeight = boxWidth; - var textures = Models.GetTextures(); + var textures = GetTextures(); int numRows = maxModelsPerPage / itemsPerRow; float rowPadding = 10f; @@ -168,10 +174,11 @@ private void DrawModelsGrid(Rect position) private void DrawTextureBox(float boxWidth, float boxHeight, float rowPadding, List textures) { - var models = Models.GetModels(); + var models = GetModels(); for (int i = 0; i < pageModels.Count; i++) { + int rowIndex = Mathf.FloorToInt((float)i / itemsPerRow); int colIndex = i % itemsPerRow; @@ -259,15 +266,22 @@ private void HandleTabSelection(string[] tabs) if (previousTab != selectedTab) { - if (selectedTab == 0) - { - Models.SetTab(Models.privacyPrivate); - drawTabs = false; - } - else if (selectedTab == 1) - { - Models.SetTab(Models.privacyPublic); - drawTabs = false; + switch (selectedTab) + { + case 0: + SetTab(privacyQuickStart); + drawTabs = false; + break; + + case 1: + SetTab(privacyPrivate); + drawTabs = false; + break; + + case 2: + SetTab(privacyPublic); + drawTabs = false; + break; } } } diff --git a/package/Editor/Models/ModelsUI.cs.meta b/package/Editor/Models/ModelsUI.cs.meta index eef58c1..2361ff7 100644 --- a/package/Editor/Models/ModelsUI.cs.meta +++ b/package/Editor/Models/ModelsUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a14dd46b3b144d4a851aa987e2c900c +guid: d942807f35f5ba448bec6ef87442d75a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PackageExport.cs.meta b/package/Editor/PackageExport.cs.meta index 144d2c9..27d765f 100644 --- a/package/Editor/PackageExport.cs.meta +++ b/package/Editor/PackageExport.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6df3eecd6a6008f45a8e739207b6f0e7 +guid: 4823a00b91edac5459207da42010b6ad MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PixelEditor.meta b/package/Editor/PixelEditor.meta index 23884f9..144bb66 100644 --- a/package/Editor/PixelEditor.meta +++ b/package/Editor/PixelEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15d00d5dfe0f46848b2dab495aefbf85 +guid: 1179e17a0b49f65438d2021a3c09e43b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PixelEditor/PixelEditor.cs.meta b/package/Editor/PixelEditor/PixelEditor.cs.meta index ead6a50..70273bb 100644 --- a/package/Editor/PixelEditor/PixelEditor.cs.meta +++ b/package/Editor/PixelEditor/PixelEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bfe73e1ca907a1d4991758435a524523 +guid: d289176a6fab65d43aa500ca4e65e81e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PixelEditor/PixelEditorUI.cs.meta b/package/Editor/PixelEditor/PixelEditorUI.cs.meta index 9245e6f..2a17f0d 100644 --- a/package/Editor/PixelEditor/PixelEditorUI.cs.meta +++ b/package/Editor/PixelEditor/PixelEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e208beca5ac384241952c1f0f0925904 +guid: da32c9f0aa1c75f4ba671a0af2b69b5b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins.meta b/package/Editor/Plugins.meta index 761a6a7..3fb31fd 100644 --- a/package/Editor/Plugins.meta +++ b/package/Editor/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0140cc6d8390ee4e9b724df6814f2ca +guid: 247d5fd5a8a90f54d9c93219a0c3f36d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Plugins/APIPricing.cs.meta b/package/Editor/Plugins/APIPricing.cs.meta index c472084..7e69645 100644 --- a/package/Editor/Plugins/APIPricing.cs.meta +++ b/package/Editor/Plugins/APIPricing.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ad72c40916c6634bb13bf5da2df8d1d +guid: d9f3b4ea47885c341b0e05c22fbd6d0f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/ApiClient.cs.meta b/package/Editor/Plugins/ApiClient.cs.meta index f61b6a5..d193844 100644 --- a/package/Editor/Plugins/ApiClient.cs.meta +++ b/package/Editor/Plugins/ApiClient.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8be1c3b3031c7ba4d9298cd6d551c500 +guid: d99d12577156196499611cf16c811c76 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/CommonUtils.cs.meta b/package/Editor/Plugins/CommonUtils.cs.meta index 6dec028..1476ef6 100644 --- a/package/Editor/Plugins/CommonUtils.cs.meta +++ b/package/Editor/Plugins/CommonUtils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63317eec547922049b7ba7637603cb23 +guid: 50a71c86638be86439fa3c6a8feec603 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp.meta b/package/Editor/Plugins/RestSharp.meta index 866b6cd..ffe2526 100644 --- a/package/Editor/Plugins/RestSharp.meta +++ b/package/Editor/Plugins/RestSharp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6aa59ce90702c9049ad932bc2b807edb +guid: c2a9661d9eabcf34899e9d320217bbd4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta b/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta index 80b428e..740bb99 100644 --- a/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta +++ b/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 725db8523f2e59f44a1503eaf812cc9f +guid: 4d744f7b0bc3bf64b9d38852345afa38 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/package/Editor/Plugins/RestSharp/RestSharp.dll.meta b/package/Editor/Plugins/RestSharp/RestSharp.dll.meta index f535670..584839f 100644 --- a/package/Editor/Plugins/RestSharp/RestSharp.dll.meta +++ b/package/Editor/Plugins/RestSharp/RestSharp.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ccb20fe4ef9ca4846bdb3bd5dcc6cf87 +guid: 969ce951aa8147a4da98b42db5de1f2d PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta b/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta index 901bab8..7da32f9 100644 --- a/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta +++ b/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 51588c19b8278a244b8aaca754df44de +guid: 30446d0fb1120c04b854e8adacdfb8b1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta b/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta index 5638dad..d766935 100644 --- a/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta +++ b/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c1b0d81d022f004c9bebc439c4cbd6e +guid: ce1b780ff16dc8a44bae3721e9c4c543 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Presets.meta b/package/Editor/Presets.meta index d1d202b..8a9a386 100644 --- a/package/Editor/Presets.meta +++ b/package/Editor/Presets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d04b991eaf17a643b5aa1baf51ac077 +guid: 1b615f58d3a09374790c6457689eb3f5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta b/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta index ae2ff77..6b0c63f 100644 --- a/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d537ab5bf7649b44973f061c34b6151 +guid: 4493bad2937196a47a6d37f3805a670e NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta b/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta index cd54ed8..5550e8a 100644 --- a/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 442b6b94501543a41ba9305a48c84b94 +guid: f8a78a18bcff1d3449f350b0ae5fac1f NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta b/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta index a0e3757..b2a4292 100644 --- a/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d87ceacdb68f56745951dadf104120b1 +guid: 71113908ff5270d4c8b037920b68b71a NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Texture Importer.preset.meta b/package/Editor/Presets/Scenario Default Texture Importer.preset.meta index aac1e6a..9ca1208 100644 --- a/package/Editor/Presets/Scenario Default Texture Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Texture Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28269680c775243409a2d470907383f9 +guid: a1bc1fcfad74ab14fa22e8dceed27e70 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/PromptImages.meta b/package/Editor/PromptImages.meta index 79c97ed..4af3d0f 100644 --- a/package/Editor/PromptImages.meta +++ b/package/Editor/PromptImages.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7fa2b4ce6afc8c542a013acfb8ec2761 +guid: d6f78f440e7fc2045be5b29765f8e368 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptImages/TileCreator.cs.meta b/package/Editor/PromptImages/TileCreator.cs.meta index 8f2f9d3..817cd90 100644 --- a/package/Editor/PromptImages/TileCreator.cs.meta +++ b/package/Editor/PromptImages/TileCreator.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb2f7d303405215419ed77ec67749b71 +guid: 54219038a8ded4c46a57ae01e9baeffc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow.meta b/package/Editor/PromptWindow.meta index b9818b0..b0948ea 100644 --- a/package/Editor/PromptWindow.meta +++ b/package/Editor/PromptWindow.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 184024eb87dbfb249ab9127cf9c8e9ba +guid: 12ba62b87f11b9648b7bf902f8d38639 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta b/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta index 37c3db9..44db53d 100644 --- a/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta +++ b/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 964d325ab90ceec47a66df76e2a94623 +guid: 3f6790c27cf3dbf4394b38244809e74e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/PromptWindow.cs.meta b/package/Editor/PromptWindow/PromptWindow.cs.meta index 69c4a3d..a99b6ad 100644 --- a/package/Editor/PromptWindow/PromptWindow.cs.meta +++ b/package/Editor/PromptWindow/PromptWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8541e921ad7547b468cc952d46b7058e +guid: 192e8eec117b12e49a2f180240e305de MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/PromptWindowUI.cs.meta b/package/Editor/PromptWindow/PromptWindowUI.cs.meta index c7eddb6..4f641a7 100644 --- a/package/Editor/PromptWindow/PromptWindowUI.cs.meta +++ b/package/Editor/PromptWindow/PromptWindowUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bd550df13b8cb5d42ab7f5368ce7f821 +guid: 6213d5826b5d75b4aab981f649e48fc0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views.meta b/package/Editor/PromptWindow/Views.meta index e455da6..b241360 100644 --- a/package/Editor/PromptWindow/Views.meta +++ b/package/Editor/PromptWindow/Views.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e01bb6a4bc116f94495576dc31b867ca +guid: 37bcbcb2fcac62847ac5309b760b379e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptWindow/Views/ControlNetView.cs.meta b/package/Editor/PromptWindow/Views/ControlNetView.cs.meta index 3c192d1..0d582c0 100644 --- a/package/Editor/PromptWindow/Views/ControlNetView.cs.meta +++ b/package/Editor/PromptWindow/Views/ControlNetView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a03791737b5dec644b59d93cacb6f342 +guid: 1f3e11f083c420f45a0312150fd661fa MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta b/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta index cb1a52c..dfddb59 100644 --- a/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta +++ b/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57b631278e279f9459fdf6b0f1634488 +guid: 024b5cc1034e3ad4b8cc93635199e18b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta b/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta index a9ff7b8..3e87eeb 100644 --- a/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta +++ b/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fdf6ce4a5c9f6bf47a4162e0f0aef589 +guid: a721fab7fd422004088ddec95bcb1b3a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/PromptView.cs.meta b/package/Editor/PromptWindow/Views/PromptView.cs.meta index ecc8e2a..a51efda 100644 --- a/package/Editor/PromptWindow/Views/PromptView.cs.meta +++ b/package/Editor/PromptWindow/Views/PromptView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fcd2beb42637a51488dd8ae3afe6fa59 +guid: 7a55effae4d854340bb6853bc95f5336 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Settings.meta b/package/Editor/Settings.meta index 83a9e45..13a8240 100644 --- a/package/Editor/Settings.meta +++ b/package/Editor/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08d4aab7cf61e054fba2b37e5c318c83 +guid: fe7aafe65ca278345a2bc198a1ad701a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Settings/PluginSettings.cs.meta b/package/Editor/Settings/PluginSettings.cs.meta index e8aa24d..74bb636 100644 --- a/package/Editor/Settings/PluginSettings.cs.meta +++ b/package/Editor/Settings/PluginSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 683150de44018cf4f8372d1d292895d5 +guid: 0d90bbdf27f96e9429c5032c8102078f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/UpscaleEditor.meta b/package/Editor/UpscaleEditor.meta index a0b5151..a09522e 100644 --- a/package/Editor/UpscaleEditor.meta +++ b/package/Editor/UpscaleEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb9ad943319abed4cae6a00e765d0abf +guid: b5e134129dfd1c74ea2646aafc149089 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta b/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta index 225aa30..7dd2009 100644 --- a/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta +++ b/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 777e350a9acb1024288f1a84a20e29b2 +guid: c1cc41373feb8944180103519e9975fd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta b/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta index cb6a9da..33e291a 100644 --- a/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta +++ b/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38689eeb80d189440bbaed19bec1d3ae +guid: 3f71826e5e977774895ae17811eed211 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_CustomStyle.meta b/package/Editor/_CustomStyle.meta index a7a22c5..5435f2b 100644 --- a/package/Editor/_CustomStyle.meta +++ b/package/Editor/_CustomStyle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7922073dddaeda548b60eb43a48a6be7 +guid: 56e01032c6331b1479e8898c56848470 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/_CustomStyle/CustomStyle.cs.meta b/package/Editor/_CustomStyle/CustomStyle.cs.meta index decb2cd..f41e52c 100644 --- a/package/Editor/_CustomStyle/CustomStyle.cs.meta +++ b/package/Editor/_CustomStyle/CustomStyle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ead7df0857ce09440a69a25f5ddfc2c7 +guid: 03a2dc1c3feaf5347b8c190fe8b8e0e4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services.meta b/package/Editor/_Services.meta index fd01512..57ea352 100644 --- a/package/Editor/_Services.meta +++ b/package/Editor/_Services.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11c98b0679094754d9a67f2022edf8b4 +guid: 293bf04c307f92f488f437614bd5df5b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/_Services/BackgroundRemoval.cs.meta b/package/Editor/_Services/BackgroundRemoval.cs.meta index 1970591..0946fc9 100644 --- a/package/Editor/_Services/BackgroundRemoval.cs.meta +++ b/package/Editor/_Services/BackgroundRemoval.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6fcd620db14ab534aa193376881b8755 +guid: 0800a5f2fd93a674697fabec7234eaf5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services/DataCache.cs.meta b/package/Editor/_Services/DataCache.cs.meta index 3b63030..4051ccc 100644 --- a/package/Editor/_Services/DataCache.cs.meta +++ b/package/Editor/_Services/DataCache.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc24d3aa02f31114388d95821da0004e +guid: a960452346f0c434295599f62ac8f4a4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services/PromptFetcher.cs.meta b/package/Editor/_Services/PromptFetcher.cs.meta index 51aae3d..6bdf703 100644 --- a/package/Editor/_Services/PromptFetcher.cs.meta +++ b/package/Editor/_Services/PromptFetcher.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 461b26fbbcb64be4eafc21d72f6bc311 +guid: 2bb037c05e7d14b45beec82a36a5e135 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta b/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta index 69fe22d..01e085f 100644 --- a/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta +++ b/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f6a2e22ca0a59c7409203ee37636196c +guid: 4b9a602bf6182884a8d314f82606eb82 AssemblyDefinitionImporter: externalObjects: {} userData: From ffcfa526add0e8f570355e95148bf9b3414de4a6 Mon Sep 17 00:00:00 2001 From: Ludovic LEROUGE - TheRed Games Date: Thu, 14 Mar 2024 10:35:38 +0100 Subject: [PATCH 2/2] fix: revert "feat: add quickstart panel and sorting" This reverts commit 57072f2165278b03147d919de0fe233051b9056d. --- package/Editor/CompositionEditor.meta | 2 +- .../CompositionEditor.cs.meta | 2 +- package/Editor/DataBuilder.meta | 2 +- .../Editor/DataBuilder/DataBuilder.cs.meta | 2 +- .../Editor/DataBuilder/DepthMap.shader.meta | 2 +- package/Editor/EditorGUI.meta | 2 +- package/Editor/EditorGUI/CustomStyle.cs.meta | 2 +- package/Editor/Fonts.meta | 2 +- package/Editor/Fonts/Poppins.meta | 2 +- package/Editor/ImageEditor.meta | 2 +- .../Editor/ImageEditor/ImageEditor.cs.meta | 2 +- .../Editor/ImageEditor/ImageEditorUI.cs.meta | 2 +- package/Editor/Images.meta | 2 +- .../Editor/Images/ImageDataClasses.cs.meta | 2 +- package/Editor/Images/Images.cs.meta | 2 +- package/Editor/Images/ImagesUI.cs.meta | 2 +- package/Editor/InpaintingEditor.meta | 2 +- .../InpaintingEditor/InpaintingEditor.cs.meta | 2 +- .../InpaintingEditorUI.cs.meta | 2 +- package/Editor/LayerEditor.meta | 2 +- .../LayerEditor/ContextMenuActions.cs.meta | 2 +- .../Editor/LayerEditor/LayerEditor.cs.meta | 2 +- .../LayerEditor/LayerEditorRightPanel.cs.meta | 2 +- package/Editor/Models.meta | 2 +- package/Editor/Models/Models.cs | 216 ++---------------- package/Editor/Models/Models.cs.meta | 2 +- package/Editor/Models/ModelsUI.cs | 46 ++-- package/Editor/Models/ModelsUI.cs.meta | 2 +- package/Editor/PackageExport.cs.meta | 2 +- package/Editor/PixelEditor.meta | 2 +- .../Editor/PixelEditor/PixelEditor.cs.meta | 2 +- .../Editor/PixelEditor/PixelEditorUI.cs.meta | 2 +- package/Editor/Plugins.meta | 2 +- package/Editor/Plugins/APIPricing.cs.meta | 2 +- package/Editor/Plugins/ApiClient.cs.meta | 2 +- package/Editor/Plugins/CommonUtils.cs.meta | 2 +- package/Editor/Plugins/RestSharp.meta | 2 +- .../RestSharp/RestSharp.Unity.asmdef.meta | 2 +- .../Plugins/RestSharp/RestSharp.dll.meta | 2 +- .../RestSharp/RestSharpException.cs.meta | 2 +- .../RestSharp/RestSharpExtensions.cs.meta | 2 +- package/Editor/Presets.meta | 2 +- ...efault Isometric Tile Importer.preset.meta | 2 +- ...efault Rectangle Tile Importer.preset.meta | 2 +- ...enario Default Sprite Importer.preset.meta | 2 +- ...nario Default Texture Importer.preset.meta | 2 +- package/Editor/PromptImages.meta | 2 +- .../Editor/PromptImages/TileCreator.cs.meta | 2 +- package/Editor/PromptWindow.meta | 2 +- .../PromptWindow/PromptBuilderWindow.cs.meta | 2 +- .../Editor/PromptWindow/PromptWindow.cs.meta | 2 +- .../PromptWindow/PromptWindowUI.cs.meta | 2 +- package/Editor/PromptWindow/Views.meta | 2 +- .../PromptWindow/Views/ControlNetView.cs.meta | 2 +- .../Views/ImageSettingsView.cs.meta | 2 +- .../Views/NegativePromptView.cs.meta | 2 +- .../PromptWindow/Views/PromptView.cs.meta | 2 +- package/Editor/Settings.meta | 2 +- .../Editor/Settings/PluginSettings.cs.meta | 2 +- package/Editor/UpscaleEditor.meta | 2 +- .../UpscaleEditor/UpscaleEditor.cs.meta | 2 +- .../UpscaleEditor/UpscaleEditorUI.cs.meta | 2 +- package/Editor/_CustomStyle.meta | 2 +- .../Editor/_CustomStyle/CustomStyle.cs.meta | 2 +- package/Editor/_Services.meta | 2 +- .../_Services/BackgroundRemoval.cs.meta | 2 +- package/Editor/_Services/DataCache.cs.meta | 2 +- .../Editor/_Services/PromptFetcher.cs.meta | 2 +- ...om.scenarioinc.scenario.editor.asmdef.meta | 2 +- 69 files changed, 105 insertions(+), 291 deletions(-) diff --git a/package/Editor/CompositionEditor.meta b/package/Editor/CompositionEditor.meta index ffb14e9..ed1984a 100644 --- a/package/Editor/CompositionEditor.meta +++ b/package/Editor/CompositionEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9411fb18b0d306a48a6d32ef15ce66b6 +guid: 87c959bf169af034bbfe382240cd044c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/CompositionEditor/CompositionEditor.cs.meta b/package/Editor/CompositionEditor/CompositionEditor.cs.meta index 4587ea3..575b571 100644 --- a/package/Editor/CompositionEditor/CompositionEditor.cs.meta +++ b/package/Editor/CompositionEditor/CompositionEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b34d2853de96f6d40b5f6222069ae870 +guid: 3d31f9afe4b84ec44a2223bacd81204f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/DataBuilder.meta b/package/Editor/DataBuilder.meta index 9c88b89..f254131 100644 --- a/package/Editor/DataBuilder.meta +++ b/package/Editor/DataBuilder.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c26a3fb6c21e4d5499f1fd48d67de597 +guid: 791fff2cfa736204ba136e660fc26290 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/DataBuilder/DataBuilder.cs.meta b/package/Editor/DataBuilder/DataBuilder.cs.meta index 7656036..1b4f05c 100644 --- a/package/Editor/DataBuilder/DataBuilder.cs.meta +++ b/package/Editor/DataBuilder/DataBuilder.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d8af2e46df56d743a7c117980158cef +guid: 6d89cc0a340e6ef4da957d05b1f53d12 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/DataBuilder/DepthMap.shader.meta b/package/Editor/DataBuilder/DepthMap.shader.meta index f63e0f2..2532938 100644 --- a/package/Editor/DataBuilder/DepthMap.shader.meta +++ b/package/Editor/DataBuilder/DepthMap.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 231b8570dd71dcc49958c802e6d70bd7 +guid: b3337dd0a7035da4ca26d42be0c4b90f ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/package/Editor/EditorGUI.meta b/package/Editor/EditorGUI.meta index 39a50dd..926d8c0 100644 --- a/package/Editor/EditorGUI.meta +++ b/package/Editor/EditorGUI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a92a88a5740cf8c4682ee328af667ba5 +guid: 31df96e01fb0845469d33a35397bd672 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/EditorGUI/CustomStyle.cs.meta b/package/Editor/EditorGUI/CustomStyle.cs.meta index 455e0d6..ab99c49 100644 --- a/package/Editor/EditorGUI/CustomStyle.cs.meta +++ b/package/Editor/EditorGUI/CustomStyle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b32e7b23c083e3b4f91e102a7894d30e +guid: 26cb0901163dfd245b77e0aaac38283c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Fonts.meta b/package/Editor/Fonts.meta index 4846961..50af6bc 100644 --- a/package/Editor/Fonts.meta +++ b/package/Editor/Fonts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0489ca3c9f55bc4186379d3fcc62eb8 +guid: 917be593f94fd864491eda13db59224b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Fonts/Poppins.meta b/package/Editor/Fonts/Poppins.meta index ac4e7c9..62ce0fe 100644 --- a/package/Editor/Fonts/Poppins.meta +++ b/package/Editor/Fonts/Poppins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5d8798ca877be14ba9071ecc2be7e7b +guid: a21e5e1f079f48445bcfb0b41af6fdce folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/ImageEditor.meta b/package/Editor/ImageEditor.meta index 37649d4..b4ff26f 100644 --- a/package/Editor/ImageEditor.meta +++ b/package/Editor/ImageEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75a6debc86e2f9c498e032a8f9795b1b +guid: d57b25b4b520d7c44af4cd4efc6866d5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/ImageEditor/ImageEditor.cs.meta b/package/Editor/ImageEditor/ImageEditor.cs.meta index 77860ba..f6e8ed9 100644 --- a/package/Editor/ImageEditor/ImageEditor.cs.meta +++ b/package/Editor/ImageEditor/ImageEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8356bcd26b11b3b4297a5a5a3b313dec +guid: e9aea59e940fba542a235fccc883fc86 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/ImageEditor/ImageEditorUI.cs.meta b/package/Editor/ImageEditor/ImageEditorUI.cs.meta index aa0a9a2..18eaf49 100644 --- a/package/Editor/ImageEditor/ImageEditorUI.cs.meta +++ b/package/Editor/ImageEditor/ImageEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d14fb732f1abd414195b969da3dba1f5 +guid: 32f367c17519fdc4e982448c7d6593b7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images.meta b/package/Editor/Images.meta index 6ac042c..688490c 100644 --- a/package/Editor/Images.meta +++ b/package/Editor/Images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d3ffca05d7cc5641bbc0cc5d81d1e76 +guid: 731d9101d27a31241890dd4399f30f50 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Images/ImageDataClasses.cs.meta b/package/Editor/Images/ImageDataClasses.cs.meta index fbdbd6b..e9c61f5 100644 --- a/package/Editor/Images/ImageDataClasses.cs.meta +++ b/package/Editor/Images/ImageDataClasses.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94206f6ffa4e05f4c8c82acb2bc93672 +guid: 30d006ec26fb39a468edfbc7eb255438 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images/Images.cs.meta b/package/Editor/Images/Images.cs.meta index 79055f7..401ef41 100644 --- a/package/Editor/Images/Images.cs.meta +++ b/package/Editor/Images/Images.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1922c98080ca5fc4cba2b1c2f06777f6 +guid: c9802ed81e999ee4295c742ef1c79dfc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Images/ImagesUI.cs.meta b/package/Editor/Images/ImagesUI.cs.meta index 9cce78b..d994252 100644 --- a/package/Editor/Images/ImagesUI.cs.meta +++ b/package/Editor/Images/ImagesUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 27c6eb53b8cde7043ab8366fd590ed44 +guid: c81362bc9992e8746af9f5b0cbff0963 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/InpaintingEditor.meta b/package/Editor/InpaintingEditor.meta index e33a1b0..818bf24 100644 --- a/package/Editor/InpaintingEditor.meta +++ b/package/Editor/InpaintingEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3126a05afa528f047838c3ac90c502b9 +guid: 73953f6c9d655cd4ab3b3c56ea4aa781 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta b/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta index 71fca43..cc5ffa4 100644 --- a/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta +++ b/package/Editor/InpaintingEditor/InpaintingEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0d0d1e945c9e034a8c8b7cdec59badc +guid: 7c295a2d98590b141a17778c7ed3d01d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta b/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta index a68ed91..a0b0b16 100644 --- a/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta +++ b/package/Editor/InpaintingEditor/InpaintingEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fcb40f000979d249b0835d51adc4524 +guid: 26ecf587abc27c2499f109c221404104 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor.meta b/package/Editor/LayerEditor.meta index f62c3e1..eddfcd7 100644 --- a/package/Editor/LayerEditor.meta +++ b/package/Editor/LayerEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d0d133bf127df3488076879e7898c5a +guid: cd3382f62edf85c499f412531516124f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/LayerEditor/ContextMenuActions.cs.meta b/package/Editor/LayerEditor/ContextMenuActions.cs.meta index ef5ab5c..fd6e21c 100644 --- a/package/Editor/LayerEditor/ContextMenuActions.cs.meta +++ b/package/Editor/LayerEditor/ContextMenuActions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d453718498e22b24c9ad8bbede02f10e +guid: 05aba7df292542f4688a5b7d13d00810 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor/LayerEditor.cs.meta b/package/Editor/LayerEditor/LayerEditor.cs.meta index 8f0f0c5..38f3757 100644 --- a/package/Editor/LayerEditor/LayerEditor.cs.meta +++ b/package/Editor/LayerEditor/LayerEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0a67ff4a1a66054d8105628bc0213a1 +guid: d49909f6e8a3eac49b56d4bd0ee29f20 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta b/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta index dfda337..dc9d4df 100644 --- a/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta +++ b/package/Editor/LayerEditor/LayerEditorRightPanel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9feec80f36f1694cb1723faaca72f7b +guid: 1396980cd97bda64681edc51d0f1d29a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Models.meta b/package/Editor/Models.meta index 4627cb9..c7b6aeb 100644 --- a/package/Editor/Models.meta +++ b/package/Editor/Models.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7e5ed1f1c2a44445bac098af73b7c34 +guid: 16c42135ef382264ab9ee4b75aa6e535 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Models/Models.cs b/package/Editor/Models/Models.cs index 8109a2a..87b15c5 100644 --- a/package/Editor/Models/Models.cs +++ b/package/Editor/Models/Models.cs @@ -12,15 +12,12 @@ public class Models : EditorWindow #region Public Fields - public static List modelsQuickStart = new(); public static List modelsPrivate = new(); public static List modelsPublic = new(); - public static List texturesQuickStart = new(); public static List texturesPrivate = new(); public static List texturesPublic = new(); - public static string privacyQuickStart = "quickstart"; public static string privacyPrivate = "private"; public static string privacyPublic = "public"; @@ -74,94 +71,44 @@ public static void SetTab(string privacySetting) { CurrentPrivacy = privacySetting; isProcessing = false; - switch (privacySetting) + if (privacySetting == privacyPrivate) { - case string str when str.Equals(privacyQuickStart): - PopulateQuickStartModels(); - break; - - case string str when str.Equals(privacyPrivate): - PopulatePrivateModels(); - break; - - case string str when str.Equals(privacyPublic): - PopulatePublicModels(); - break; - - default: - break; + PopulatePrivateModels(); + } + else + { + PopulatePublicModels(); } } - /// - /// Check which tab is selected, is it Private one ? - /// - /// True or False public static bool IsPrivateTab() { return CurrentPrivacy == privacyPrivate; } - /// - /// Check which tab is selected, is it Quickstart one ? - /// - /// True or False - public static bool IsQuickStartTab() - { - return CurrentPrivacy == privacyQuickStart; - } - - /// - /// Depending from the tab selected returned correct models list. - /// - /// Models list depending from the tab public static List GetModels() { - if (IsQuickStartTab()) - { - return modelsQuickStart; - } - else - { - return (IsPrivateTab()) ? modelsPrivate : modelsPublic; - } + return (IsPrivateTab()) ? modelsPrivate : modelsPublic; } - /// - /// Depending from the tab selected returned correct textures list. - /// - /// Textures list depending from the tab public static List GetTextures() { - if (IsQuickStartTab()) - { - return texturesQuickStart; - } - else - { - return (IsPrivateTab()) ? texturesPrivate : texturesPublic; - } + return (IsPrivateTab()) ? texturesPrivate : texturesPublic; } public static string CurrentPrivacy { - get => EditorPrefs.GetString("privacy", privacyQuickStart); + get => EditorPrefs.GetString("privacy", privacyPrivate); set => EditorPrefs.SetString("privacy", value); } - public static string PaginationTokenQuickStart - { - get => EditorPrefs.GetString("paginationTokenQuickStart", ""); - set => EditorPrefs.SetString("paginationTokenQuickStart", value); - } - - public static string PaginationTokenPrivate + public static string PagniationTokenPrivate { get => EditorPrefs.GetString("paginationTokenPrivate", ""); set => EditorPrefs.SetString("paginationTokenPrivate", value); } - public static string PaginationTokenPublic + public static string PagniationTokenPublic { get => EditorPrefs.GetString("paginationTokenPublic", ""); set => EditorPrefs.SetString("paginationTokenPublic", value); @@ -182,7 +129,6 @@ private static async void PopulatePublicModels() modelsPublic.Clear(); await FetchAllPublicModels(); FetchAllPublicTextures(); - modelsUI.RedrawPage(0); } @@ -191,63 +137,9 @@ private static async void PopulatePrivateModels() modelsPrivate.Clear(); await FetchAllPrivateModels(); FetchAllPrivateTextures(); - - modelsUI.RedrawPage(0); - } - - /// - /// On Selected quickstart models tab, launch a request and get all quickstart models - /// - private static async void PopulateQuickStartModels() - { - modelsQuickStart.Clear(); - //modelsPrivate.Clear(); //To remove - //modelsPublic.Clear(); // to remove - await FetchAllQuickStartModels(); - FetchAllQuickStartTextures(); modelsUI.RedrawPage(0); } - /// - /// Processing to get all quickstart textures - /// - private static void FetchAllQuickStartTextures() - { - foreach (var item in modelsQuickStart) - { - string downloadUrl = null; - - if (item.thumbnail != null && !string.IsNullOrEmpty(item.thumbnail.url)) - { - downloadUrl = item.thumbnail.url; - } - else if (item.trainingImages != null && item.trainingImages.Count > 0) - { - downloadUrl = item.trainingImages[0].downloadUrl; - } - - if (string.IsNullOrEmpty(downloadUrl)) continue; - - var texturePair = new TexturePair() - { - name = item.name, - texture = null, - }; - - texturesQuickStart.Add(texturePair); - - CommonUtils.FetchTextureFromURL(downloadUrl, texture => - { - texturePair.texture = texture; - }); - - if (window != null) { window.Repaint(); } - } - } - - /// - /// Processing to get all private textures - /// private static void FetchAllPrivateTextures() { foreach (var item in modelsPrivate) @@ -282,9 +174,6 @@ private static void FetchAllPrivateTextures() } } - /// - /// Processing to get all public textures. - /// private static void FetchAllPublicTextures() { @@ -320,75 +209,19 @@ private static void FetchAllPublicTextures() } } - /// - /// Processing to get all quickstart models - /// - /// - private static async Task FetchAllQuickStartModels() - { - if (!isProcessing) - { - while (true) - { - isProcessing = true; - string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPublic}"; - - if (!string.IsNullOrEmpty(PaginationTokenQuickStart)) - { - endpoint += $"&paginationToken={PaginationTokenQuickStart}"; - } - - string response = await ApiClient.RestGetAsync(endpoint); - if (response is null) { return; } - - var modelsResponse = JsonConvert.DeserializeObject(response); - if (modelsResponse is null) { return; } - - // Treat incoming models - for (int i = 0; i < modelsResponse.models.Count; i++) - { - if (modelsResponse.models[i].tags.Contains("Unity")) - { - modelsQuickStart.Add(modelsResponse.models[i]); - } - } - - if (modelsResponse.nextPaginationToken is null || - PaginationTokenQuickStart == modelsResponse.nextPaginationToken) - { - PaginationTokenQuickStart = ""; - Debug.Log("no next page to fetch."); - } - else - { - PaginationTokenQuickStart = modelsResponse.nextPaginationToken; - Debug.Log("fetching next page data..."); - continue; - } - - break; - } - - isProcessing = false; - } - } - - /// - /// Processing to get all private models. - /// - /// private static async Task FetchAllPrivateModels() { if (!isProcessing) { + while (true) { isProcessing = true; string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPrivate}"; - if (!string.IsNullOrEmpty(PaginationTokenPrivate)) + if (!string.IsNullOrEmpty(PagniationTokenPrivate)) { - endpoint += $"&paginationToken={PaginationTokenPrivate}"; + endpoint += $"&paginationToken={PagniationTokenPrivate}"; } string response = await ApiClient.RestGetAsync(endpoint); @@ -400,14 +233,14 @@ private static async Task FetchAllPrivateModels() modelsPrivate.AddRange(modelsResponse.models); if (modelsResponse.nextPaginationToken is null || - PaginationTokenPrivate == modelsResponse.nextPaginationToken) + PagniationTokenPrivate == modelsResponse.nextPaginationToken) { - PaginationTokenPrivate = ""; + PagniationTokenPrivate = ""; Debug.Log("no next page to fetch."); } else { - PaginationTokenPrivate = modelsResponse.nextPaginationToken; + PagniationTokenPrivate = modelsResponse.nextPaginationToken; Debug.Log("fetching next page data..."); continue; } @@ -419,10 +252,6 @@ private static async Task FetchAllPrivateModels() } } - /// - /// Processing to get all public models - /// - /// private static async Task FetchAllPublicModels() { if (!isProcessing) @@ -432,9 +261,9 @@ private static async Task FetchAllPublicModels() isProcessing = true; string endpoint = $"models?pageSize=15&status=trained&privacy={privacyPublic}"; - if (!string.IsNullOrEmpty(PaginationTokenPublic)) + if (!string.IsNullOrEmpty(PagniationTokenPublic)) { - endpoint += $"&paginationToken={PaginationTokenPublic}"; + endpoint += $"&paginationToken={PagniationTokenPublic}"; } string response = await ApiClient.RestGetAsync(endpoint); @@ -456,14 +285,14 @@ private static async Task FetchAllPublicModels() //* modelsPublic.AddRange(modelsResponse.models); if (modelsResponse.nextPaginationToken is null || - PaginationTokenPublic == modelsResponse.nextPaginationToken) + PagniationTokenPublic == modelsResponse.nextPaginationToken) { - PaginationTokenPublic = ""; + PagniationTokenPublic = ""; Debug.Log("no next page to fetch."); } else { - PaginationTokenPublic = modelsResponse.nextPaginationToken; + PagniationTokenPublic = modelsResponse.nextPaginationToken; Debug.Log("fetching next page data..."); continue; } @@ -489,7 +318,6 @@ public class ModelData public string id { get; set; } public string name { get; set; } public string type { get; set; } - public string[] tags { get; set; } public ClassData classData { get; set; } public string privacy { get; set; } public string status { get; set; } diff --git a/package/Editor/Models/Models.cs.meta b/package/Editor/Models/Models.cs.meta index db92bdb..a9166b5 100644 --- a/package/Editor/Models/Models.cs.meta +++ b/package/Editor/Models/Models.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e10cffdd1b67cc24db80a1828a12f5d2 +guid: 66ecde249d145564e95925296dffe276 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Models/ModelsUI.cs b/package/Editor/Models/ModelsUI.cs index 5a148ca..a67edc2 100644 --- a/package/Editor/Models/ModelsUI.cs +++ b/package/Editor/Models/ModelsUI.cs @@ -32,14 +32,8 @@ public class ModelsUI private void SetFirstPage() { pageModels.Clear(); - if (IsQuickStartTab()) - { - selectedTab = 0; - } - else - { - selectedTab = (IsPrivateTab()) ? 1 : 2; - } + + selectedTab = (Models.IsPrivateTab()) ? 0 : 1; showPreviousButton = false; showNextButton = false; @@ -56,7 +50,7 @@ private void SetNextPage() currentPage++; - var models = GetModels(); + var models = Models.GetModels(); if (firstImageIndex + maxModelsPerPage > models.Count) { @@ -91,7 +85,7 @@ private void UpdatePage() { pageModels.Clear(); - var models = GetModels(); + var models = Models.GetModels(); for (int i = firstImageIndex; i < firstImageIndex + maxModelsPerPage; i++) { @@ -118,7 +112,7 @@ public void OnGUI(Rect position) if (drawTabs) { - string[] tabs = { "Quickstart Models", "Private Models", "Public Models" }; + string[] tabs = { "Private Models", "Public Models" }; HandleTabSelection(tabs); } @@ -159,7 +153,7 @@ private void DrawModelsGrid(Rect position) float boxWidth = (position.width - (padding * 2) * itemsPerRow) / itemsPerRow; float boxHeight = boxWidth; - var textures = GetTextures(); + var textures = Models.GetTextures(); int numRows = maxModelsPerPage / itemsPerRow; float rowPadding = 10f; @@ -174,11 +168,10 @@ private void DrawModelsGrid(Rect position) private void DrawTextureBox(float boxWidth, float boxHeight, float rowPadding, List textures) { - var models = GetModels(); + var models = Models.GetModels(); for (int i = 0; i < pageModels.Count; i++) { - int rowIndex = Mathf.FloorToInt((float)i / itemsPerRow); int colIndex = i % itemsPerRow; @@ -266,22 +259,15 @@ private void HandleTabSelection(string[] tabs) if (previousTab != selectedTab) { - switch (selectedTab) - { - case 0: - SetTab(privacyQuickStart); - drawTabs = false; - break; - - case 1: - SetTab(privacyPrivate); - drawTabs = false; - break; - - case 2: - SetTab(privacyPublic); - drawTabs = false; - break; + if (selectedTab == 0) + { + Models.SetTab(Models.privacyPrivate); + drawTabs = false; + } + else if (selectedTab == 1) + { + Models.SetTab(Models.privacyPublic); + drawTabs = false; } } } diff --git a/package/Editor/Models/ModelsUI.cs.meta b/package/Editor/Models/ModelsUI.cs.meta index 2361ff7..eef58c1 100644 --- a/package/Editor/Models/ModelsUI.cs.meta +++ b/package/Editor/Models/ModelsUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d942807f35f5ba448bec6ef87442d75a +guid: 1a14dd46b3b144d4a851aa987e2c900c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PackageExport.cs.meta b/package/Editor/PackageExport.cs.meta index 27d765f..144d2c9 100644 --- a/package/Editor/PackageExport.cs.meta +++ b/package/Editor/PackageExport.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4823a00b91edac5459207da42010b6ad +guid: 6df3eecd6a6008f45a8e739207b6f0e7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PixelEditor.meta b/package/Editor/PixelEditor.meta index 144bb66..23884f9 100644 --- a/package/Editor/PixelEditor.meta +++ b/package/Editor/PixelEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1179e17a0b49f65438d2021a3c09e43b +guid: 15d00d5dfe0f46848b2dab495aefbf85 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PixelEditor/PixelEditor.cs.meta b/package/Editor/PixelEditor/PixelEditor.cs.meta index 70273bb..ead6a50 100644 --- a/package/Editor/PixelEditor/PixelEditor.cs.meta +++ b/package/Editor/PixelEditor/PixelEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d289176a6fab65d43aa500ca4e65e81e +guid: bfe73e1ca907a1d4991758435a524523 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PixelEditor/PixelEditorUI.cs.meta b/package/Editor/PixelEditor/PixelEditorUI.cs.meta index 2a17f0d..9245e6f 100644 --- a/package/Editor/PixelEditor/PixelEditorUI.cs.meta +++ b/package/Editor/PixelEditor/PixelEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da32c9f0aa1c75f4ba671a0af2b69b5b +guid: e208beca5ac384241952c1f0f0925904 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins.meta b/package/Editor/Plugins.meta index 3fb31fd..761a6a7 100644 --- a/package/Editor/Plugins.meta +++ b/package/Editor/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 247d5fd5a8a90f54d9c93219a0c3f36d +guid: f0140cc6d8390ee4e9b724df6814f2ca folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Plugins/APIPricing.cs.meta b/package/Editor/Plugins/APIPricing.cs.meta index 7e69645..c472084 100644 --- a/package/Editor/Plugins/APIPricing.cs.meta +++ b/package/Editor/Plugins/APIPricing.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d9f3b4ea47885c341b0e05c22fbd6d0f +guid: 4ad72c40916c6634bb13bf5da2df8d1d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/ApiClient.cs.meta b/package/Editor/Plugins/ApiClient.cs.meta index d193844..f61b6a5 100644 --- a/package/Editor/Plugins/ApiClient.cs.meta +++ b/package/Editor/Plugins/ApiClient.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d99d12577156196499611cf16c811c76 +guid: 8be1c3b3031c7ba4d9298cd6d551c500 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/CommonUtils.cs.meta b/package/Editor/Plugins/CommonUtils.cs.meta index 1476ef6..6dec028 100644 --- a/package/Editor/Plugins/CommonUtils.cs.meta +++ b/package/Editor/Plugins/CommonUtils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50a71c86638be86439fa3c6a8feec603 +guid: 63317eec547922049b7ba7637603cb23 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp.meta b/package/Editor/Plugins/RestSharp.meta index ffe2526..866b6cd 100644 --- a/package/Editor/Plugins/RestSharp.meta +++ b/package/Editor/Plugins/RestSharp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2a9661d9eabcf34899e9d320217bbd4 +guid: 6aa59ce90702c9049ad932bc2b807edb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta b/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta index 740bb99..80b428e 100644 --- a/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta +++ b/package/Editor/Plugins/RestSharp/RestSharp.Unity.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d744f7b0bc3bf64b9d38852345afa38 +guid: 725db8523f2e59f44a1503eaf812cc9f AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/package/Editor/Plugins/RestSharp/RestSharp.dll.meta b/package/Editor/Plugins/RestSharp/RestSharp.dll.meta index 584839f..f535670 100644 --- a/package/Editor/Plugins/RestSharp/RestSharp.dll.meta +++ b/package/Editor/Plugins/RestSharp/RestSharp.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 969ce951aa8147a4da98b42db5de1f2d +guid: ccb20fe4ef9ca4846bdb3bd5dcc6cf87 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta b/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta index 7da32f9..901bab8 100644 --- a/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta +++ b/package/Editor/Plugins/RestSharp/RestSharpException.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30446d0fb1120c04b854e8adacdfb8b1 +guid: 51588c19b8278a244b8aaca754df44de MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta b/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta index d766935..5638dad 100644 --- a/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta +++ b/package/Editor/Plugins/RestSharp/RestSharpExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce1b780ff16dc8a44bae3721e9c4c543 +guid: 5c1b0d81d022f004c9bebc439c4cbd6e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Presets.meta b/package/Editor/Presets.meta index 8a9a386..d1d202b 100644 --- a/package/Editor/Presets.meta +++ b/package/Editor/Presets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b615f58d3a09374790c6457689eb3f5 +guid: 0d04b991eaf17a643b5aa1baf51ac077 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta b/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta index 6b0c63f..ae2ff77 100644 --- a/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Isometric Tile Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4493bad2937196a47a6d37f3805a670e +guid: 6d537ab5bf7649b44973f061c34b6151 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta b/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta index 5550e8a..cd54ed8 100644 --- a/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Rectangle Tile Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f8a78a18bcff1d3449f350b0ae5fac1f +guid: 442b6b94501543a41ba9305a48c84b94 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta b/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta index b2a4292..a0e3757 100644 --- a/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Sprite Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71113908ff5270d4c8b037920b68b71a +guid: d87ceacdb68f56745951dadf104120b1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/Presets/Scenario Default Texture Importer.preset.meta b/package/Editor/Presets/Scenario Default Texture Importer.preset.meta index 9ca1208..aac1e6a 100644 --- a/package/Editor/Presets/Scenario Default Texture Importer.preset.meta +++ b/package/Editor/Presets/Scenario Default Texture Importer.preset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1bc1fcfad74ab14fa22e8dceed27e70 +guid: 28269680c775243409a2d470907383f9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2655988077585873504 diff --git a/package/Editor/PromptImages.meta b/package/Editor/PromptImages.meta index 4af3d0f..79c97ed 100644 --- a/package/Editor/PromptImages.meta +++ b/package/Editor/PromptImages.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6f78f440e7fc2045be5b29765f8e368 +guid: 7fa2b4ce6afc8c542a013acfb8ec2761 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptImages/TileCreator.cs.meta b/package/Editor/PromptImages/TileCreator.cs.meta index 817cd90..8f2f9d3 100644 --- a/package/Editor/PromptImages/TileCreator.cs.meta +++ b/package/Editor/PromptImages/TileCreator.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 54219038a8ded4c46a57ae01e9baeffc +guid: bb2f7d303405215419ed77ec67749b71 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow.meta b/package/Editor/PromptWindow.meta index b0948ea..b9818b0 100644 --- a/package/Editor/PromptWindow.meta +++ b/package/Editor/PromptWindow.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12ba62b87f11b9648b7bf902f8d38639 +guid: 184024eb87dbfb249ab9127cf9c8e9ba folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta b/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta index 44db53d..37c3db9 100644 --- a/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta +++ b/package/Editor/PromptWindow/PromptBuilderWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f6790c27cf3dbf4394b38244809e74e +guid: 964d325ab90ceec47a66df76e2a94623 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/PromptWindow.cs.meta b/package/Editor/PromptWindow/PromptWindow.cs.meta index a99b6ad..69c4a3d 100644 --- a/package/Editor/PromptWindow/PromptWindow.cs.meta +++ b/package/Editor/PromptWindow/PromptWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 192e8eec117b12e49a2f180240e305de +guid: 8541e921ad7547b468cc952d46b7058e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/PromptWindowUI.cs.meta b/package/Editor/PromptWindow/PromptWindowUI.cs.meta index 4f641a7..c7eddb6 100644 --- a/package/Editor/PromptWindow/PromptWindowUI.cs.meta +++ b/package/Editor/PromptWindow/PromptWindowUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6213d5826b5d75b4aab981f649e48fc0 +guid: bd550df13b8cb5d42ab7f5368ce7f821 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views.meta b/package/Editor/PromptWindow/Views.meta index b241360..e455da6 100644 --- a/package/Editor/PromptWindow/Views.meta +++ b/package/Editor/PromptWindow/Views.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37bcbcb2fcac62847ac5309b760b379e +guid: e01bb6a4bc116f94495576dc31b867ca folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/PromptWindow/Views/ControlNetView.cs.meta b/package/Editor/PromptWindow/Views/ControlNetView.cs.meta index 0d582c0..3c192d1 100644 --- a/package/Editor/PromptWindow/Views/ControlNetView.cs.meta +++ b/package/Editor/PromptWindow/Views/ControlNetView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f3e11f083c420f45a0312150fd661fa +guid: a03791737b5dec644b59d93cacb6f342 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta b/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta index dfddb59..cb1a52c 100644 --- a/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta +++ b/package/Editor/PromptWindow/Views/ImageSettingsView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 024b5cc1034e3ad4b8cc93635199e18b +guid: 57b631278e279f9459fdf6b0f1634488 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta b/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta index 3e87eeb..a9ff7b8 100644 --- a/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta +++ b/package/Editor/PromptWindow/Views/NegativePromptView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a721fab7fd422004088ddec95bcb1b3a +guid: fdf6ce4a5c9f6bf47a4162e0f0aef589 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/PromptWindow/Views/PromptView.cs.meta b/package/Editor/PromptWindow/Views/PromptView.cs.meta index a51efda..ecc8e2a 100644 --- a/package/Editor/PromptWindow/Views/PromptView.cs.meta +++ b/package/Editor/PromptWindow/Views/PromptView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a55effae4d854340bb6853bc95f5336 +guid: fcd2beb42637a51488dd8ae3afe6fa59 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/Settings.meta b/package/Editor/Settings.meta index 13a8240..83a9e45 100644 --- a/package/Editor/Settings.meta +++ b/package/Editor/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe7aafe65ca278345a2bc198a1ad701a +guid: 08d4aab7cf61e054fba2b37e5c318c83 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/Settings/PluginSettings.cs.meta b/package/Editor/Settings/PluginSettings.cs.meta index 74bb636..e8aa24d 100644 --- a/package/Editor/Settings/PluginSettings.cs.meta +++ b/package/Editor/Settings/PluginSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d90bbdf27f96e9429c5032c8102078f +guid: 683150de44018cf4f8372d1d292895d5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/UpscaleEditor.meta b/package/Editor/UpscaleEditor.meta index a09522e..a0b5151 100644 --- a/package/Editor/UpscaleEditor.meta +++ b/package/Editor/UpscaleEditor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5e134129dfd1c74ea2646aafc149089 +guid: bb9ad943319abed4cae6a00e765d0abf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta b/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta index 7dd2009..225aa30 100644 --- a/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta +++ b/package/Editor/UpscaleEditor/UpscaleEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c1cc41373feb8944180103519e9975fd +guid: 777e350a9acb1024288f1a84a20e29b2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta b/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta index 33e291a..cb6a9da 100644 --- a/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta +++ b/package/Editor/UpscaleEditor/UpscaleEditorUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f71826e5e977774895ae17811eed211 +guid: 38689eeb80d189440bbaed19bec1d3ae MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_CustomStyle.meta b/package/Editor/_CustomStyle.meta index 5435f2b..a7a22c5 100644 --- a/package/Editor/_CustomStyle.meta +++ b/package/Editor/_CustomStyle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56e01032c6331b1479e8898c56848470 +guid: 7922073dddaeda548b60eb43a48a6be7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/_CustomStyle/CustomStyle.cs.meta b/package/Editor/_CustomStyle/CustomStyle.cs.meta index f41e52c..decb2cd 100644 --- a/package/Editor/_CustomStyle/CustomStyle.cs.meta +++ b/package/Editor/_CustomStyle/CustomStyle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03a2dc1c3feaf5347b8c190fe8b8e0e4 +guid: ead7df0857ce09440a69a25f5ddfc2c7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services.meta b/package/Editor/_Services.meta index 57ea352..fd01512 100644 --- a/package/Editor/_Services.meta +++ b/package/Editor/_Services.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 293bf04c307f92f488f437614bd5df5b +guid: 11c98b0679094754d9a67f2022edf8b4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/package/Editor/_Services/BackgroundRemoval.cs.meta b/package/Editor/_Services/BackgroundRemoval.cs.meta index 0946fc9..1970591 100644 --- a/package/Editor/_Services/BackgroundRemoval.cs.meta +++ b/package/Editor/_Services/BackgroundRemoval.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0800a5f2fd93a674697fabec7234eaf5 +guid: 6fcd620db14ab534aa193376881b8755 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services/DataCache.cs.meta b/package/Editor/_Services/DataCache.cs.meta index 4051ccc..3b63030 100644 --- a/package/Editor/_Services/DataCache.cs.meta +++ b/package/Editor/_Services/DataCache.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a960452346f0c434295599f62ac8f4a4 +guid: fc24d3aa02f31114388d95821da0004e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/_Services/PromptFetcher.cs.meta b/package/Editor/_Services/PromptFetcher.cs.meta index 6bdf703..51aae3d 100644 --- a/package/Editor/_Services/PromptFetcher.cs.meta +++ b/package/Editor/_Services/PromptFetcher.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bb037c05e7d14b45beec82a36a5e135 +guid: 461b26fbbcb64be4eafc21d72f6bc311 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta b/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta index 01e085f..69fe22d 100644 --- a/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta +++ b/package/Editor/com.scenarioinc.scenario.editor.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b9a602bf6182884a8d314f82606eb82 +guid: f6a2e22ca0a59c7409203ee37636196c AssemblyDefinitionImporter: externalObjects: {} userData: