fix: missing images bug

Scenario/Editor/Images/Images.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Editor/LayerEditor/ContextMenuActions.cs

@@ -1,7 +1,7 @@
 using System;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Editor/Models/Models.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Editor/PixelEditor/PixelEditorUI.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Editor/PromptImages/PromptImages.cs

@@ -5,10 +5,10 @@
 using System.Threading.Tasks;
 using RestSharp;
 using Unity.EditorCoroutines.Editor;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Networking;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Editor/PromptWindow/PromptWindow.cs

@@ -4,9 +4,9 @@
 using System.Globalization;
 using System.Linq;
 using Unity.EditorCoroutines.Editor;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {
@@ -226,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"": {{

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;

Scenario/Editor/PromptWindow/Views/ImageSettingsView.cs

@@ -40,7 +40,8 @@ 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));

Scenario/Editor/UpscaleEditor/UpscaleEditorUI.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
-using Newtonsoft.Json;
 
 namespace Scenario
 {

Scenario/Plugins/PluginSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using UnityEditor;
 using UnityEngine;
+using System.IO;
 
 namespace Scenario
 {
@@ -17,7 +18,24 @@ public class PluginSettings : EditorWindow
         private readonly string[] imageFormats = { "JPEG", "PNG" };
         private readonly string[] imageFormatExtensions = { "jpeg", "png" };
 
-        private static string version = "Scenario Beta Version 0.2.0";
+        private static string vnumber = "";
+        private static string version => $"Scenario Beta Version {vnumber}";
+
+        [System.Serializable]
+        private class PackageInfo
+        {
+            public string version;
+        }
+
+        [MenuItem("Scenario/Update Version")]
+        public static void UpdateVersionFromPackageJson()
+        {
+            string packageJsonPath = "Assets/Scenario/package.json";
+            string packageJsonContent = File.ReadAllText(packageJsonPath);
+            vnumber = JsonUtility.FromJson<PackageInfo>(packageJsonContent).version;
+
+            EditorWindow.GetWindow<PluginSettings>().Repaint();
+        }
 
         public static string EncodedAuth
         {
@@ -42,6 +60,12 @@ public static void ShowWindow()
             window.minSize = new Vector2(minimumWidth, window.minSize.y);
         }
 
+        private void OnEnable()
+        {
+            UpdateVersionFromPackageJson();
+            LoadSettings();
+        }
+
         private void OnGUI()
         {
             Color backgroundColor = new Color32(18, 18, 18, 255);
@@ -84,13 +108,8 @@ private void OnGUI()
                 SaveSettings();
             }
 
-            GUILayout.FlexibleSpace(); // This will push the version text to the bottom
-            GUILayout.Label(version, EditorStyles.boldLabel); // Add this line to display the version at the bottom
-        }
-
-        private void OnEnable()
-        {
-            LoadSettings();
+            GUILayout.FlexibleSpace();
+            GUILayout.Label(version, EditorStyles.boldLabel);
         }
 
         private void SaveSettings()
@@ -117,4 +136,4 @@ private void LoadSettings()
             }
         }
     }
-}
+}

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"

Scenario/package.json

@@ -1,10 +1,10 @@
 {
     "name": "com.scenario.editor",
     "displayName": "Scenario Unity Plugin",
-    "version": "0.2.0",
+    "version": "0.2.3",
     "unity": "2022.3",
     "dependencies": {
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.nuget.newtonsoft-json": "2.0.0"
     }
-}
+}