feat: 109 isometric building workflow #156

TheLLspectre · 2024-03-15T11:23:03Z

Adding isometric workflow:
Main features:

Select Base and also custom base
select model
define and select prompt to generate assets
Select generated asset to convert as sprite, as a tile to tile palette, customize in webapp
Regenerate an inference
Restart workflow
closes: Isometric Building Workflow #109

to cache the models & thumbnails

…scenario-labs/Scenario-Unity into 109-isometric-building-workflow

Add convert tile. Add convert sprite. Add independant behaviour on each inference. Tile Creator Generic Manage some errors Inactive button when any image is selected.

Icons were unavailable at the launching of unity, so we need to wait the disponibility of the asset.

Morgan-6Freedom · 2024-03-15T12:35:50Z

package/Editor/Images/Images.cs

+        /// </summary>
+        /// <param name="_texture"></param>
+        /// <param name="_onAction"></param>
+        public static void DlAsTexture(Texture2D _texture, Action _onAction)


I prefer full wording "DownloadAsTexture" + it miss the summary

Morgan-6Freedom · 2024-03-15T12:36:03Z

package/Editor/Images/Images.cs

+        /// <param name="_texture"></param>
+        /// <param name="_selectedImageId"></param>
+        /// <param name="_onAction"></param>
+        public static void DlAsSprite(Texture2D _texture, string _selectedImageId, Action _onSuccessAction, Action _onDownloadingAction)


same as "DlAsTexture"

Morgan-6Freedom · 2024-03-15T12:36:14Z

package/Editor/Images/Images.cs

@@ -162,5 +163,91 @@ public static Texture2D GetTextureByImageId(string _id)
            return imageData.texture;
        }

+        /// <summary>
+        /// 


it miss the summary here

Morgan-6Freedom · 2024-03-15T12:38:38Z

package/Editor/Isometric Workflow/IsometricWorkflow.cs

+        }
+
+        /// <summary>
+        /// Call the prompt window to generate one image per asset in the assetlist


it's not one image, but 4. the comment is incorrect

Morgan-6Freedom · 2024-03-15T12:39:27Z

package/Editor/Isometric Workflow/IsometricWorkflow.cs

+                string tempName = assetName;
+                bool useBaseTexture = baseTexture != null;
+                string modelName = settings.isometricModels.Find(x => x.style == selectedModel).modelData.name;
+                PromptWindow.GenerateImage(modelName, useBaseTexture, useBaseTexture, useBaseTexture ? baseTexture : null, 4, $"isometric, solo, centered, solid color background, {selectedTheme}, {assetName}", 30, 1024, 1024, 6, "-1", useBaseTexture, 0.8f,


I think we should make the prompt value "isometric, solo, centered, solid color background" as a variable so we can change it easily

Now it's fix in a variable and that's mean in the futur we can have a custom prompt on it ?

package/Editor/Isometric Workflow/IsometricWorkflowSettings.cs

Morgan-6Freedom · 2024-03-15T12:42:38Z

package/Editor/PromptImages/TileCreator.cs

@@ -9,6 +9,14 @@ namespace Scenario.Editor
 {
    public class TileCreator
    {
+        #region Public Fields
+
+        public static TileCreator instance = null;


can you call this variable "Instance" with a capitalized i ?

Morgan-6Freedom · 2024-03-15T12:43:33Z

package/Editor/PromptWindow/PromptWindow.cs

@@ -1,3 +1,4 @@
+using Codice.CM.Common;


What is this namespace for ?

My visual loves to add namespace ......

Morgan-6Freedom · 2024-03-15T12:44:29Z

package/Editor/PromptWindow/PromptWindowUI.cs

            {
                promptinputText = SerializeTags(tags);
                negativepromptinputText = SerializeTags(negativeTags);

                EditorPrefs.SetString("postedModelName", DataCache.instance.SelectedModelId);

+                PromptFetcher.IsWorkflow = false;


What is this used for ?

It's probably an anticipation to workflows and futur one. This is used to say "It's workflow" so i have mutliple windows with a specific behaviour and with that we can avoid classic behaviours, like to the isometric workflow --> openning the Image window when generate inference, thanks to that we avoiding the Image Window because we have inference directly inside the isometric workflow.

can you change the name accordingly ? Something like "silentFetch" or "silenceMode" or something in this flavor ?

Morgan-6Freedom · 2024-03-15T12:45:15Z

package/Editor/Settings/PluginSettings.cs

+            {
+                if (string.IsNullOrEmpty(teamIdKey))
+                {
+                    teamIdKey = EditorPrefs.GetString("TeamIdKey");


can you save the string in "scenario/teamIdKey" like the other editor prefs plz ?

Oh ! I miss this !

can you save the string in "scenario/teamIdKey" like the other editor prefs plz ?

That mean I changed other one ??

If you do it, it will break for everyone, everywhere. So I'm not a big fan of deleting saved settings of the users.
=> Don't change the old ones.

Manage generation from isometric workflow

qvaleroo · 2024-05-27T14:00:12Z

We should not need the user to fill Workspace ID in settings. If you want the ID, you can have it with /teams endpoint

qvaleroo · 2024-05-27T14:04:32Z

Is it possible to center the text and icon for custom isometric choice?

qvaleroo · 2024-05-27T14:04:51Z

Some icons are empty

qvaleroo · 2024-05-27T14:06:05Z

Maybe replace "This consume Credits" by the actual cost value. You can obtain it sending the request with parameter dryRun = true (check with frontend team or backend team if help is needed)

qvaleroo · 2024-05-27T14:08:30Z

We should also handle Parallel inferences limit. Creator plan is limited to 5 inferences in // for example but I can send more than 5 ifnerences.
You should queue the request when receiving a 429 error, and relaunch it once a request is finished for example.
You have the max number of allowed parallel inferences using /team/{teamId}/limits endpoint

TheLLspectre · 2024-05-31T13:38:37Z

Some icons are empty

Some models are not available on download, when you're not on isometric workspace :/

Morgan-6Freedom and others added 22 commits February 15, 2024 16:16

feat(isometricworkflow): window can be open and first step UI is here

f085718

feat(isometricworkflow): create a settings asset

a8ee72b

to cache the models & thumbnails

feat(isometricworkflow): theme is ok

acd49bc

feat(plugin): now we can use little icons in the plugin UI

1f5f011

fix(customStyle): now buttons can have a fixed width

f33c490

feat(isometric): Step 3 & 4 UI are ok

d19f513

feat(isometric): WIP step 5

c97807c

fix(isometric): square base texture wasn't readable

5577a70

feat(prompt): promptwindow can be called from script

c2c0966

feat(isometric): asset creation is called at the API

a3a90a2

fix(isometric): do not always use canny

ad21d89

fix(promptwindow): better save the last used model

9c97a6d

feat(isometricworkflow): show images in last step

dfd8f05

Merge branch '109-isometric-building-workflow' of https://github.com/…

0dee3ba

…scenario-labs/Scenario-Unity into 109-isometric-building-workflow

fix: displaying four inferences with isometric workflow

6aa4b4a

feat(step 5 isometric workflow): add converts, regeneration and fixes

5ddbbe9

Add convert tile. Add convert sprite. Add independant behaviour on each inference. Tile Creator Generic Manage some errors Inactive button when any image is selected.

feat: add restart on isometric workflow and webapp customisation action

bf300b0

fix: generate sprite, tile, regenerate unavailable, step 4 empty options

874d960

fix: loading icons and removing from assetlist step 4

578df0c

Icons were unavailable at the launching of unity, so we need to wait the disponibility of the asset.

Merge branch 'develop' into 109-isometric-building-workflow

eb498db

fix: merge develop and fix changing image to convert tile

117f598

fix: after restart regenerate button available

ecb9a49

TheLLspectre requested review from Morgan-6Freedom and qvaleroo March 15, 2024 11:23

Morgan-6Freedom suggested changes Mar 15, 2024

View reviewed changes

fix: pr returns naming, docs

c377c9d

TheLLspectre requested a review from Morgan-6Freedom March 15, 2024 16:28

TheLLspectre and others added 3 commits March 16, 2024 12:13

fix: stock base prompt in a variable

3a1ce80

Merge branch 'develop' into 109-isometric-building-workflow

c39fd73

Merge branch 'develop' into 109-isometric-building-workflow

596151b

TheLLspectre dismissed Morgan-6Freedom’s stale review via ad85915 April 4, 2024 07:10

TheLLspectre added 2 commits April 8, 2024 10:51

Merge branch 'develop' into 109-isometric-building-workflow

623aabe

fix: sorting code merging develop

e645e22

Morgan-6Freedom assigned Morgan-6Freedom and TheLLspectre Apr 9, 2024

TheLLspectre added 3 commits April 23, 2024 14:14

Merge branch 'develop' into 109-isometric-building-workflow

9957cd1

fix: fixing extraction of generation from the prompt window

99325da

Manage generation from isometric workflow

fix: updating models, prompt and sample assets

a5b4d4b

TheLLspectre and others added 4 commits May 28, 2024 22:04

fix: ui and preset

86b1d84

fix: don't use workspace id to open image

b06b50a

fix: working on session, limitation and cost

3eecf73

fix: implement treatment of cost

37f322a

TheLLspectre and others added 9 commits May 31, 2024 17:22

feat: implement cost and team limitation

5ac84c4

feat: start screen

e03071e

Merge branch 'develop' into 109-isometric-building-workflow

80c6f86

fix: trouble from merging dev

20f4869

fix: update parallel inference

5436062

fix: sizing window and layout off all assets buttons

60b7ad6

fix: UI step 4 sizing

d997185

Merge branch 'develop' into 109-isometric-building-workflow

c3b2eb0

fix: removing debug useless

bd53d71

qvaleroo approved these changes Jun 7, 2024

View reviewed changes

qvaleroo merged commit 7851fec into develop Jun 7, 2024
1 check passed

qvaleroo deleted the 109-isometric-building-workflow branch June 7, 2024 09:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 109 isometric building workflow #156

feat: 109 isometric building workflow #156

TheLLspectre commented Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

TheLLspectre Mar 16, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

TheLLspectre Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

TheLLspectre Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

Morgan-6Freedom Mar 15, 2024

TheLLspectre Mar 15, 2024

TheLLspectre Mar 15, 2024 •

edited

Loading

Morgan-6Freedom Mar 15, 2024 •

edited

Loading

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

TheLLspectre commented May 31, 2024

feat: 109 isometric building workflow #156

feat: 109 isometric building workflow #156

Conversation

TheLLspectre commented Mar 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheLLspectre Mar 15, 2024 • edited Loading

Choose a reason for hiding this comment

Morgan-6Freedom Mar 15, 2024 • edited Loading

Choose a reason for hiding this comment

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

qvaleroo commented May 27, 2024

TheLLspectre commented May 31, 2024

TheLLspectre Mar 15, 2024 •

edited

Loading

Morgan-6Freedom Mar 15, 2024 •

edited

Loading