diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ef8bdd0..2a7dba8 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -9,7 +9,7 @@ 10.0.20506 2.0 - {a9a52b9b-e4f5-75fe-506a-9297d549430d} + {1fe89738-dd1e-00dd-ec95-f529824729f0} Library Properties Assembly-CSharp @@ -283,14 +283,14 @@ /Applications/Unity/Hub/Editor/2021.3.17f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - - /Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll - - /Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.testtools.codecoverage@1.2.2/lib/ReportGenerator/ReportGeneratorMerged.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.testtools.codecoverage@1.2.2/lib/ReportGenerator/ReportGeneratorMerged.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll /Applications/Unity/Hub/Editor/2021.3.17f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll @@ -671,121 +671,121 @@ /Applications/Unity/Hub/Editor/2021.3.17f1/Unity.app/Contents/NetStandard/compat/2.1.0/shims/netfx/mscorlib.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.ML.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.ML.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Performance.Profile-Analyzer.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Performance.Profile-Analyzer.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Sharing.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Timeline.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Timeline.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TextMeshPro.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Vision.MobileNetv2.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Vision.MobileNetv2.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Devices.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Devices.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.VideoKit.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/UnityEditor.UI.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/UnityEditor.UI.dll - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Recorders.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Rider.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Rider.Editor.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/UnityEngine.UI.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/UnityEngine.UI.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Recorders.Editor.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Sharing.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.EditorCoroutines.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.EditorCoroutines.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.Analytics.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.Analytics.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Hub.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Hub.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.ML.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.ML.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Hub.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Hub.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Services.Core.Environments.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Services.Core.Environments.dll + + + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.VideoKit.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Devices.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/NatML.Devices.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.TestTools.CodeCoverage.Editor.dll - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Sharing.Editor.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Recorders.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.VideoKit.Editor.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.VideoKit.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Recorders.Editor.dll - - - /Users/yusuf/Desktop/MobileNet-v2/Library/ScriptAssemblies/NatML.Sharing.dll + /Users/yusuf/Desktop/mobilenet-v2/Library/ScriptAssemblies/Unity.VisualScripting.State.dll diff --git a/Assets/MobileNetv2Sample.cs b/Assets/MobileNetv2Sample.cs index ed9ef24..5e9e929 100644 --- a/Assets/MobileNetv2Sample.cs +++ b/Assets/MobileNetv2Sample.cs @@ -19,14 +19,11 @@ public class MobileNetv2Sample : MonoBehaviour { public Text labelText; public Text scoreText; - private MLEdgeModel model; private MobileNetv2Predictor predictor; private async void Start () { - // Create the model - model = await MLEdgeModel.Create("@natsuite/mobilenet-v2"); // Create the predictor - predictor = new MobileNetv2Predictor(model); + predictor = await MobileNetv2Predictor.Create(); // Start listening for camera stream cameraManager.OnCameraFrame.AddListener(OnCameraFrame); } @@ -42,8 +39,8 @@ public class MobileNetv2Sample : MonoBehaviour { void OnDisable () { // Stop listening for camera frames cameraManager.OnCameraFrame.RemoveListener(OnCameraFrame); - // Dispose model - model?.Dispose(); + // Dispose the predictor + predictor?.Dispose(); } } } \ No newline at end of file diff --git a/MobileNet-v2.sln b/MobileNet-v2.sln index fad2010..02a43d2 100644 --- a/MobileNet-v2.sln +++ b/MobileNet-v2.sln @@ -1,15 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{a9a52b9b-e4f5-75fe-506a-9297d549430d}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{1fe89738-dd1e-00dd-ec95-f529824729f0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {a9a52b9b-e4f5-75fe-506a-9297d549430d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {a9a52b9b-e4f5-75fe-506a-9297d549430d}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1fe89738-dd1e-00dd-ec95-f529824729f0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1fe89738-dd1e-00dd-ec95-f529824729f0}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Packages/ai.natml.vision.mobilenet-v2/Changelog.md b/Packages/ai.natml.vision.mobilenet-v2/Changelog.md index 03ac682..35b3857 100644 --- a/Packages/ai.natml.vision.mobilenet-v2/Changelog.md +++ b/Packages/ai.natml.vision.mobilenet-v2/Changelog.md @@ -1,3 +1,8 @@ +## 1.0.2 ++ Added `MobileNetv2Predictor.Create` static method for creating the predictor. ++ Removed public `MobileNetv2Predictor` constructor. ++ Upgraded to NatML 1.1.3. + ## 1.0.1 + Upgraded to NatML 1.1. diff --git a/Packages/ai.natml.vision.mobilenet-v2/README.md b/Packages/ai.natml.vision.mobilenet-v2/README.md index c5e3672..f41587f 100644 --- a/Packages/ai.natml.vision.mobilenet-v2/README.md +++ b/Packages/ai.natml.vision.mobilenet-v2/README.md @@ -13,7 +13,7 @@ Add the following items to your Unity project's `Packages/manifest.json`: } ], "dependencies": { - "ai.natml.vision.mobilenet-v2": "1.0.1" + "ai.natml.vision.mobilenet-v2": "1.0.2" } } ``` @@ -21,10 +21,8 @@ Add the following items to your Unity project's `Packages/manifest.json`: ## Classifying an Image First, create the MobileNet v2 predictor: ```csharp -// Create the model -var model = await MLEdgeModel.Create("@natsuite/mobilenet-v2"); -// Create the predictor -var predictor = new MobileNetv2Predictor(model); +// Create the MobileNet v2 predictor +var predictor = await MobileNetv2Predictor.Create(); ``` Then make predictions on images: @@ -32,7 +30,9 @@ Then make predictions on images: // Given an image... Texture2D image = ...; // Classify the image -(string label, float confidence) result = predictor.Predict(image); +MobileNetv2Predictor.Label result = predictor.Predict(image); +// Use the result +Debug.Log($"Model predicted {result.label} with confidence {result.confidence}"); ``` ## Requirements @@ -41,7 +41,7 @@ Texture2D image = ...; ## Quick Tips - Join the [NatML community on Discord](https://natml.ai/community). - Discover more ML models on [NatML Hub](https://hub.natml.ai). -- See the [NatML documentation](https://docs.natml.ai/natml). +- See the [NatML documentation](https://docs.natml.ai/unity). - Contact us at [hi@natml.ai](mailto:hi@natml.ai). Thank you very much! \ No newline at end of file diff --git a/Packages/ai.natml.vision.mobilenet-v2/Runtime/MobileNetv2Predictor.cs b/Packages/ai.natml.vision.mobilenet-v2/Runtime/MobileNetv2Predictor.cs index 8efcc18..fdcc624 100644 --- a/Packages/ai.natml.vision.mobilenet-v2/Runtime/MobileNetv2Predictor.cs +++ b/Packages/ai.natml.vision.mobilenet-v2/Runtime/MobileNetv2Predictor.cs @@ -6,6 +6,7 @@ namespace NatML.Vision { using System; + using System.Threading.Tasks; using NatML.Features; using NatML.Internal; using NatML.Types; @@ -14,36 +15,44 @@ namespace NatML.Vision { /// MobileNet v2 classification predictor. /// This predictor classifies an image with the ImageNet labels. /// - public sealed class MobileNetv2Predictor : IMLPredictor<(string label, float confidence)> { + public sealed class MobileNetv2Predictor : IMLPredictor { #region --Client API-- /// - /// Create the MobileNet v2 classification predictor. + /// Class label with confidence score. /// - /// MobileNet v2 model. - public MobileNetv2Predictor (MLEdgeModel model) => this.model = model as MLEdgeModel; + public struct Label { + + /// + /// Class label. + /// + public string label; + + /// + /// Unnormalized confidence score. + /// + public float confidence; + + public void Deconstruct (out string label, out float confidence) { + label = this.label; + confidence = this.confidence; + } + } /// /// Classify an image. /// /// Input image feature. /// Output label with unnormalized confidence value. - public (string label, float confidence) Predict (params MLFeature[] inputs) { - // Check - if (inputs.Length != 1) - throw new ArgumentException(@"MobileNet v2 predictor expects a single feature", nameof(inputs)); - // Check type - var input = inputs[0]; - if (!MLImageType.FromType(input.type)) - throw new ArgumentException(@"MobileNet v2 predictor expects an an array or image feature", nameof(inputs)); + public Label Predict (params MLFeature[] inputs) { // Apply image pre-processing + var input = inputs[0]; if (input is MLImageFeature imageFeature) { (imageFeature.mean, imageFeature.std) = model.normalization; imageFeature.aspectMode = model.aspectMode; } // Predict - var inputType = model.inputs[0]; - using var inputFeature = (input as IMLEdgeFeature).Create(inputType); + using var inputFeature = (input as IMLEdgeFeature).Create(model.inputs[0]); using var outputFeatures = model.Predict(inputFeature); // Find label var logits = new MLArrayFeature(outputFeatures[0]); @@ -51,16 +60,35 @@ public sealed class MobileNetv2Predictor : IMLPredictor<(string label, float con for (int i = 1, ilen = logits.shape[1]; i < ilen; ++i) argMax = logits[0,i] > logits[0,argMax] ? i : argMax; // Return - var result = (model.labels[argMax], logits[argMax]); + var result = new Label { label = model.labels[argMax], confidence = logits[argMax] }; return result; } + + /// + /// Dispose the predictor and release resources. + /// + public void Dispose () => model.Dispose(); + + /// + /// Create the MobileNet v2 predictor. + /// + /// Edge model configuration. + /// NatML access key. + public static async Task Create ( + MLEdgeModel.Configuration configuration = null, + string accessKey = null + ) { + var model = await MLEdgeModel.Create("@natsuite/mobilenet-v2", configuration, accessKey); + var predictor = new MobileNetv2Predictor(model); + return predictor; + } #endregion #region --Operations-- private readonly MLEdgeModel model; - void IDisposable.Dispose () { } // Nop + private MobileNetv2Predictor (MLEdgeModel model) => this.model = model as MLEdgeModel; #endregion } } \ No newline at end of file diff --git a/Packages/ai.natml.vision.mobilenet-v2/package.json b/Packages/ai.natml.vision.mobilenet-v2/package.json index d6d5c57..736eb9a 100644 --- a/Packages/ai.natml.vision.mobilenet-v2/package.json +++ b/Packages/ai.natml.vision.mobilenet-v2/package.json @@ -1,11 +1,11 @@ { "name": "ai.natml.vision.mobilenet-v2", - "version": "1.0.1", + "version": "1.0.2", "displayName": "MobileNet v2", "description": "Realtime image classification in Unity Engine.", "unity": "2021.2", "dependencies": { - "ai.natml.natml": "1.1.0" + "ai.natml.natml": "1.1.3" }, "keywords": [ "natml", diff --git a/Packages/manifest.json b/Packages/manifest.json index 2de789b..afdd3d8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,7 +9,7 @@ } ], "dependencies": { - "ai.natml.videokit": "0.0.9", + "ai.natml.videokit": "0.0.11", "com.unity.collab-proxy": "1.17.7", "com.unity.feature.development": "1.0.1", "com.unity.ide.rider": "3.0.18", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c1f4114..02cde55 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,25 +8,25 @@ "url": "https://registry.npmjs.com" }, "ai.natml.natcorder": { - "version": "1.9.3", + "version": "1.9.4", "depth": 1, "source": "registry", "dependencies": { - "ai.natml.hub": "1.0.15" + "ai.natml.hub": "1.0.20" }, "url": "https://registry.npmjs.com" }, "ai.natml.natdevice": { - "version": "1.3.2", + "version": "1.3.3", "depth": 1, "source": "registry", "dependencies": { - "ai.natml.hub": "1.0.15" + "ai.natml.hub": "1.0.20" }, "url": "https://registry.npmjs.com" }, "ai.natml.natml": { - "version": "1.1.0", + "version": "1.1.3", "depth": 1, "source": "registry", "dependencies": { @@ -44,14 +44,14 @@ "url": "https://registry.npmjs.com" }, "ai.natml.videokit": { - "version": "0.0.9", + "version": "0.0.11", "depth": 0, "source": "registry", "dependencies": { "ai.natml.hub": "1.0.20", - "ai.natml.natml": "1.1.0", - "ai.natml.natcorder": "1.9.3", - "ai.natml.natdevice": "1.3.2", + "ai.natml.natml": "1.1.3", + "ai.natml.natcorder": "1.9.4", + "ai.natml.natdevice": "1.3.3", "ai.natml.natshare": "1.3.0" }, "url": "https://registry.npmjs.com" @@ -61,7 +61,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "ai.natml.natml": "1.1.0" + "ai.natml.natml": "1.1.3" } }, "com.unity.collab-proxy": { diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d25d92b..79bcfa8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 5284 + controlID: 17 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,8 +141,8 @@ MonoBehaviour: y: 0 width: 368 height: 850 - m_MinSize: {x: 880, y: 216} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 881, y: 237} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 13} @@ -199,7 +199,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 5536 + controlID: 116 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -219,8 +219,8 @@ MonoBehaviour: y: 0 width: 324.5 height: 373.5 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -340,7 +340,7 @@ MonoBehaviour: m_PaneScroll: {x: 0, y: 0} m_ViewType: 0 updateViewLive: 0 - m_CurrentFrameIndex: 883 + m_CurrentFrameIndex: -1 m_HierarchyOverruledThreadFromSelection: 0 m_ProfilerViewFilteringOptions: 1 m_FrameDataHierarchyView: @@ -1723,9 +1723,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7e5e0000 - m_LastClickedID: 24190 - m_ExpandedIDs: 82f8ffff4af9ffff6e5e0000 + m_SelectedIDs: f0840000 + m_LastClickedID: 34032 + m_ExpandedIDs: a2cfffff98d0ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1830,10 +1830,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 1} - m_SelectedIDs: 205a0000 - m_LastClickedID: 23072 - m_ExpandedIDs: 00000000205a000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 94840000 + m_LastClickedID: 33940 + m_ExpandedIDs: 000000009484000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1861,7 +1861,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000205a000000ca9a3bffffff7f + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1888,7 +1888,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0