Update missing images

scenario-labs · Oct 27, 2023 · b84004d · b84004d
1 parent 270952c
commit b84004d
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 3 deletions.
diff --git a/Scenario/Editor/Images/Images.cs b/Scenario/Editor/Images/Images.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Scenario/Editor/LayerEditor/ContextMenuActions.cs b/Scenario/Editor/LayerEditor/ContextMenuActions.cs
@@ -1,4 +1,5 @@
 using System;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Scenario/Editor/Models/Models.cs b/Scenario/Editor/Models/Models.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Scenario/Editor/PixelEditor/PixelEditorUI.cs b/Scenario/Editor/PixelEditor/PixelEditorUI.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Scenario/Editor/PromptImages/PromptImages.cs b/Scenario/Editor/PromptImages/PromptImages.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using RestSharp;
 using Unity.EditorCoroutines.Editor;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Networking;

diff --git a/Scenario/Editor/PromptWindow/PromptWindow.cs b/Scenario/Editor/PromptWindow/PromptWindow.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Linq;
 using Unity.EditorCoroutines.Editor;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 
@@ -225,7 +226,7 @@ private string PrepareInputData(string modality, string operationType, string da
             int width = (int)promptWindowUI.widthSliderValue;
             int height = (int)promptWindowUI.heightSliderValue;
             int numInferenceSteps = (int)promptWindowUI.samplesliderValue;
-            int numSamples = (int)promptWindowUI.imagesliderValue;
+            int numSamples = (int)promptWindowUI.imagesliderIntValue;
 
             string inputData = $@"{{
             ""parameters"": {{

diff --git a/Scenario/Editor/PromptWindow/PromptWindowUI.cs b/Scenario/Editor/PromptWindow/PromptWindowUI.cs
@@ -43,6 +43,7 @@ public partial class PromptWindowUI
         internal int widthSliderValue = 512;
         internal int heightSliderValue = 512;
         internal float imagesliderValue = 4;
+        internal int imagesliderIntValue = 4;
         internal float samplesliderValue = 30;
         internal float influncesliderValue = 0.25f;
         internal float guidancesliderValue = 7;

diff --git a/Scenario/Editor/PromptWindow/Views/ImageSettingsView.cs b/Scenario/Editor/PromptWindow/Views/ImageSettingsView.cs
@@ -40,7 +40,7 @@ private void RenderImageSettingsSection(bool shouldAutoGenerateSeed)
             int labelWidth = Mathf.RoundToInt(EditorGUIUtility.currentViewWidth * labelWidthPercentage);
             int sliderWidth = Mathf.RoundToInt(EditorGUIUtility.currentViewWidth * sliderWidthPercentage);
 
-            int imagesliderIntValue = Mathf.RoundToInt(imagesliderValue);
+            imagesliderIntValue = Mathf.RoundToInt(imagesliderValue);
             EditorGUILayout.BeginHorizontal();
             {
                 GUILayout.Label("Images: " + imagesliderIntValue, GUILayout.Width(labelWidth));

diff --git a/Scenario/Editor/UpscaleEditor/UpscaleEditorUI.cs b/Scenario/Editor/UpscaleEditor/UpscaleEditorUI.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Scenario/com.scenario.editor.asmdef b/Scenario/com.scenario.editor.asmdef
@@ -2,7 +2,8 @@
     "name": "com.scenario.editor",
     "rootNamespace": "Scenario",
     "references": [
-        "Unity.EditorCoroutines.Editor"
+        "Unity.EditorCoroutines.Editor",
+        "RestSharp.Unity"
     ],
     "includePlatforms": [
         "Editor"