From 059b0b2f6991f3130a9a4b6c9d48ed5f4c93714e Mon Sep 17 00:00:00 2001 From: Junrou Nishida Date: Fri, 1 Sep 2023 22:48:22 +0900 Subject: [PATCH] feat(sample)!: remove Start Scene (#1017) * remove console window button * refactor: change sample scripts namespace * refactor: use AppSettings to configure the sample app * refactor!: ImageSource stops inheriting MonoBehaviour * refactor: remove ImageSource components from scenes * refactor: make Bootstrap a prefab * remove Global Config button * add AppSettings.asset * remove Start Scene * remove MemoizedLogger --- .../MediaPipeUnity/Editor/PackageExporter.cs | 3 +- .../Samples/Common/Scripts/AppSettings.cs | 87 ++ ...Controller.cs.meta => AppSettings.cs.meta} | 2 +- .../Samples/Common/Scripts/Bootstrap.cs | 100 +-- .../Common/Scripts/GlobalConfigManager.cs | 140 ---- .../Scripts/GlobalConfigManager.cs.meta | 11 - .../Common/Scripts/ImageSource/ImageSource.cs | 2 +- .../Scripts/ImageSource/StaticImageSource.cs | 6 + .../Common/Scripts/ImageSource/VideoSource.cs | 20 +- .../Scripts/ImageSource/WebCamSource.cs | 36 +- .../Common/Scripts/ImageSourceProvider.cs | 60 +- .../Common/Scripts/ImageSourceSolution.cs | 2 +- .../Samples/Common/Scripts/MemoizedLogger.cs | 264 ------ .../Common/Scripts/MemoizedLogger.cs.meta | 11 - .../Samples/Common/Scripts/Solution.cs | 33 +- .../Common/Scripts/StartSceneController.cs | 35 - .../Samples/Common/Scripts/TaskApiRunner.cs | 27 +- .../Objects/Console.meta => Resources.meta} | 2 +- .../Samples/Resources/Bootstrap.prefab | 47 ++ .../Bootstrap.prefab.meta} | 2 +- .../Samples/Scenes/AppSettings.asset | 66 ++ ...cene.unity.meta => AppSettings.asset.meta} | 5 +- .../Face Detection/Face Detection.unity | 175 ++-- .../Face Detection/FaceDetectionConfig.cs | 4 +- .../Face Detection/FaceDetectionGraph.cs | 4 +- .../Face Detection/FaceDetectionSolution.cs | 2 +- .../Samples/Scenes/Face Mesh/Face Mesh.unity | 225 ++--- .../Scenes/Face Mesh/FaceMeshConfig.cs | 4 +- .../Samples/Scenes/Face Mesh/FaceMeshGraph.cs | 2 +- .../Scenes/Face Mesh/FaceMeshSolution.cs | 2 +- .../Hair Segmentation/Hair Segmentation.unity | 173 ++-- .../HairSegmentationConfig.cs | 4 +- .../HairSegmentationGraph.cs | 2 +- .../HairSegmentationSolution.cs | 2 +- .../Scenes/Hand Tracking/Hand Tracking.unity | 229 +++--- .../Hand Tracking/HandTrackingConfig.cs | 4 +- .../Scenes/Hand Tracking/HandTrackingGraph.cs | 2 +- .../Hand Tracking/HandTrackingSolution.cs | 2 +- .../Samples/Scenes/Holistic/Holistic.unity | 407 ++++++--- .../Scenes/Holistic/HolisticTrackingConfig.cs | 4 +- .../Scenes/Holistic/HolisticTrackingGraph.cs | 2 +- .../Holistic/HolisticTrackingSolution.cs | 2 +- .../Scenes/Iris Tracking/Iris Tracking.unity | 211 +++-- .../Iris Tracking/IrisTrackingConfig.cs | 4 +- .../Scenes/Iris Tracking/IrisTrackingGraph.cs | 2 +- .../Iris Tracking/IrisTrackingSolution.cs | 2 +- .../MediaPipe Video/MediaPipe Video.unity | 149 +--- .../MediaPipe Video/MediaPipeVideoConfig.cs | 4 +- .../MediaPipe Video/MediaPipeVideoGraph.cs | 2 +- .../MediaPipe Video/MediaPipeVideoSolution.cs | 2 +- .../Object Detection/Object Detection.unity | 175 ++-- .../Object Detection/ObjectDetectionConfig.cs | 4 +- .../Object Detection/ObjectDetectionGraph.cs | 2 +- .../ObjectDetectionSolution.cs | 2 +- .../Scenes/Pose Tracking/Pose Tracking.unity | 407 ++++++--- .../Pose Tracking/PoseTrackingConfig.cs | 4 +- .../Scenes/Pose Tracking/PoseTrackingGraph.cs | 2 +- .../Pose Tracking/PoseTrackingSolution.cs | 2 +- .../Selfie Segmentation.unity | 173 ++-- .../SelfieSegmentationConfig.cs | 4 +- .../SelfieSegmentationGraph.cs | 2 +- .../SelfieSegmentationSolution.cs | 2 +- .../Samples/Scenes/Start Scene.unity | 530 ------------ .../Tasks/Face Detection/Face Detection.unity | 107 +-- .../FaceDetectionConfigWindow.cs | 4 +- .../Face Landmark Detection.unity | 107 +-- .../FaceLandmarkDetectionConfigWindow.cs | 2 +- .../Hand Landmark Detection.unity | 105 +-- .../HandLandmarkDetectionConfigWindow.cs | 2 +- .../Samples/UI/Objects/Console Window.prefab | 512 ------------ .../Samples/UI/Objects/Console/Console.prefab | 777 ------------------ .../UI/Objects/Console/Console.prefab.meta | 7 - .../UI/Objects/Console/Log Line.prefab | 320 -------- .../UI/Objects/Console/Log Line.prefab.meta | 7 - .../Samples/UI/Objects/Main Canvas.prefab | 681 ++++----------- .../Samples/UI/Scripts/GUIConsole.cs | 109 --- .../Samples/UI/Scripts/GUIConsole.cs.meta | 11 - .../Samples/UI/Scripts/GlobalConfig.cs | 76 -- .../Samples/UI/Scripts/GlobalConfig.cs.meta | 11 - .../Samples/UI/Scripts/ImageSourceConfig.cs | 4 +- .../Samples/UI/Scripts/LogLine.cs | 75 -- .../Samples/UI/Scripts/LogLine.cs.meta | 11 - .../Samples/UI/Scripts/Modal.cs | 4 +- .../Samples/UI/Scripts/ModalButton.cs | 2 +- .../Samples/UI/Scripts/ModalContents.cs | 2 +- .../Samples/UI/Scripts/SolutionMenu.cs | 14 +- .../com.github.homuler.mediapipe/package.json | 3 +- ProjectSettings/EditorBuildSettings.asset | 3 - README.md | 2 +- 89 files changed, 1732 insertions(+), 5123 deletions(-) create mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs rename Assets/MediaPipeUnity/Samples/Common/Scripts/{StartSceneController.cs.meta => AppSettings.cs.meta} (83%) delete mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs delete mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs.meta delete mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs delete mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs.meta delete mode 100644 Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs rename Assets/MediaPipeUnity/Samples/{UI/Objects/Console.meta => Resources.meta} (77%) create mode 100644 Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab rename Assets/MediaPipeUnity/Samples/{UI/Objects/Console Window.prefab.meta => Resources/Bootstrap.prefab.meta} (74%) create mode 100644 Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset rename Assets/MediaPipeUnity/Samples/Scenes/{Start Scene.unity.meta => AppSettings.asset.meta} (52%) delete mode 100644 Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab.meta delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab.meta delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs.meta delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs.meta delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs delete mode 100644 Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs.meta diff --git a/Assets/MediaPipeUnity/Editor/PackageExporter.cs b/Assets/MediaPipeUnity/Editor/PackageExporter.cs index eb7563ac0..4eeef6cca 100644 --- a/Assets/MediaPipeUnity/Editor/PackageExporter.cs +++ b/Assets/MediaPipeUnity/Editor/PackageExporter.cs @@ -42,8 +42,7 @@ public static void Export() var pluginAssets = EnumerateAssets(Path.Combine("Packages", "com.github.homuler.mediapipe")) .Append(Path.Combine("Packages", "com.github.homuler.mediapipe", "Runtime", "Plugins", "iOS", "MediaPipeUnity.framework")); - var sampleAssets = EnumerateAssets(Path.Combine("Assets", "MediaPipeUnity", "Samples"), new string[] { ".cs", ".unity" }) - .Where(x => Path.GetFileName(x) != "Start Scene.unity"); // exclude the 'Start Scene' + var sampleAssets = EnumerateAssets(Path.Combine("Assets", "MediaPipeUnity", "Samples"), new string[] { ".cs", ".unity" }); var tutorialAssets = EnumerateAssets(Path.Combine("Assets", "MediaPipeUnity", "Tutorial")); // export all the files var assets = pluginAssets.Concat(sampleAssets).Concat(tutorialAssets).ToArray(); diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs new file mode 100644 index 000000000..0f7cfb9f8 --- /dev/null +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs @@ -0,0 +1,87 @@ +// Copyright (c) 2021 homuler +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file or at +// https://opensource.org/licenses/MIT. + +using System; +using UnityEngine; +using UnityEngine.Video; + +namespace Mediapipe.Unity.Sample +{ + [Serializable] + public class AppSettings : ScriptableObject + { + [Serializable] + public enum AssetLoaderType + { + StreamingAssets, + AssetBundle, + Local, + } + + [SerializeField] private ImageSourceType _defaultImageSource; + [SerializeField] private InferenceMode _preferableInferenceMode; + [SerializeField] private AssetLoaderType _assetLoaderType; + [SerializeField] private Logger.LogLevel _logLevel = Logger.LogLevel.Debug; + + [Header("Glog settings")] + [SerializeField] private int _glogMinloglevel = Glog.Minloglevel; + [SerializeField] private int _glogStderrthreshold = Glog.Stderrthreshold; + [SerializeField] private int _glogV = Glog.V; + + [Header("WebCam Source")] + [Tooltip("For the default resolution, the one whose width is closest to this value will be chosen")] + + [SerializeField] private int _preferredDefaultWebCamWidth = 1280; + [SerializeField] private ImageSource.ResolutionStruct[] _defaultAvailableWebCamResolutions = new ImageSource.ResolutionStruct[] { + new ImageSource.ResolutionStruct(176, 144, 30), + new ImageSource.ResolutionStruct(320, 240, 30), + new ImageSource.ResolutionStruct(424, 240, 30), + new ImageSource.ResolutionStruct(640, 360, 30), + new ImageSource.ResolutionStruct(640, 480, 30), + new ImageSource.ResolutionStruct(848, 480, 30), + new ImageSource.ResolutionStruct(960, 540, 30), + new ImageSource.ResolutionStruct(1280, 720, 30), + new ImageSource.ResolutionStruct(1600, 896, 30), + new ImageSource.ResolutionStruct(1920, 1080, 30), + }; + + [Header("Static Image Source")] + [SerializeField] private Texture[] _availableStaticImageSources; + [SerializeField] private ImageSource.ResolutionStruct[] _defaultAvailableStaticImageResolutions = new ImageSource.ResolutionStruct[] { + new ImageSource.ResolutionStruct(512, 512, 0), + new ImageSource.ResolutionStruct(640, 480, 0), + new ImageSource.ResolutionStruct(1280, 720, 0), + }; + + [Header("Video Source")] + [SerializeField] private VideoClip[] _availableVideoSources; + + public ImageSourceType defaultImageSource => _defaultImageSource; + public InferenceMode preferableInferenceMode => _preferableInferenceMode; + public AssetLoaderType assetLoaderType => _assetLoaderType; + public Logger.LogLevel logLevel => _logLevel; + + public void ResetGlogFlags() + { + Glog.Logtostderr = true; + Glog.Minloglevel = _glogMinloglevel; + Glog.Stderrthreshold = _glogStderrthreshold; + Glog.V = _glogV; + } + + public WebCamSource BuildWebCamSource() => new WebCamSource( + _preferredDefaultWebCamWidth, + _defaultAvailableWebCamResolutions + ); + + public StaticImageSource BuildStaticImageSource() => new StaticImageSource( + _availableStaticImageSources, + _defaultAvailableStaticImageResolutions + ); + + public VideoSource BuildVideoSource() => new VideoSource(_availableVideoSources); + } +} diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs.meta b/Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs.meta similarity index 83% rename from Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs.meta rename to Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs.meta index dc3b2dfab..d44675d80 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs.meta +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/AppSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2ca6b5afaa693af02957f0d68cf058d9 +guid: fdd967c0e52e7b13f80827e23283472e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs index 9fa7084aa..3c4182b6d 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs @@ -5,27 +5,13 @@ // https://opensource.org/licenses/MIT. using System.Collections; -using System.IO; using UnityEngine; -namespace Mediapipe.Unity +namespace Mediapipe.Unity.Sample { public class Bootstrap : MonoBehaviour { - [System.Serializable] - public enum AssetLoaderType - { - StreamingAssets, - AssetBundle, - Local, - } - - private const string _TAG = nameof(Bootstrap); - - [SerializeField] private ImageSourceType _defaultImageSource; - [SerializeField] private InferenceMode _preferableInferenceMode; - [SerializeField] private AssetLoaderType _assetLoaderType; - [SerializeField] private bool _enableGlog = true; + [SerializeField] private AppSettings _appSettings; public InferenceMode inferenceMode { get; private set; } public bool isFinished { get; private set; } @@ -38,54 +24,45 @@ private void OnEnable() private IEnumerator Init() { - Logger.SetLogger(new MemoizedLogger(100)); - Logger.MinLogLevel = Logger.LogLevel.Debug; +#if !DEBUG && !DEVELOPMENT_BUILD + Debug.LogWarning("Logging for the MediaPipeUnityPlugin will be suppressed. To enable logging, please check the 'Development Build' option and build."); +#endif - Protobuf.SetLogHandler(Protobuf.DefaultLogHandler); + Logger.MinLogLevel = _appSettings.logLevel; - Logger.LogInfo(_TAG, "Setting global flags..."); - GlobalConfigManager.SetFlags(); + Protobuf.SetLogHandler(Protobuf.DefaultLogHandler); - if (_enableGlog) - { - if (Glog.LogDir != null) - { - if (!Directory.Exists(Glog.LogDir)) - { - Directory.CreateDirectory(Glog.LogDir); - } - Logger.LogVerbose(_TAG, $"Glog will output files under {Glog.LogDir}"); - } - Glog.Initialize("MediaPipeUnityPlugin"); - _isGlogInitialized = true; - } + Debug.Log("Setting global flags..."); + _appSettings.ResetGlogFlags(); + Glog.Initialize("MediaPipeUnityPlugin"); + _isGlogInitialized = true; - Logger.LogInfo(_TAG, "Initializing AssetLoader..."); - switch (_assetLoaderType) + Debug.Log("Initializing AssetLoader..."); + switch (_appSettings.assetLoaderType) { - case AssetLoaderType.AssetBundle: + case AppSettings.AssetLoaderType.AssetBundle: { AssetLoader.Provide(new AssetBundleResourceManager("mediapipe")); break; } - case AssetLoaderType.StreamingAssets: + case AppSettings.AssetLoaderType.StreamingAssets: { AssetLoader.Provide(new StreamingAssetsResourceManager()); break; } - case AssetLoaderType.Local: + case AppSettings.AssetLoaderType.Local: { #if UNITY_EDITOR AssetLoader.Provide(new LocalResourceManager()); break; #else - Logger.LogError("LocalResourceManager is only supported on UnityEditor"); + Debug.LogError("LocalResourceManager is only supported on UnityEditor"); yield break; #endif } default: { - Logger.LogError($"AssetLoaderType is unknown: {_assetLoaderType}"); + Debug.LogError($"AssetLoaderType is unknown: {_appSettings.assetLoaderType}"); yield break; } } @@ -93,54 +70,32 @@ private IEnumerator Init() DecideInferenceMode(); if (inferenceMode == InferenceMode.GPU) { - Logger.LogInfo(_TAG, "Initializing GPU resources..."); + Debug.Log("Initializing GPU resources..."); yield return GpuManager.Initialize(); if (!GpuManager.IsInitialized) { - Logger.LogWarning("If your native library is built for CPU, change 'Preferable Inference Mode' to CPU from the Inspector Window for Bootstrap"); + Debug.LogWarning("If your native library is built for CPU, change 'Preferable Inference Mode' to CPU from the Inspector Window for AppSettings"); } } - Logger.LogInfo(_TAG, "Preparing ImageSource..."); - ImageSourceProvider.ImageSource = GetImageSource(_defaultImageSource); + Debug.Log("Preparing ImageSource..."); + ImageSourceProvider.Initialize( + _appSettings.BuildWebCamSource(), _appSettings.BuildStaticImageSource(), _appSettings.BuildVideoSource()); + ImageSourceProvider.Switch(_appSettings.defaultImageSource); isFinished = true; } - public ImageSource GetImageSource(ImageSourceType imageSourceType) - { - switch (imageSourceType) - { - case ImageSourceType.WebCamera: - { - return GetComponent(); - } - case ImageSourceType.Image: - { - return GetComponent(); - } - case ImageSourceType.Video: - { - return GetComponent(); - } - case ImageSourceType.Unknown: - default: - { - throw new System.ArgumentException($"Unsupported source type: {imageSourceType}"); - } - } - } - private void DecideInferenceMode() { #if UNITY_EDITOR_OSX || UNITY_EDITOR_WIN - if (_preferableInferenceMode == InferenceMode.GPU) { - Logger.LogWarning(_TAG, "Current platform does not support GPU inference mode, so falling back to CPU mode"); + if (_appSettings.preferableInferenceMode == InferenceMode.GPU) { + Debug.LogWarning("Current platform does not support GPU inference mode, so falling back to CPU mode"); } inferenceMode = InferenceMode.CPU; #else - inferenceMode = _preferableInferenceMode; + inferenceMode = _appSettings.preferableInferenceMode; #endif } @@ -154,7 +109,6 @@ private void OnApplicationQuit() } Protobuf.ResetLogHandler(); - Logger.SetLogger(null); } } } diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs deleted file mode 100644 index 169a74e9d..000000000 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using System.Collections.Generic; -using System.IO; -using System.Text; -using UnityEngine; - -namespace Mediapipe.Unity -{ - public static class GlobalConfigManager - { - private const string _TAG = nameof(GlobalConfigManager); - - private static string CacheDirPath => Path.Combine(Application.persistentDataPath, "Cache"); - - private static string ConfigFilePath => Path.Combine(CacheDirPath, "globalConfig.env"); - - private const string _GlogLogtostderrKey = "GLOG_logtostderr"; - private const string _GlogStderrthresholdKey = "GLOG_stderrthreshold"; - private const string _GlogMinloglevelKey = "GLOG_minloglevel"; - private const string _GlogVKey = "GLOG_v"; - private const string _GlogLogDirKey = "GLOG_log_dir"; - - public static bool GlogLogtostderr - { - get => Config[_GlogLogtostderrKey] == "1"; - set => Config[_GlogLogtostderrKey] = value ? "1" : "0"; - } - - public static int GlogStderrthreshold - { - get => int.Parse(Config[_GlogStderrthresholdKey]); - set => Config[_GlogStderrthresholdKey] = value.ToString(); - } - - public static int GlogMinloglevel - { - get => int.Parse(Config[_GlogMinloglevelKey]); - set => Config[_GlogMinloglevelKey] = value.ToString(); - } - - public static int GlogV - { - get => int.Parse(Config[_GlogVKey]); - set => Config[_GlogVKey] = value.ToString(); - } - - public static string GlogLogDir - { - get => Config[_GlogLogDirKey]; - set => Config[_GlogLogDirKey] = value; - } - - private static Dictionary _Config; - private static Dictionary Config - { - get - { - if (_Config == null) - { - _Config = new Dictionary() { - { _GlogLogtostderrKey, "1" }, - { _GlogStderrthresholdKey, "2" }, - { _GlogMinloglevelKey, "0" }, - { _GlogLogDirKey, "" }, - { _GlogVKey, "0" }, - }; - - if (!File.Exists(ConfigFilePath)) - { - Logger.LogDebug(_TAG, $"Global config file does not exist: {ConfigFilePath}"); - } - else - { - Logger.LogDebug(_TAG, $"Reading the config file ({ConfigFilePath})..."); - foreach (var line in File.ReadLines(ConfigFilePath)) - { - try - { - var pair = ParseLine(line); - _Config[pair.Item1] = pair.Item2; - } - catch (System.Exception e) - { - Logger.LogWarning($"{e}"); - } - } - } - } - - return _Config; - } - } - - public static void Commit() - { - string[] lines = { - $"{_GlogLogtostderrKey}={(GlogLogtostderr ? "1" : "0")}", - $"{_GlogStderrthresholdKey}={GlogStderrthreshold}", - $"{_GlogMinloglevelKey}={GlogMinloglevel}", - $"{_GlogLogDirKey}={GlogLogDir}", - $"{_GlogVKey}={GlogV}", - }; - if (!Directory.Exists(CacheDirPath)) - { - var _ = Directory.CreateDirectory(CacheDirPath); - } - File.WriteAllLines(ConfigFilePath, lines, Encoding.UTF8); - Logger.LogInfo(_TAG, "Global config file has been updated"); - } - - public static void SetFlags() - { - Glog.Logtostderr = GlogLogtostderr; - Glog.Stderrthreshold = GlogStderrthreshold; - Glog.Minloglevel = GlogMinloglevel; - Glog.V = GlogV; - Glog.LogDir = GlogLogDir == "" ? null : Path.Combine(Application.persistentDataPath, GlogLogDir); - } - - private static (string, string) ParseLine(string line) - { - var i = line.IndexOf('='); - - if (i < 0) - { - throw new System.FormatException("Each line in global config file must include '=', but not found"); - } - - var key = line.Substring(0, i); - var value = line.Substring(i + 1); - - return (key, value); - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs.meta b/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs.meta deleted file mode 100644 index d5d90bc55..000000000 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/GlobalConfigManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9b93a8796afa16fd68ef2325d00d4d9a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/ImageSource.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/ImageSource.cs index 8e19625e0..e434ede74 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/ImageSource.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/ImageSource.cs @@ -11,7 +11,7 @@ namespace Mediapipe.Unity { - public abstract class ImageSource : MonoBehaviour + public abstract class ImageSource { [Serializable] public struct ResolutionStruct diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/StaticImageSource.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/StaticImageSource.cs index b7ed72efc..78741f4c5 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/StaticImageSource.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/StaticImageSource.cs @@ -22,6 +22,12 @@ public class StaticImageSource : ImageSource new ResolutionStruct(1280, 720, 0), }; + public StaticImageSource(Texture[] availableSources, ResolutionStruct[] defaultAvailableResolutions) + { + _availableSources = availableSources; + _defaultAvailableResolutions = defaultAvailableResolutions; + } + private Texture2D _outputTexture; private Texture _image; private Texture image diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/VideoSource.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/VideoSource.cs index e382c6cfc..c5ac76732 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/VideoSource.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/VideoSource.cs @@ -14,7 +14,16 @@ namespace Mediapipe.Unity { public class VideoSource : ImageSource { - [SerializeField] private VideoClip[] _availableSources; + private readonly VideoClip[] _availableSources; + + // gameObject is used to add VideoPlayer component + private readonly GameObject _gameObject; + + public VideoSource(VideoClip[] availableSources) + { + _availableSources = availableSources; + _gameObject = new GameObject("Video Player"); + } private VideoClip _video; private VideoClip video @@ -65,7 +74,7 @@ public override IEnumerator Play() { throw new InvalidOperationException("Video is not selected"); } - _videoPlayer = gameObject.AddComponent(); + _videoPlayer = _gameObject.AddComponent(); _videoPlayer.renderMode = VideoRenderMode.APIOnly; _videoPlayer.isLooping = true; _videoPlayer.clip = video; @@ -104,13 +113,10 @@ public override void Stop() return; } _videoPlayer.Stop(); - Destroy(gameObject.GetComponent()); + UnityEngine.Object.Destroy(_videoPlayer); _videoPlayer = null; } - public override Texture GetCurrentTexture() - { - return _videoPlayer != null ? _videoPlayer.texture : null; - } + public override Texture GetCurrentTexture() => _videoPlayer != null ? _videoPlayer.texture : null; } } diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/WebCamSource.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/WebCamSource.cs index 59c3d2d98..264f6f184 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/WebCamSource.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/WebCamSource.cs @@ -18,24 +18,17 @@ namespace Mediapipe.Unity { public class WebCamSource : ImageSource { - [Tooltip("For the default resolution, the one whose width is closest to this value will be chosen")] - [SerializeField] private int _preferableDefaultWidth = 1280; + private readonly int _preferableDefaultWidth = 1280; private const string _TAG = nameof(WebCamSource); - [SerializeField] - private ResolutionStruct[] _defaultAvailableResolutions = new ResolutionStruct[] { - new ResolutionStruct(176, 144, 30), - new ResolutionStruct(320, 240, 30), - new ResolutionStruct(424, 240, 30), - new ResolutionStruct(640, 360, 30), - new ResolutionStruct(640, 480, 30), - new ResolutionStruct(848, 480, 30), - new ResolutionStruct(960, 540, 30), - new ResolutionStruct(1280, 720, 30), - new ResolutionStruct(1600, 896, 30), - new ResolutionStruct(1920, 1080, 30), - }; + private readonly ResolutionStruct[] _defaultAvailableResolutions; + + public WebCamSource(int preferableDefaultWidth, ResolutionStruct[] defaultAvailableResolutions) + { + _preferableDefaultWidth = preferableDefaultWidth; + _defaultAvailableResolutions = defaultAvailableResolutions; + } private static readonly object _PermissionLock = new object(); private static bool _IsPermitted = false; @@ -120,15 +113,13 @@ public override ResolutionStruct[] availableResolutions public override bool isPrepared => webCamTexture != null; public override bool isPlaying => webCamTexture != null && webCamTexture.isPlaying; - private bool _isInitialized; - private IEnumerator Start() + private IEnumerator Initialize() { yield return GetPermission(); if (!_IsPermitted) { - _isInitialized = true; yield break; } @@ -138,8 +129,6 @@ private IEnumerator Start() { webCamDevice = availableSources[0]; } - - _isInitialized = true; } private IEnumerator GetPermission() @@ -193,7 +182,7 @@ public override void SelectSource(int sourceId) public override IEnumerator Play() { - yield return new WaitUntil(() => _isInitialized); + yield return Initialize(); if (!_IsPermitted) { throw new InvalidOperationException("Not permitted to access cameras"); @@ -234,10 +223,7 @@ public override void Stop() webCamTexture = null; } - public override Texture GetCurrentTexture() - { - return webCamTexture; - } + public override Texture GetCurrentTexture() => webCamTexture; private ResolutionStruct GetDefaultResolution() { diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceProvider.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceProvider.cs index 48c8ac58d..f7b8ee5cc 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceProvider.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceProvider.cs @@ -4,42 +4,68 @@ // license that can be found in the LICENSE file or at // https://opensource.org/licenses/MIT. -namespace Mediapipe.Unity +namespace Mediapipe.Unity.Sample { public static class ImageSourceProvider { - private static ImageSource _ImageSource; - public static ImageSource ImageSource - { - get => _ImageSource; - set - { - if (value != null && !value.enabled) - { - value.enabled = true; - } - _ImageSource = value; - } - } + private static WebCamSource _WebCamSource; + private static StaticImageSource _StaticImageSource; + private static VideoSource _VideoSource; + + public static ImageSource ImageSource { get; private set; } public static ImageSourceType CurrentSourceType { get { - if (_ImageSource is WebCamSource) + if (ImageSource is WebCamSource) { return ImageSourceType.WebCamera; } - if (_ImageSource is StaticImageSource) + if (ImageSource is StaticImageSource) { return ImageSourceType.Image; } - if (_ImageSource is VideoSource) + if (ImageSource is VideoSource) { return ImageSourceType.Video; } return ImageSourceType.Unknown; } } + + internal static void Initialize(WebCamSource webCamSource, StaticImageSource staticImageSource, VideoSource videoSource) + { + _WebCamSource = webCamSource; + _StaticImageSource = staticImageSource; + _VideoSource = videoSource; + } + + public static void Switch(ImageSourceType imageSourceType) + { + switch (imageSourceType) + { + case ImageSourceType.WebCamera: + { + ImageSource = _WebCamSource; + break; + } + case ImageSourceType.Image: + { + ImageSource = _StaticImageSource; + break; + } + case ImageSourceType.Video: + { + ImageSource = _VideoSource; + break; + } + case ImageSourceType.Unknown: + default: + { + throw new System.ArgumentException($"Unsupported source type: {imageSourceType}"); + } + } + } } } diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceSolution.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceSolution.cs index 25b902824..ee90db1db 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSourceSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity +namespace Mediapipe.Unity.Sample { public abstract class ImageSourceSolution : Solution where T : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs deleted file mode 100644 index 6cd8f48d2..000000000 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs +++ /dev/null @@ -1,264 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using LogLevel = Mediapipe.Unity.Logger.LogLevel; - -namespace Mediapipe.Unity -{ - public class MemoizedLogger : IExtendedLogger - { - public readonly struct LogStruct - { - public readonly LogLevel logLevel; - public readonly string tag; - public readonly object message; - public readonly DateTime utcTime; - - public LogStruct(LogLevel logLevel, string tag, object message) - { - this.logLevel = logLevel; - this.tag = tag; - this.message = message; - utcTime = DateTime.UtcNow; - } - - public LogStruct(LogType logType, string tag, object message) : this(GetLogLevelFromLogType(logType), tag, message) { } - - private static LogLevel GetLogLevelFromLogType(LogType logType) - { - switch (logType) - { - case LogType.Error: - case LogType.Exception: - { - return LogLevel.Error; - } - case LogType.Warning: - { - return LogLevel.Warn; - } - case LogType.Assert: - case LogType.Log: - default: - { - return LogLevel.Info; - } - } - } - } - - public MemoizedLogger(int historySize = 0) - { - this.historySize = historySize; - } - - private int _historySize; - public int historySize - { - get => _historySize; - set - { - _historySize = value; - - while (_historySize < histories.Count) - { - var _ = histories.Dequeue(); - } - } - } - - private Queue _histories; - public Queue histories - { - get - { - if (_histories == null) - { - _histories = new Queue(_historySize); - } - return _histories; - } - } - - public delegate void LogOutputEventHandler(LogStruct logStruct); - public event LogOutputEventHandler OnLogOutput; - - private readonly ILogger _logger = Debug.unityLogger; - - public LogType filterLogType - { - get => _logger.filterLogType; - set => _logger.filterLogType = value; - } - - public bool logEnabled - { - get => _logger.logEnabled; - set => _logger.logEnabled = value; - } - - public ILogHandler logHandler - { - get => _logger.logHandler; - set => _logger.logHandler = value; - } - - public bool IsLogTypeAllowed(LogType logType) - { - return true; - } - - public void Log(object message) - { - _logger.Log(message); - RecordInfoLog(null, message); - } - - public void Log(string tag, object message) - { - _logger.Log(tag, message); - RecordInfoLog(tag, message); - } - - public void Log(string tag, object message, UnityEngine.Object context) - { - _logger.Log(tag, message, context); - RecordInfoLog(tag, message); - } - - public void Log(LogType logType, object message) - { - _logger.Log(logType, message); - RecordLog(logType, null, message); - } - - public void Log(LogType logType, object message, UnityEngine.Object context) - { - _logger.Log(logType, message, context); - RecordLog(logType, null, message); - } - - public void Log(LogType logType, string tag, object message) - { - _logger.Log(logType, tag, message); - RecordLog(logType, tag, message); - } - - public void Log(LogType logType, string tag, object message, UnityEngine.Object context) - { - _logger.Log(logType, tag, message, context); - RecordLog(logType, tag, message); - } - - public void Log(LogLevel logLevel, string tag, object message, UnityEngine.Object context) - { - _logger.Log(logLevel.GetLogType(), tag, message, context); - RecordLog(new LogStruct(logLevel, tag, message)); - } - - public void Log(LogLevel logLevel, string tag, object message) - { - _logger.Log(logLevel.GetLogType(), tag, message); - RecordLog(new LogStruct(logLevel, tag, message)); - } - - public void Log(LogLevel logLevel, object message, UnityEngine.Object context) - { - _logger.Log(logLevel.GetLogType(), message, context); - RecordLog(new LogStruct(logLevel, null, message)); - } - - public void Log(LogLevel logLevel, object message) - { - _logger.Log(logLevel.GetLogType(), message); - RecordLog(new LogStruct(logLevel, null, message)); - } - - public void LogWarning(string tag, object message) - { - _logger.LogWarning(tag, message); - RecordWarnLog(tag, message); - } - - public void LogWarning(string tag, object message, UnityEngine.Object context) - { - _logger.LogWarning(tag, message, context); - RecordWarnLog(tag, message); - } - - public void LogError(string tag, object message) - { - _logger.LogError(tag, message); - RecordErrorLog(tag, message); - } - - public void LogError(string tag, object message, UnityEngine.Object context) - { - _logger.LogError(tag, message, context); - RecordErrorLog(tag, message); - } - - public void LogFormat(LogType logType, string format, params object[] args) - { - _logger.LogFormat(logType, format, args); - } - - public void LogFormat(LogType logType, UnityEngine.Object context, string format, params object[] args) - { - _logger.LogFormat(logType, context, format, args); - } - - public void LogException(Exception exception) - { - _logger.LogException(exception); - RecordErrorLog(null, exception); - } - - public void LogException(Exception exception, UnityEngine.Object context) - { - _logger.LogException(exception, context); - RecordErrorLog(null, exception); - } - - public void RecordLog(LogStruct log) - { - lock (((ICollection)histories).SyncRoot) - { - while (histories.Count > 0 && _historySize <= histories.Count) - { - var _ = histories.Dequeue(); - } - histories.Enqueue(log); - OnLogOutput?.Invoke(log); - } - } - - private void RecordLog(LogType logType, string tag, object message) - { - RecordLog(new LogStruct(logType, tag, message)); - } - - private void RecordInfoLog(string tag, object message) - { - RecordLog(new LogStruct(LogLevel.Info, tag, message)); - } - - private void RecordWarnLog(string tag, object message) - { - RecordLog(new LogStruct(LogLevel.Warn, tag, message)); - } - - private void RecordErrorLog(string tag, object message) - { - RecordLog(new LogStruct(LogLevel.Error, tag, message)); - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs.meta b/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs.meta deleted file mode 100644 index f1015c27b..000000000 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/MemoizedLogger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 00164446b902a4f99ae323de716782fe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/Solution.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/Solution.cs index 813c66ae9..61b772dba 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/Solution.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/Solution.cs @@ -7,16 +7,20 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity +namespace Mediapipe.Unity.Sample { public abstract class Solution : MonoBehaviour { + private static readonly string _BootstrapName = nameof(Bootstrap); + + [SerializeField] private GameObject _bootstrapPrefab; + #pragma warning disable IDE1006 // TODO: make it static protected virtual string TAG => GetType().Name; #pragma warning restore IDE1006 - public Bootstrap bootstrap; + public Bootstrap bootstrap { get; private set; } protected bool isPaused; protected virtual IEnumerator Start() @@ -90,28 +94,17 @@ protected static void ReadFromImageSource(ImageSource imageSource, TextureFrame protected Bootstrap FindBootstrap() { - var bootstrapObj = GameObject.Find("Bootstrap"); + var bootstrapObj = GameObject.Find(_BootstrapName); - if (bootstrapObj != null) + if (bootstrapObj == null) { - return bootstrapObj.GetComponent(); + Debug.Log("Initializing the Bootstrap GameObject"); + bootstrapObj = Instantiate(_bootstrapPrefab); + bootstrapObj.name = _BootstrapName; + DontDestroyOnLoad(bootstrapObj); } - Logger.LogWarning(TAG, "Global Bootstrap instance is not found (maybe running a sample scene directly), " - + "so activating a fallback Bootstrap instance attached to each Solution object"); - - var bootstrap = GetComponent(); - bootstrap.enabled = true; - - // hide menu button when trying a single scene. - DisableMenuButton(); - return bootstrap; - } - - private void DisableMenuButton() - { - var menuButton = GameObject.Find("MenuButton"); - menuButton.SetActive(false); + return bootstrapObj.GetComponent(); } } } diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs deleted file mode 100644 index a7fb6e5a1..000000000 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/StartSceneController.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using System.Collections; -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace Mediapipe.Unity -{ - public class StartSceneController : MonoBehaviour - { - private const string _TAG = nameof(Bootstrap); - - [SerializeField] private UnityEngine.UI.Image _screen; - [SerializeField] private GameObject _consolePrefab; - - private IEnumerator Start() - { - var _ = Instantiate(_consolePrefab, _screen.transform); - - var bootstrap = GetComponent(); - - yield return new WaitUntil(() => bootstrap.isFinished); - - DontDestroyOnLoad(gameObject); - - Logger.LogInfo(_TAG, "Loading the first scene..."); - var sceneLoadReq = SceneManager.LoadSceneAsync(1); - yield return new WaitUntil(() => sceneLoadReq.isDone); - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/TaskApiRunner.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/TaskApiRunner.cs index 224c844ea..f504a93cf 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/TaskApiRunner.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/TaskApiRunner.cs @@ -14,6 +14,10 @@ namespace Mediapipe.Unity.Sample { public abstract class TaskApiRunner : MonoBehaviour { + private static readonly string _BootstrapName = nameof(Bootstrap); + + [SerializeField] private GameObject _bootstrapPrefab; + #pragma warning disable IDE1006 // TODO: make it static protected virtual string TAG => GetType().Name; @@ -73,26 +77,15 @@ protected Bootstrap FindBootstrap() { var bootstrapObj = GameObject.Find("Bootstrap"); - if (bootstrapObj != null) + if (bootstrapObj == null) { - return bootstrapObj.GetComponent(); + Debug.Log("Initializing the Bootstrap GameObject"); + bootstrapObj = Instantiate(_bootstrapPrefab); + bootstrapObj.name = _BootstrapName; + DontDestroyOnLoad(bootstrapObj); } - Logger.LogWarning(TAG, "Global Bootstrap instance is not found (maybe running a sample scene directly), " - + "so activating a fallback Bootstrap instance attached to each Solution object"); - - var bootstrap = GetComponent(); - bootstrap.enabled = true; - - // hide menu button when trying a single scene. - DisableMenuButton(); - return bootstrap; - } - - private void DisableMenuButton() - { - var menuButton = GameObject.Find("MenuButton"); - menuButton.SetActive(false); + return bootstrapObj.GetComponent(); } } } diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console.meta b/Assets/MediaPipeUnity/Samples/Resources.meta similarity index 77% rename from Assets/MediaPipeUnity/Samples/UI/Objects/Console.meta rename to Assets/MediaPipeUnity/Samples/Resources.meta index d73d9b109..3bb55dafe 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console.meta +++ b/Assets/MediaPipeUnity/Samples/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac1e8dd4404b79885b2d69cf91d54d46 +guid: 1af8680aee68e09febf9af920fb46ac0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab b/Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab new file mode 100644 index 000000000..478c0bf08 --- /dev/null +++ b/Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &968918444066301895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 466088289947882567} + - component: {fileID: 1399753306286750402} + m_Layer: 0 + m_Name: Bootstrap + m_TagString: Global Resource + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &466088289947882567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968918444066301895} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1399753306286750402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968918444066301895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} + m_Name: + m_EditorClassIdentifier: + _appSettings: {fileID: 11400000, guid: c1dea6c0f46f82342ac6b11989a0fb74, type: 2} diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab.meta b/Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab.meta similarity index 74% rename from Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab.meta rename to Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab.meta index 5609ba357..d4121360d 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab.meta +++ b/Assets/MediaPipeUnity/Samples/Resources/Bootstrap.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5920f5c607ecc6ea88b86fbecab72418 +guid: 1146a9de09159a948b683e94fb3d3c95 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset b/Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset new file mode 100644 index 000000000..8b1ca4378 --- /dev/null +++ b/Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdd967c0e52e7b13f80827e23283472e, type: 3} + m_Name: AppSettings + m_EditorClassIdentifier: + _defaultImageSource: 0 + _preferableInferenceMode: 0 + _assetLoaderType: 0 + _logLevel: 5 + _glogMinloglevel: 0 + _glogStderrthreshold: 2 + _glogV: 0 + _preferredDefaultWebCamWidth: 1280 + _defaultAvailableWebCamResolutions: + - width: 176 + height: 144 + frameRate: 30 + - width: 320 + height: 240 + frameRate: 30 + - width: 424 + height: 240 + frameRate: 30 + - width: 640 + height: 360 + frameRate: 30 + - width: 640 + height: 480 + frameRate: 30 + - width: 848 + height: 480 + frameRate: 30 + - width: 960 + height: 540 + frameRate: 30 + - width: 1280 + height: 720 + frameRate: 30 + - width: 1600 + height: 896 + frameRate: 30 + - width: 1920 + height: 1080 + frameRate: 30 + _availableStaticImageSources: [] + _defaultAvailableStaticImageResolutions: + - width: 512 + height: 512 + frameRate: 0 + - width: 640 + height: 480 + frameRate: 0 + - width: 1280 + height: 720 + frameRate: 0 + _availableVideoSources: + - {fileID: 32900000, guid: 56e0345cf6a6fcda3a013db92f9d6c01, type: 3} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity.meta b/Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset.meta similarity index 52% rename from Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity.meta rename to Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset.meta index d534c9c05..9bbad3ed2 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity.meta +++ b/Assets/MediaPipeUnity/Samples/Scenes/AppSettings.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: f7b359c19e6ae2d208e5ca4608b7c0b8 -DefaultImporter: +guid: c1dea6c0f46f82342ac6b11989a0fb74 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/Face Detection.unity b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/Face Detection.unity index a44494022..5b9f36a2b 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/Face Detection.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/Face Detection.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1006057041} m_Modifications: - target: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, @@ -191,6 +192,9 @@ PrefabInstance: value: FaceDetections Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26114bc9cccb92454a468ea4d41f400a, type: 3} --- !u!114 &338992142 stripped MonoBehaviour: @@ -204,6 +208,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d433cdb024dfd584696eeb11efb71102, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &338992143 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, + type: 3} + m_PrefabInstance: {fileID: 338992141} + m_PrefabAsset: {fileID: 0} --- !u!1 &420786853 GameObject: m_ObjectHideFlags: 0 @@ -234,6 +244,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -263,18 +274,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420786853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1006057040 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8571076842648159878} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -388,6 +401,17 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338992143} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1006057044} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &1006057041 stripped Transform: @@ -427,6 +451,12 @@ MonoBehaviour: m_EditorClassIdentifier: annotation: {fileID: 338992142} _threshold: 0 +--- !u!224 &1006057045 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 1006057040} + m_PrefabAsset: {fileID: 0} --- !u!1 &1064799459 GameObject: m_ObjectHideFlags: 0 @@ -439,10 +469,6 @@ GameObject: - component: {fileID: 1064799460} - component: {fileID: 1064799462} - component: {fileID: 1064799463} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -462,7 +488,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90c6d9633837e7c06aeaebb5b7ba866a, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1006057043} graphRunner: {fileID: 1064799462} textureFramePool: {fileID: 1064799463} @@ -475,12 +502,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064799459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064799462 MonoBehaviour: @@ -512,102 +540,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &1806680259 GameObject: m_ObjectHideFlags: 0 @@ -694,12 +626,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806680259} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1969388814 GameObject: @@ -741,9 +674,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -777,18 +718,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969388814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8571076842648159877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1029,6 +972,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1006057045} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &8571076842648159878 stripped RectTransform: @@ -1036,3 +986,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8571076842648159877} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1969388817} + - {fileID: 1806680261} + - {fileID: 8571076842648159877} + - {fileID: 420786856} + - {fileID: 1064799461} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionConfig.cs index 324b4e955..de264d305 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.FaceDetection.UI +namespace Mediapipe.Unity.Sample.FaceDetection.UI { public class FaceDetectionConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs index 72df179d1..58162e90b 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs @@ -9,9 +9,7 @@ using System.Linq; using UnityEngine; -using Google.Protobuf; - -namespace Mediapipe.Unity.FaceDetection +namespace Mediapipe.Unity.Sample.FaceDetection { public class FaceDetectionGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionSolution.cs index fbd963178..0263b8fe6 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionSolution.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Mediapipe.Unity.FaceDetection +namespace Mediapipe.Unity.Sample.FaceDetection { public class FaceDetectionSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/Face Mesh.unity b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/Face Mesh.unity index 81ac9061d..263a403c1 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/Face Mesh.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/Face Mesh.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1324426573} m_Modifications: - target: {fileID: 5403310940259726730, guid: 2e1291ddc10af56d4be1551cc630d40b, @@ -191,6 +192,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e1291ddc10af56d4be1551cc630d40b, type: 3} --- !u!114 &64875045 stripped MonoBehaviour: @@ -204,6 +208,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1ec0e202f29d7ee28cccba68415d95b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &64875046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5403310940259726732, guid: 2e1291ddc10af56d4be1551cc630d40b, + type: 3} + m_PrefabInstance: {fileID: 64875044} + m_PrefabAsset: {fileID: 0} --- !u!1 &275874966 GameObject: m_ObjectHideFlags: 0 @@ -216,10 +226,6 @@ GameObject: - component: {fileID: 275874969} - component: {fileID: 275874968} - component: {fileID: 275874970} - - component: {fileID: 275874974} - - component: {fileID: 275874973} - - component: {fileID: 275874972} - - component: {fileID: 275874971} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -234,13 +240,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275874966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &275874968 MonoBehaviour: @@ -272,7 +278,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87e89e3d7ca41d8529430dbee11cd4bb, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1324426578} graphRunner: {fileID: 275874968} textureFramePool: {fileID: 275874970} @@ -294,102 +301,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &275874971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &275874972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &275874973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &275874974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &638479256 GameObject: m_ObjectHideFlags: 0 @@ -476,19 +387,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638479256} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &705621525 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -729,6 +641,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1374314657} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &705621526 stripped RectTransform: @@ -766,6 +685,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -795,13 +715,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223870913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1264297878 GameObject: @@ -843,9 +763,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -879,19 +807,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264297878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1302709924 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1324426573} m_Modifications: - target: {fileID: 1620015869145370096, guid: 8fcc7ea504479f06a9334ee2faa42b57, @@ -975,6 +904,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fcc7ea504479f06a9334ee2faa42b57, type: 3} --- !u!114 &1302709925 stripped MonoBehaviour: @@ -988,11 +920,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff689dc19c0db10608af875e2c24ade9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1302709926 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1620015869145370099, guid: 8fcc7ea504479f06a9334ee2faa42b57, + type: 3} + m_PrefabInstance: {fileID: 1302709924} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1324426572 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 705621526} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -1106,6 +1045,41 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1329911429} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 64875046} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2099725097} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1302709926} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1324426575} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1324426576} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1324426577} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1324426579} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &1324426573 stripped Transform: @@ -1190,6 +1164,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1324426573} m_Modifications: - target: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, @@ -1253,6 +1228,9 @@ PrefabInstance: value: FaceDetections Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26114bc9cccb92454a468ea4d41f400a, type: 3} --- !u!114 &1329911428 stripped MonoBehaviour: @@ -1266,11 +1244,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d433cdb024dfd584696eeb11efb71102, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1329911429 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, + type: 3} + m_PrefabInstance: {fileID: 1329911427} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1374314657 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 1324426572} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2099725095 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1324426573} m_Modifications: - target: {fileID: 1620015869145370096, guid: 8fcc7ea504479f06a9334ee2faa42b57, @@ -1334,6 +1325,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fcc7ea504479f06a9334ee2faa42b57, type: 3} --- !u!114 &2099725096 stripped MonoBehaviour: @@ -1347,3 +1341,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff689dc19c0db10608af875e2c24ade9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2099725097 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1620015869145370099, guid: 8fcc7ea504479f06a9334ee2faa42b57, + type: 3} + m_PrefabInstance: {fileID: 2099725095} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1264297881} + - {fileID: 638479258} + - {fileID: 705621525} + - {fileID: 1223870916} + - {fileID: 275874967} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshConfig.cs index 97562bb99..59366aa7f 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.FaceMesh.UI +namespace Mediapipe.Unity.Sample.FaceMesh.UI { public class FaceMeshConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs index f391f281c..da03b9262 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs @@ -11,7 +11,7 @@ using Google.Protobuf; -namespace Mediapipe.Unity.FaceMesh +namespace Mediapipe.Unity.Sample.FaceMesh { public class FaceMeshGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshSolution.cs index 046fd250b..465d08a26 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshSolution.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Mediapipe.Unity.FaceMesh +namespace Mediapipe.Unity.Sample.FaceMesh { public class FaceMeshSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/Hair Segmentation.unity b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/Hair Segmentation.unity index 22df6b3d8..18bf74c02 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/Hair Segmentation.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/Hair Segmentation.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8571076842648159878} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -241,6 +242,17 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1452360050} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 107400412} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!114 &107400409 stripped MonoBehaviour: @@ -321,6 +333,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -350,12 +363,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420786853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1064799459 GameObject: @@ -369,10 +383,6 @@ GameObject: - component: {fileID: 1064799462} - component: {fileID: 1064799460} - component: {fileID: 1064799463} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -403,12 +413,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064799459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064799462 MonoBehaviour: @@ -422,7 +433,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 66bf0cd8d727b10e1a965a4c97487d05, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 107400413} graphRunner: {fileID: 1064799460} textureFramePool: {fileID: 1064799463} @@ -441,107 +453,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!224 &1289592933 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 107400408} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1001 &1452360048 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 107400410} m_Modifications: - target: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, @@ -630,6 +553,9 @@ PrefabInstance: value: 0.275 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24d349d9c78db0f3d94d4657029f4c5e, type: 3} --- !u!114 &1452360049 stripped MonoBehaviour: @@ -643,6 +569,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f993d16dcccfcecb6892ad3cc2ea76c8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1452360050 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, + type: 3} + m_PrefabInstance: {fileID: 1452360048} + m_PrefabAsset: {fileID: 0} --- !u!1 &1806680259 GameObject: m_ObjectHideFlags: 0 @@ -729,12 +661,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806680259} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1969388814 GameObject: @@ -776,9 +709,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -812,18 +753,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969388814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8571076842648159877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1084,6 +1027,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1289592933} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &8571076842648159878 stripped RectTransform: @@ -1091,3 +1041,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8571076842648159877} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1969388817} + - {fileID: 1806680261} + - {fileID: 8571076842648159877} + - {fileID: 420786856} + - {fileID: 1064799461} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationConfig.cs index 1e263be04..a9c78929e 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.HairSegmentation.UI +namespace Mediapipe.Unity.Sample.HairSegmentation.UI { public class HairSegmentationConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs index 42f27778b..9bf23880d 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationGraph.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; -namespace Mediapipe.Unity.HairSegmentation +namespace Mediapipe.Unity.Sample.HairSegmentation { public class HairSegmentationGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationSolution.cs index 517989cce..b765dd1e2 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hair Segmentation/HairSegmentationSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity.HairSegmentation +namespace Mediapipe.Unity.Sample.HairSegmentation { public class HairSegmentationSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/Hand Tracking.unity b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/Hand Tracking.unity index cf03e0d6e..4b531def3 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/Hand Tracking.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/Hand Tracking.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -135,10 +135,6 @@ GameObject: - component: {fileID: 275874969} - component: {fileID: 275874968} - component: {fileID: 275874970} - - component: {fileID: 275874974} - - component: {fileID: 275874973} - - component: {fileID: 275874972} - - component: {fileID: 275874971} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -153,12 +149,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275874966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &275874968 MonoBehaviour: @@ -190,7 +187,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a486eb3af7bca42f6bb2383c732639be, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 841116734} graphRunner: {fileID: 275874968} textureFramePool: {fileID: 275874970} @@ -212,107 +210,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &275874971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &275874972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &275874973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &275874974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1001 &296605791 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 841116728} m_Modifications: - target: {fileID: 1620015869145370096, guid: 8fcc7ea504479f06a9334ee2faa42b57, @@ -391,6 +294,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fcc7ea504479f06a9334ee2faa42b57, type: 3} --- !u!114 &296605792 stripped MonoBehaviour: @@ -404,11 +310,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff689dc19c0db10608af875e2c24ade9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &296605793 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1620015869145370099, guid: 8fcc7ea504479f06a9334ee2faa42b57, + type: 3} + m_PrefabInstance: {fileID: 296605791} + m_PrefabAsset: {fileID: 0} +--- !u!224 &381913590 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 841116727} + m_PrefabAsset: {fileID: 0} --- !u!1001 &399026330 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 841116728} m_Modifications: - target: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, @@ -472,6 +391,9 @@ PrefabInstance: value: PalmDetections Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26114bc9cccb92454a468ea4d41f400a, type: 3} --- !u!114 &399026331 stripped MonoBehaviour: @@ -485,6 +407,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d433cdb024dfd584696eeb11efb71102, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &399026332 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, + type: 3} + m_PrefabInstance: {fileID: 399026330} + m_PrefabAsset: {fileID: 0} --- !u!1 &638479256 GameObject: m_ObjectHideFlags: 0 @@ -571,18 +499,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638479256} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &705621525 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -828,6 +758,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 381913590} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &705621526 stripped RectTransform: @@ -840,6 +777,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 705621526} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -953,6 +891,41 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 399026332} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 296605793} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1465467707} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1515683787} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 841116730} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 841116731} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 841116732} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 841116733} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &841116728 stripped Transform: @@ -1062,6 +1035,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1091,12 +1065,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223870913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1264297878 GameObject: @@ -1138,9 +1113,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1174,18 +1157,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264297878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1465467705 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 841116728} m_Modifications: - target: {fileID: -8837774153085666347, guid: 87a9be2a7620991a78342ef9a56fa62c, @@ -1254,6 +1239,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a9be2a7620991a78342ef9a56fa62c, type: 3} --- !u!114 &1465467706 stripped MonoBehaviour: @@ -1267,11 +1255,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ba3c50c2cb46dc9e916dd3a33c8a488, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1465467707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7434967355688441423, guid: 87a9be2a7620991a78342ef9a56fa62c, + type: 3} + m_PrefabInstance: {fileID: 1465467705} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1515683785 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 841116728} m_Modifications: - target: {fileID: 1620015869145370096, guid: 8fcc7ea504479f06a9334ee2faa42b57, @@ -1350,6 +1345,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fcc7ea504479f06a9334ee2faa42b57, type: 3} --- !u!114 &1515683786 stripped MonoBehaviour: @@ -1363,3 +1361,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff689dc19c0db10608af875e2c24ade9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1515683787 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1620015869145370099, guid: 8fcc7ea504479f06a9334ee2faa42b57, + type: 3} + m_PrefabInstance: {fileID: 1515683785} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1264297881} + - {fileID: 638479258} + - {fileID: 705621525} + - {fileID: 1223870916} + - {fileID: 275874967} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingConfig.cs index 971c4e505..483973356 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.HandTracking.UI +namespace Mediapipe.Unity.Sample.HandTracking.UI { public class HandTrackingConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs index 4da7c882e..b863759bf 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs @@ -11,7 +11,7 @@ using Google.Protobuf; -namespace Mediapipe.Unity.HandTracking +namespace Mediapipe.Unity.Sample.HandTracking { public class HandTrackingGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingSolution.cs index df2f93a93..7ec5317fc 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingSolution.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Mediapipe.Unity.HandTracking +namespace Mediapipe.Unity.Sample.HandTracking { public class HandTrackingSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/Holistic.unity b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/Holistic.unity index be82d1b41..1d9aba392 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/Holistic.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/Holistic.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -149,12 +149,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31144542} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 0, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &31144544 SphereCollider: @@ -164,9 +165,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31144542} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &31144545 @@ -180,6 +189,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -242,12 +252,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37994845} + serializedVersion: 2 m_LocalRotation: {x: 0.22495107, y: 0, z: 0, w: 0.9743701} m_LocalPosition: {x: -1, y: 200, z: -300} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 26, y: 0, z: 0} --- !u!20 &37994848 Camera: @@ -263,9 +274,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -320,9 +339,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 705621530} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -376,10 +395,6 @@ GameObject: - component: {fileID: 275874969} - component: {fileID: 275874968} - component: {fileID: 275874970} - - component: {fileID: 275874974} - - component: {fileID: 275874973} - - component: {fileID: 275874972} - - component: {fileID: 275874971} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -394,12 +409,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275874966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &275874968 MonoBehaviour: @@ -434,7 +450,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 074337820eff7f441910fadfc931aa08, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1375628860} graphRunner: {fileID: 275874968} textureFramePool: {fileID: 275874970} @@ -458,102 +475,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &275874971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &275874972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &275874973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &275874974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &298505179 GameObject: m_ObjectHideFlags: 0 @@ -580,12 +501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298505179} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 100, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &298505181 SphereCollider: @@ -595,9 +517,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298505179} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &298505182 @@ -611,6 +541,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -675,12 +606,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356817659} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 30, y: 1, z: 20} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &356817661 MeshCollider: @@ -690,9 +622,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356817659} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -707,6 +647,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -750,6 +691,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1375628858} m_Modifications: - target: {fileID: 1314261227135839417, guid: cf645f1af5f90246e87c443ab2154263, @@ -813,6 +755,9 @@ PrefabInstance: value: HolisticLandmarks Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf645f1af5f90246e87c443ab2154263, type: 3} --- !u!114 &629162780 stripped MonoBehaviour: @@ -826,6 +771,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8778d2c5de1025526bb9fccf445db529, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &629162781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1314261227135839417, guid: cf645f1af5f90246e87c443ab2154263, + type: 3} + m_PrefabInstance: {fileID: 629162779} + m_PrefabAsset: {fileID: 0} --- !u!1 &638479256 GameObject: m_ObjectHideFlags: 0 @@ -912,12 +863,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638479256} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &700110991 GameObject: @@ -945,12 +897,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 700110991} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 100, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &700110993 SphereCollider: @@ -960,9 +913,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 700110991} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &700110994 @@ -976,6 +937,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1019,6 +981,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1264,6 +1227,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 954965979} + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 173192578} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &705621530 stripped RectTransform: @@ -1297,12 +1271,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865367042} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 150, z: 100} m_LocalScale: {x: 30, y: 1, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!64 &865367044 MeshCollider: @@ -1312,9 +1287,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865367042} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1329,6 +1312,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1367,11 +1351,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865367042} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!224 &954965979 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 1375628857} + m_PrefabAsset: {fileID: 0} --- !u!1001 &964394164 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1375628858} m_Modifications: - target: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, @@ -1435,6 +1426,9 @@ PrefabInstance: value: PoseRoi Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b696480602fe21de85315216956bd42, type: 3} --- !u!114 &964394165 stripped MonoBehaviour: @@ -1448,11 +1442,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba39488de81a63b298a92a9d09ac42db, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &964394166 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, + type: 3} + m_PrefabInstance: {fileID: 964394164} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1033092134 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1375628858} m_Modifications: - target: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, @@ -1541,6 +1542,9 @@ PrefabInstance: value: objectReference: {fileID: 4800000, guid: d684c6d125278d05fbb1904ee5103f3a, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24d349d9c78db0f3d94d4657029f4c5e, type: 3} --- !u!114 &1033092135 stripped MonoBehaviour: @@ -1554,6 +1558,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f993d16dcccfcecb6892ad3cc2ea76c8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1033092136 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, + type: 3} + m_PrefabInstance: {fileID: 1033092134} + m_PrefabAsset: {fileID: 0} --- !u!1 &1158763519 GameObject: m_ObjectHideFlags: 0 @@ -1578,12 +1588,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158763519} + serializedVersion: 2 m_LocalRotation: {x: 0.35226196, y: -0.36098844, z: 0.14952631, w: 0.8504357} m_LocalPosition: {x: 100, y: 150, z: -50} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 45, y: -46, z: 0} --- !u!108 &1158763521 Light: @@ -1677,6 +1688,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1706,12 +1718,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223870913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1264297878 GameObject: @@ -1753,9 +1766,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1789,12 +1810,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264297878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1321204304 GameObject: @@ -1819,9 +1841,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1321204304} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1782549142} - {fileID: 1773909713} @@ -1832,13 +1856,13 @@ Transform: - {fileID: 2090815821} - {fileID: 700110992} m_Father: {fileID: 1625996803} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1334974596 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1375628858} m_Modifications: - target: {fileID: 5404176934485794286, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, @@ -1902,6 +1926,9 @@ PrefabInstance: value: PoseDetection Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, type: 3} --- !u!114 &1334974597 stripped MonoBehaviour: @@ -1915,6 +1942,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a82b9904ff34cc4fb66157217fe48a9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1334974598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5404176934485794286, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, + type: 3} + m_PrefabInstance: {fileID: 1334974596} + m_PrefabAsset: {fileID: 0} --- !u!1 &1357560974 GameObject: m_ObjectHideFlags: 0 @@ -1939,12 +1972,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357560974} + serializedVersion: 2 m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} m_LocalPosition: {x: -100, y: 150, z: -50} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 45, y: 45, z: 0} --- !u!108 &1357560976 Light: @@ -2013,6 +2047,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 705621530} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -2126,6 +2161,41 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1334974598} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 629162781} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1033092136} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 964394166} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375628861} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375628862} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375628863} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375628865} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &1375628858 stripped Transform: @@ -2241,9 +2311,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625996802} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 500, y: -100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 37994846} - {fileID: 356817660} @@ -2253,13 +2325,13 @@ Transform: - {fileID: 1357560975} - {fileID: 1158763520} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1737185253 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1936307554} m_Modifications: - target: {fileID: 1915238444563462410, guid: 4418f6a92856c5b51b58a36e3be7ed5c, @@ -2333,6 +2405,9 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4418f6a92856c5b51b58a36e3be7ed5c, type: 3} --- !u!4 &1737185254 stripped Transform: @@ -2378,12 +2453,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773909712} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 0, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1773909714 SphereCollider: @@ -2393,9 +2469,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773909712} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1773909715 @@ -2409,6 +2493,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2473,12 +2558,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782549141} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 0, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1782549143 SphereCollider: @@ -2488,9 +2574,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782549141} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1782549144 @@ -2504,6 +2598,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2569,10 +2664,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1737185254} m_Father: {fileID: 1625996803} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2621,12 +2716,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960727773} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 0, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1960727775 SphereCollider: @@ -2636,9 +2732,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960727773} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1960727776 @@ -2652,6 +2756,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2716,12 +2821,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2028646851} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 100, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &2028646853 SphereCollider: @@ -2731,9 +2837,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2028646851} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2028646854 @@ -2747,6 +2861,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2811,12 +2926,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090815820} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 100, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &2090815822 SphereCollider: @@ -2826,9 +2942,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090815820} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2090815823 @@ -2842,6 +2966,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2880,3 +3005,13 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090815820} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1264297881} + - {fileID: 638479258} + - {fileID: 705621525} + - {fileID: 1223870916} + - {fileID: 275874967} + - {fileID: 1625996803} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingConfig.cs index 018bc6bc8..0bda392f9 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.Holistic.UI +namespace Mediapipe.Unity.Sample.Holistic.UI { public class HolisticTrackingConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs index 90e370cbe..1008843a9 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs @@ -12,7 +12,7 @@ using Google.Protobuf; -namespace Mediapipe.Unity.Holistic +namespace Mediapipe.Unity.Sample.Holistic { public class HolisticTrackingGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingSolution.cs index 359fa8aba..d05bdf0b0 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity.Holistic +namespace Mediapipe.Unity.Sample.Holistic { public class HolisticTrackingSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/Iris Tracking.unity b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/Iris Tracking.unity index b277aa774..35f55c2f9 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/Iris Tracking.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/Iris Tracking.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -135,10 +135,6 @@ GameObject: - component: {fileID: 275874969} - component: {fileID: 275874968} - component: {fileID: 275874970} - - component: {fileID: 275874974} - - component: {fileID: 275874973} - - component: {fileID: 275874972} - - component: {fileID: 275874971} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -153,12 +149,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275874966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &275874968 MonoBehaviour: @@ -188,7 +185,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f016b6b2a48c853e3aa5922f70b018e0, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1228562680} graphRunner: {fileID: 275874968} textureFramePool: {fileID: 275874970} @@ -209,102 +207,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &275874971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &275874972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &275874973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &275874974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &638479256 GameObject: m_ObjectHideFlags: 0 @@ -391,18 +293,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638479256} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &705621525 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -643,6 +547,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1473811171} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &705621526 stripped RectTransform: @@ -655,6 +566,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1228562675} m_Modifications: - target: {fileID: 7477175687846711450, guid: c0d008e23161282b39199515fa2c0da4, @@ -718,6 +630,9 @@ PrefabInstance: value: FaceLandmarksWithIris Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c0d008e23161282b39199515fa2c0da4, type: 3} --- !u!114 &985505889 stripped MonoBehaviour: @@ -731,11 +646,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e3266a44159f9c0f495c095447ca1e5f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &985505890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7477175687846711450, guid: c0d008e23161282b39199515fa2c0da4, + type: 3} + m_PrefabInstance: {fileID: 985505888} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1127017580 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1228562675} m_Modifications: - target: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, @@ -799,6 +721,9 @@ PrefabInstance: value: FaceDetections Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26114bc9cccb92454a468ea4d41f400a, type: 3} --- !u!114 &1127017581 stripped MonoBehaviour: @@ -812,6 +737,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d433cdb024dfd584696eeb11efb71102, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1127017582 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, + type: 3} + m_PrefabInstance: {fileID: 1127017580} + m_PrefabAsset: {fileID: 0} --- !u!1 &1223870913 GameObject: m_ObjectHideFlags: 0 @@ -842,6 +773,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -871,18 +803,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223870913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1228562674 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 705621526} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -996,6 +930,33 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1127017582} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1291854775} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 985505890} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1228562677} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1228562678} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1228562679} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &1228562675 stripped Transform: @@ -1103,9 +1064,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1139,18 +1108,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264297878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1291854773 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1228562675} m_Modifications: - target: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, @@ -1214,6 +1185,9 @@ PrefabInstance: value: FaceRect Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b696480602fe21de85315216956bd42, type: 3} --- !u!114 &1291854774 stripped MonoBehaviour: @@ -1227,3 +1201,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba39488de81a63b298a92a9d09ac42db, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1291854775 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, + type: 3} + m_PrefabInstance: {fileID: 1291854773} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1473811171 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 1228562674} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1264297881} + - {fileID: 638479258} + - {fileID: 705621525} + - {fileID: 1223870916} + - {fileID: 275874967} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingConfig.cs index 0d1b6e6e1..b1194eb5d 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.IrisTracking.UI +namespace Mediapipe.Unity.Sample.IrisTracking.UI { public class IrisTrackingConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs index e89910c71..6eea6c168 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; -namespace Mediapipe.Unity.IrisTracking +namespace Mediapipe.Unity.Sample.IrisTracking { public class IrisTrackingGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingSolution.cs index 8f2366085..73a9e7623 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingSolution.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Mediapipe.Unity.IrisTracking +namespace Mediapipe.Unity.Sample.IrisTracking { public class IrisTrackingSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipe Video.unity b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipe Video.unity index fda3be8ec..d16ba4391 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipe Video.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipe Video.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,6 +153,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -182,12 +183,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420786853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1064799459 GameObject: @@ -201,10 +203,6 @@ GameObject: - component: {fileID: 1064799462} - component: {fileID: 1064799460} - component: {fileID: 1064799463} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -236,12 +234,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064799459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064799462 MonoBehaviour: @@ -255,7 +254,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 386ee87194003cbd899dddcd6a2e6add, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1567625569} graphRunner: {fileID: 1064799460} textureFramePool: {fileID: 1064799463} @@ -273,102 +273,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &1567625564 GameObject: m_ObjectHideFlags: 0 @@ -399,9 +303,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8571076842648159878} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -555,12 +459,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806680259} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1969388814 GameObject: @@ -602,9 +507,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -638,18 +551,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969388814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8571076842648159877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -890,6 +805,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1567625565} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &8571076842648159878 stripped RectTransform: @@ -897,3 +819,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8571076842648159877} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1969388817} + - {fileID: 1806680261} + - {fileID: 8571076842648159877} + - {fileID: 420786856} + - {fileID: 1064799461} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoConfig.cs index 1a1bf5f6c..15365fbdf 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoConfig.cs @@ -8,9 +8,9 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.MediaPipeVideo.UI +namespace Mediapipe.Unity.Sample.MediaPipeVideo.UI { public class MediaPipeVideoConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs index c52b212be..d203b0232 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; -namespace Mediapipe.Unity.MediaPipeVideo +namespace Mediapipe.Unity.Sample.MediaPipeVideo { public class MediaPipeVideoGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoSolution.cs index 9b8ddf773..54549cdf9 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity.MediaPipeVideo +namespace Mediapipe.Unity.Sample.MediaPipeVideo { public class MediaPipeVideoSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/Object Detection.unity b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/Object Detection.unity index f63029375..fcee633d9 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/Object Detection.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/Object Detection.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,6 +153,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -182,18 +183,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420786853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &544675418 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8571076842648159878} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -307,6 +310,17 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 741688519} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 544675421} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &544675419 stripped Transform: @@ -346,11 +360,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827c4431af677e057aa6f14170d0785c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &544675423 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 544675418} + m_PrefabAsset: {fileID: 0} --- !u!1001 &741688517 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 544675419} m_Modifications: - target: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, @@ -414,6 +435,9 @@ PrefabInstance: value: OutputDetections Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26114bc9cccb92454a468ea4d41f400a, type: 3} --- !u!114 &741688518 stripped MonoBehaviour: @@ -427,6 +451,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d433cdb024dfd584696eeb11efb71102, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &741688519 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5535674424067552597, guid: 26114bc9cccb92454a468ea4d41f400a, + type: 3} + m_PrefabInstance: {fileID: 741688517} + m_PrefabAsset: {fileID: 0} --- !u!1 &1064799459 GameObject: m_ObjectHideFlags: 0 @@ -439,10 +469,6 @@ GameObject: - component: {fileID: 1064799462} - component: {fileID: 1064799460} - component: {fileID: 1064799463} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -473,12 +499,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064799459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064799462 MonoBehaviour: @@ -492,7 +519,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eac875cb755d0fc0d86718559f9674d7, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 544675422} graphRunner: {fileID: 1064799460} textureFramePool: {fileID: 1064799463} @@ -511,102 +539,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &1806680259 GameObject: m_ObjectHideFlags: 0 @@ -693,12 +625,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806680259} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1969388814 GameObject: @@ -740,9 +673,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -776,18 +717,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969388814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8571076842648159877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1038,6 +981,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 544675423} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &8571076842648159878 stripped RectTransform: @@ -1045,3 +995,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8571076842648159877} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1969388817} + - {fileID: 1806680261} + - {fileID: 8571076842648159877} + - {fileID: 420786856} + - {fileID: 1064799461} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionConfig.cs index c844a6831..3a6e7e64e 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.ObjectDetection.UI +namespace Mediapipe.Unity.Sample.ObjectDetection.UI { public class ObjectDetectionConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs index 3e750d5c0..dd55c8bc4 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; -namespace Mediapipe.Unity.ObjectDetection +namespace Mediapipe.Unity.Sample.ObjectDetection { public class ObjectDetectionGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionSolution.cs index e253080db..97929c4f0 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionSolution.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Mediapipe.Unity.ObjectDetection +namespace Mediapipe.Unity.Sample.ObjectDetection { public class ObjectDetectionSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/Pose Tracking.unity b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/Pose Tracking.unity index 594aa5b18..857a17d74 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/Pose Tracking.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/Pose Tracking.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -149,12 +149,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31144542} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 0, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &31144544 SphereCollider: @@ -164,9 +165,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31144542} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &31144545 @@ -180,6 +189,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -242,12 +252,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37994845} + serializedVersion: 2 m_LocalRotation: {x: 0.22495107, y: 0, z: 0, w: 0.9743701} m_LocalPosition: {x: -1, y: 200, z: -300} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 26, y: 0, z: 0} --- !u!20 &37994848 Camera: @@ -263,9 +274,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -320,9 +339,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 705621530} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -376,10 +395,6 @@ GameObject: - component: {fileID: 275874969} - component: {fileID: 275874968} - component: {fileID: 275874970} - - component: {fileID: 275874974} - - component: {fileID: 275874973} - - component: {fileID: 275874972} - - component: {fileID: 275874971} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -394,12 +409,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275874966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &275874968 MonoBehaviour: @@ -433,7 +449,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b9be9c09f85432febf88b890fe3f194, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1889892132} graphRunner: {fileID: 275874968} textureFramePool: {fileID: 275874970} @@ -457,102 +474,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &275874971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &275874972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &275874973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &275874974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275874966} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1 &298505179 GameObject: m_ObjectHideFlags: 0 @@ -579,12 +500,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298505179} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 100, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &298505181 SphereCollider: @@ -594,9 +516,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298505179} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &298505182 @@ -610,6 +540,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -674,12 +605,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356817659} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 30, y: 1, z: 20} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &356817661 MeshCollider: @@ -689,9 +621,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356817659} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -706,6 +646,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -744,6 +685,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356817659} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!224 &363892072 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 1889892127} + m_PrefabAsset: {fileID: 0} --- !u!1 &638479256 GameObject: m_ObjectHideFlags: 0 @@ -830,12 +777,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638479256} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &700110991 GameObject: @@ -863,12 +811,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 700110991} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 100, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &700110993 SphereCollider: @@ -878,9 +827,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 700110991} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &700110994 @@ -894,6 +851,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -937,6 +895,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1182,6 +1141,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 363892072} + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 173192578} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &705621530 stripped RectTransform: @@ -1194,6 +1164,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1889892128} m_Modifications: - target: {fileID: 5404176934485794286, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, @@ -1257,6 +1228,9 @@ PrefabInstance: value: PoseDetection Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, type: 3} --- !u!114 &760147979 stripped MonoBehaviour: @@ -1270,6 +1244,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a82b9904ff34cc4fb66157217fe48a9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &760147980 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5404176934485794286, guid: 9e4308c3e97d26a388364cbe0ea8bfb4, + type: 3} + m_PrefabInstance: {fileID: 760147978} + m_PrefabAsset: {fileID: 0} --- !u!1 &865367042 GameObject: m_ObjectHideFlags: 0 @@ -1296,12 +1276,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865367042} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 150, z: 100} m_LocalScale: {x: 30, y: 1, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!64 &865367044 MeshCollider: @@ -1311,9 +1292,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865367042} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1328,6 +1317,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1390,12 +1380,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1158763519} + serializedVersion: 2 m_LocalRotation: {x: 0.35226196, y: -0.36098844, z: 0.14952631, w: 0.8504357} m_LocalPosition: {x: 100, y: 150, z: -50} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 45, y: -46, z: 0} --- !u!108 &1158763521 Light: @@ -1489,6 +1480,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1518,12 +1510,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223870913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1264297878 GameObject: @@ -1565,9 +1558,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1601,18 +1602,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264297878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1286974199 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1889892128} m_Modifications: - target: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, @@ -1676,6 +1679,9 @@ PrefabInstance: value: RoiFromLandmarks Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b696480602fe21de85315216956bd42, type: 3} --- !u!114 &1286974200 stripped MonoBehaviour: @@ -1689,6 +1695,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba39488de81a63b298a92a9d09ac42db, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1286974201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4965192403804369240, guid: 3b696480602fe21de85315216956bd42, + type: 3} + m_PrefabInstance: {fileID: 1286974199} + m_PrefabAsset: {fileID: 0} --- !u!1 &1321204304 GameObject: m_ObjectHideFlags: 0 @@ -1712,9 +1724,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1321204304} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1782549142} - {fileID: 1773909713} @@ -1725,7 +1739,6 @@ Transform: - {fileID: 2090815821} - {fileID: 700110992} m_Father: {fileID: 1625996803} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1357560974 GameObject: @@ -1751,12 +1764,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357560974} + serializedVersion: 2 m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} m_LocalPosition: {x: -100, y: 150, z: -50} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1625996803} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 45, y: 45, z: 0} --- !u!108 &1357560976 Light: @@ -1825,6 +1839,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1889892128} m_Modifications: - target: {fileID: 1915238444563462410, guid: 4418f6a92856c5b51b58a36e3be7ed5c, @@ -1888,6 +1903,9 @@ PrefabInstance: value: PoseLandmarks Annotation objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4418f6a92856c5b51b58a36e3be7ed5c, type: 3} --- !u!114 &1514445399 stripped MonoBehaviour: @@ -1901,6 +1919,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39bac9dd52c31ae7aa01a7383bc44853, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1514445400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1915238444563462410, guid: 4418f6a92856c5b51b58a36e3be7ed5c, + type: 3} + m_PrefabInstance: {fileID: 1514445398} + m_PrefabAsset: {fileID: 0} --- !u!1 &1625996802 GameObject: m_ObjectHideFlags: 0 @@ -1924,9 +1948,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625996802} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 500, y: -100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 37994846} - {fileID: 356817660} @@ -1936,13 +1962,13 @@ Transform: - {fileID: 1357560975} - {fileID: 1158763520} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1737185253 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1936307554} m_Modifications: - target: {fileID: 1915238444563462410, guid: 4418f6a92856c5b51b58a36e3be7ed5c, @@ -2022,6 +2048,9 @@ PrefabInstance: objectReference: {fileID: 5105739270100195971, guid: cd50999c161e69345953a2cb517dd339, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4418f6a92856c5b51b58a36e3be7ed5c, type: 3} --- !u!4 &1737185254 stripped Transform: @@ -2067,12 +2096,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773909712} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 0, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1773909714 SphereCollider: @@ -2082,9 +2112,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773909712} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1773909715 @@ -2098,6 +2136,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2162,12 +2201,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782549141} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 0, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1782549143 SphereCollider: @@ -2177,9 +2217,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782549141} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1782549144 @@ -2193,6 +2241,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2236,6 +2285,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 705621530} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -2349,6 +2399,41 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 760147980} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1514445400} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2100215834} + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1286974201} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1889892130} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1889892131} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1889892133} + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1889892135} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!4 &1889892128 stripped Transform: @@ -2467,10 +2552,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1737185254} m_Father: {fileID: 1625996803} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2519,12 +2604,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960727773} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 0, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1960727775 SphereCollider: @@ -2534,9 +2620,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960727773} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1960727776 @@ -2550,6 +2644,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2614,12 +2709,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2028646851} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -50, y: 100, z: -50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &2028646853 SphereCollider: @@ -2629,9 +2725,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2028646851} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2028646854 @@ -2645,6 +2749,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2709,12 +2814,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090815820} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 50, y: 100, z: 50} m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321204305} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &2090815822 SphereCollider: @@ -2724,9 +2830,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2090815820} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2090815823 @@ -2740,6 +2854,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2783,6 +2898,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1889892128} m_Modifications: - target: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, @@ -2896,6 +3012,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24d349d9c78db0f3d94d4657029f4c5e, type: 3} --- !u!114 &2100215833 stripped MonoBehaviour: @@ -2909,3 +3028,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f993d16dcccfcecb6892ad3cc2ea76c8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2100215834 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, + type: 3} + m_PrefabInstance: {fileID: 2100215832} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1264297881} + - {fileID: 638479258} + - {fileID: 705621525} + - {fileID: 1223870916} + - {fileID: 275874967} + - {fileID: 1625996803} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingConfig.cs index 8a7466d61..ce5740573 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.PoseTracking.UI +namespace Mediapipe.Unity.Sample.PoseTracking.UI { public class PoseTrackingConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs index 3e47ede30..8eeea72db 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs @@ -11,7 +11,7 @@ using Google.Protobuf; -namespace Mediapipe.Unity.PoseTracking +namespace Mediapipe.Unity.Sample.PoseTracking { public class PoseTrackingGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingSolution.cs index e8553265b..0ddff1f02 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity.PoseTracking +namespace Mediapipe.Unity.Sample.PoseTracking { public class PoseTrackingSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/Selfie Segmentation.unity b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/Selfie Segmentation.unity index e81b0dff6..ab7624bb1 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/Selfie Segmentation.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/Selfie Segmentation.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8571076842648159878} m_Modifications: - target: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, @@ -241,6 +242,17 @@ PrefabInstance: value: Annotatable Screen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7074087083388479136, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1452360050} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8798066379235852099, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 107400412} m_SourcePrefab: {fileID: 100100000, guid: 5713b959e3c77a58fb258133fc8e4aef, type: 3} --- !u!114 &107400409 stripped MonoBehaviour: @@ -321,6 +333,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -350,12 +363,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420786853} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1064799459 GameObject: @@ -369,10 +383,6 @@ GameObject: - component: {fileID: 1064799460} - component: {fileID: 1064799462} - component: {fileID: 1064799463} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} m_Layer: 0 m_Name: Solution m_TagString: Untagged @@ -392,7 +402,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9e3efdfb4a84905c586fa1dff57c67e0, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 107400413} graphRunner: {fileID: 1064799462} textureFramePool: {fileID: 1064799463} @@ -405,12 +416,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064799459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064799462 MonoBehaviour: @@ -441,107 +453,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _poolSize: 10 ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!224 &1090668078 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3259285889726014650, guid: 5713b959e3c77a58fb258133fc8e4aef, + type: 3} + m_PrefabInstance: {fileID: 107400408} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!1001 &1452360048 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 107400410} m_Modifications: - target: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, @@ -645,6 +568,9 @@ PrefabInstance: value: 0.275 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24d349d9c78db0f3d94d4657029f4c5e, type: 3} --- !u!114 &1452360049 stripped MonoBehaviour: @@ -658,6 +584,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f993d16dcccfcecb6892ad3cc2ea76c8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1452360050 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1416249681263347896, guid: 24d349d9c78db0f3d94d4657029f4c5e, + type: 3} + m_PrefabInstance: {fileID: 1452360048} + m_PrefabAsset: {fileID: 0} --- !u!1 &1806680259 GameObject: m_ObjectHideFlags: 0 @@ -744,12 +676,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806680259} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1969388814 GameObject: @@ -791,9 +724,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -827,18 +768,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969388814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8571076842648159877 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4073763783843571378, guid: 140d1d2c406167c50819d89f86d9092e, @@ -1099,6 +1042,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8571076844135231236, guid: 140d1d2c406167c50819d89f86d9092e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1090668078} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 140d1d2c406167c50819d89f86d9092e, type: 3} --- !u!224 &8571076842648159878 stripped RectTransform: @@ -1106,3 +1056,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8571076842648159877} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1969388817} + - {fileID: 1806680261} + - {fileID: 8571076842648159877} + - {fileID: 420786856} + - {fileID: 1064799461} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationConfig.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationConfig.cs index 513486390..457ddd168 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationConfig.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationConfig.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; -namespace Mediapipe.Unity.SelfieSegmentation.UI +namespace Mediapipe.Unity.Sample.SelfieSegmentation.UI { public class SelfieSegmentationConfig : ModalContents { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs index 1d3297ecc..02724d9f1 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; -namespace Mediapipe.Unity.SelfieSegmentation +namespace Mediapipe.Unity.Sample.SelfieSegmentation { public class SelfieSegmentationGraph : GraphRunner { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationSolution.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationSolution.cs index e6f8d9095..9ff238578 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationSolution.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationSolution.cs @@ -7,7 +7,7 @@ using System.Collections; using UnityEngine; -namespace Mediapipe.Unity.SelfieSegmentation +namespace Mediapipe.Unity.Sample.SelfieSegmentation { public class SelfieSegmentationSolution : ImageSourceSolution { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity b/Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity deleted file mode 100644 index aaecffa3f..000000000 --- a/Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity +++ /dev/null @@ -1,530 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708987, g: 0.37837026, b: 0.3572256, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &542027322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542027324} - - component: {fileID: 542027323} - - component: {fileID: 542027325} - - component: {fileID: 542027328} - - component: {fileID: 542027327} - - component: {fileID: 542027326} - m_Layer: 0 - m_Name: Bootstrap - m_TagString: Global Resource - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &542027323 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 0 - _enableGlog: 1 ---- !u!4 &542027324 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &542027325 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2ca6b5afaa693af02957f0d68cf058d9, type: 3} - m_Name: - m_EditorClassIdentifier: - _screen: {fileID: 941420919} - _consolePrefab: {fileID: 2286573430237446446, guid: 5920f5c607ecc6ea88b86fbecab72418, - type: 3} ---- !u!114 &542027326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: - - {fileID: 32900000, guid: f7b4fac4ac8f4aab0958fc99c452a503, type: 3} ---- !u!114 &542027327 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &542027328 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542027322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!1 &941420917 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 941420918} - - component: {fileID: 941420920} - - component: {fileID: 941420919} - m_Layer: 5 - m_Name: Screen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &941420918 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941420917} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1135941251} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 6, y: 6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &941420919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941420917} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &941420920 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941420917} - m_CullTransparentMesh: 1 ---- !u!1 &1135941247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1135941251} - - component: {fileID: 1135941250} - - component: {fileID: 1135941249} - - component: {fileID: 1135941248} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1135941248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1135941247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1135941249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1135941247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1135941250 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1135941247} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1135941251 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1135941247} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 941420918} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1899731571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1899731574} - - component: {fileID: 1899731573} - - component: {fileID: 1899731572} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1899731572 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1899731571} - m_Enabled: 1 ---- !u!20 &1899731573 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1899731571} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1899731574 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1899731571} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/Face Detection.unity b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/Face Detection.unity index 401269e15..e88f11fae 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/Face Detection.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/Face Detection.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1} + m_IndirectSpecularColor: {r: 0.44402248, g: 0.49316555, b: 0.5722324, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -466,10 +466,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1064799461} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} - component: {fileID: 1064799468} m_Layer: 0 m_Name: Solution @@ -493,102 +489,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!114 &1064799468 MonoBehaviour: m_ObjectHideFlags: 0 @@ -601,7 +501,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b86ba34db2c888778bdb2f439fd1c76, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} + bootstrap: {fileID: 1399753306286750402, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1006057043} runningMode: 0 _detectionResultAnnotationController: {fileID: 1006057045} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/FaceDetectionConfigWindow.cs b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/FaceDetectionConfigWindow.cs index 1f31a5115..dbb9154ab 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/FaceDetectionConfigWindow.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Detection/FaceDetectionConfigWindow.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; namespace Mediapipe.Unity.Sample.FaceDetection.UI { @@ -19,7 +19,7 @@ public class FaceDetectionConfigWindow : ModalContents [SerializeField] private InputField _minSuppressionThresholdInput; [SerializeField] private InputField _numFacesInput; - private FaceDetectionConfig _config; + private FaceDetection.FaceDetectionConfig _config; private bool _isChanged; private void Start() diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/Face Landmark Detection.unity b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/Face Landmark Detection.unity index d4868bce5..0f6292933 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/Face Landmark Detection.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/Face Landmark Detection.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1} + m_IndirectSpecularColor: {r: 0.44402248, g: 0.49316555, b: 0.5722324, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -470,10 +470,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1064799461} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} - component: {fileID: 1064799469} m_Layer: 0 m_Name: Solution @@ -497,102 +493,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!114 &1064799469 MonoBehaviour: m_ObjectHideFlags: 0 @@ -605,7 +505,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78fe4f7b7ad763b02aa042ef4c50ff6e, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} + bootstrap: {fileID: 1399753306286750402, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1006057043} runningMode: 0 _faceLandmarkerResultAnnotationController: {fileID: 1006057044} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/FaceLandmarkDetectionConfigWindow.cs b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/FaceLandmarkDetectionConfigWindow.cs index 1eca2e52e..17df178a1 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/FaceLandmarkDetectionConfigWindow.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Face Landmark Detection/FaceLandmarkDetectionConfigWindow.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; namespace Mediapipe.Unity.Sample.FaceLandmarkDetection.UI { diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/Hand Landmark Detection.unity b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/Hand Landmark Detection.unity index ae97da53b..4b3fdc657 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/Hand Landmark Detection.unity +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/Hand Landmark Detection.unity @@ -455,10 +455,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1064799461} - - component: {fileID: 1064799467} - - component: {fileID: 1064799466} - - component: {fileID: 1064799465} - - component: {fileID: 1064799464} - component: {fileID: 1064799468} m_Layer: 0 m_Name: Solution @@ -482,102 +478,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1064799464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04085488e5fac35599866a2a6fceeda3, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] ---- !u!114 &1064799465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd7955705ab46c72b9124bb116a2dca9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableSources: [] - _defaultAvailableResolutions: - - width: 512 - height: 512 - frameRate: 0 - - width: 640 - height: 480 - frameRate: 0 - - width: 1280 - height: 720 - frameRate: 0 ---- !u!114 &1064799466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 498146e99d4934673bd948c8be11227e, type: 3} - m_Name: - m_EditorClassIdentifier: - _preferableDefaultWidth: 1280 - _defaultAvailableResolutions: - - width: 176 - height: 144 - frameRate: 30 - - width: 320 - height: 240 - frameRate: 30 - - width: 424 - height: 240 - frameRate: 30 - - width: 640 - height: 360 - frameRate: 30 - - width: 640 - height: 480 - frameRate: 30 - - width: 848 - height: 480 - frameRate: 30 - - width: 960 - height: 540 - frameRate: 30 - - width: 1280 - height: 720 - frameRate: 30 - - width: 1600 - height: 896 - frameRate: 30 - - width: 1920 - height: 1080 - frameRate: 30 ---- !u!114 &1064799467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064799459} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4d846393f8d9f20fa64b924b0d95e68, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultImageSource: 0 - _preferableInferenceMode: 0 - _assetLoaderType: 2 - _enableGlog: 1 --- !u!114 &1064799468 MonoBehaviour: m_ObjectHideFlags: 0 @@ -590,7 +490,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20f2fd61d43b483ba93442eb6cfc37cf, type: 3} m_Name: m_EditorClassIdentifier: - bootstrap: {fileID: 0} + _bootstrapPrefab: {fileID: 968918444066301895, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} + bootstrap: {fileID: 1399753306286750402, guid: 1146a9de09159a948b683e94fb3d3c95, + type: 3} screen: {fileID: 1006057043} runningMode: 0 _handLandmarkerResultAnnotationController: {fileID: 1006057044} diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/HandLandmarkDetectionConfigWindow.cs b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/HandLandmarkDetectionConfigWindow.cs index 204b953bf..bf41c7e8d 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/HandLandmarkDetectionConfigWindow.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Tasks/Hand Landmark Detection/HandLandmarkDetectionConfigWindow.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.UI; -using Mediapipe.Unity.UI; +using Mediapipe.Unity.Sample.UI; namespace Mediapipe.Unity.Sample.HandLandmarkDetection.UI { diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab b/Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab deleted file mode 100644 index 2da6b6d61..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console Window.prefab +++ /dev/null @@ -1,512 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2286573430237446446 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2286573430237446447} - - component: {fileID: 2286573430237446441} - - component: {fileID: 2286573430237446440} - - component: {fileID: 7545622602662064294} - m_Layer: 5 - m_Name: Console Window - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2286573430237446447 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2286573430237446446} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2286573430268912311} - - {fileID: 3377213643290001030} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2286573430237446441 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2286573430237446446} - m_CullTransparentMesh: 1 ---- !u!114 &2286573430237446440 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2286573430237446446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.7490196} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7545622602662064294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2286573430237446446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b0553bf939a2c523bd6b421012b9337, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &2286573432159412861 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2286573430237446447} - m_Modifications: - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.a - value: 0.5019608 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7545622602662064294} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Exit - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Mediapipe.Unity.UI.ModalContents, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -28 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Name - value: Exit Button - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Text - value: \uf00d - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_FontData.m_MaxSize - value: 289 - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_FontData.m_FontSize - value: 28 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!224 &3377213643290001030 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 2286573432159412861} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3492653581338471895 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2286573430237446447} - m_Modifications: - - target: {fileID: 1816605981183307362, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: maxLines - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 2090578403611810331, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 2090578403611810331, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2993541527497414948, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2993541527497414948, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3481718972971892304, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_Name - value: Console - objectReference: {fileID: 0} - - target: {fileID: 4451514694375844671, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4451514694375844671, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 4451514694375844671, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4558350226998646492, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4558350226998646492, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4558350226998646492, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4558350226998646492, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6817195836431992253, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6817195836431992253, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7533351787154748278, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7533351787154748278, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7533351787154748278, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 7533351787154748278, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8128863749803209789, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8128863749803209789, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, type: 3} ---- !u!224 &2286573430268912311 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3441857903058390880, guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff, - type: 3} - m_PrefabInstance: {fileID: 3492653581338471895} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab b/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab deleted file mode 100644 index f5acdd42e..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab +++ /dev/null @@ -1,777 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &173867137450816499 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8128863749803209789} - - component: {fileID: 7052215039263600482} - - component: {fileID: 7998054974688687318} - - component: {fileID: 965831236020746082} - m_Layer: 5 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8128863749803209789 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173867137450816499} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8684544896258824048} - m_Father: {fileID: 3441857903058390880} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!222 &7052215039263600482 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173867137450816499} - m_CullTransparentMesh: 1 ---- !u!114 &7998054974688687318 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173867137450816499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.101960786} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &965831236020746082 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173867137450816499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 583116689781760111} - m_HandleRect: {fileID: 6817195836431992253} - m_Direction: 0 - m_Value: 0 - m_Size: 0.13688213 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &380802654051560362 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2090578403611810331} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2090578403611810331 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 380802654051560362} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7533351787154748278} - m_Father: {fileID: 4451514694375844671} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2661039610006039044 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6817195836431992253} - - component: {fileID: 7877055472168457572} - - component: {fileID: 583116689781760111} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6817195836431992253 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2661039610006039044} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8684544896258824048} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7877055472168457572 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2661039610006039044} - m_CullTransparentMesh: 1 ---- !u!114 &583116689781760111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2661039610006039044} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.2} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3481718972971892304 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3441857903058390880} - - component: {fileID: 3320195563162810495} - - component: {fileID: 2260653587693508807} - - component: {fileID: 8168949111253880396} - - component: {fileID: 1816605981183307362} - m_Layer: 5 - m_Name: Console - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3441857903058390880 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3481718972971892304} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4558350226998646492} - - {fileID: 8128863749803209789} - - {fileID: 4451514694375844671} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3320195563162810495 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3481718972971892304} - m_CullTransparentMesh: 1 ---- !u!114 &2260653587693508807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3481718972971892304} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8168949111253880396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3481718972971892304} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 2993541527497414948} - m_Horizontal: 1 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 20 - m_Viewport: {fileID: 4558350226998646492} - m_HorizontalScrollbar: {fileID: 965831236020746082} - m_VerticalScrollbar: {fileID: 8915376192930860593} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1816605981183307362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3481718972971892304} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 627c44f7498ce8ccfa83e353108ae40a, type: 3} - m_Name: - m_EditorClassIdentifier: - _logLinePrefab: {fileID: 2894631414300269451, guid: b3a48036f640af0a8b3f1705d5d7e461, - type: 3} - _maxLines: 200 ---- !u!1 &3753487017719311786 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7533351787154748278} - - component: {fileID: 5874542789452046810} - - component: {fileID: 5039049764830588271} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7533351787154748278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3753487017719311786} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2090578403611810331} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5874542789452046810 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3753487017719311786} - m_CullTransparentMesh: 1 ---- !u!114 &5039049764830588271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3753487017719311786} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.2} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5507657471101954199 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4558350226998646492} - - component: {fileID: 5418841466193419660} - - component: {fileID: 7034513263638092388} - - component: {fileID: 379448452010022709} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4558350226998646492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5507657471101954199} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2993541527497414948} - m_Father: {fileID: 3441857903058390880} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &5418841466193419660 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5507657471101954199} - m_CullTransparentMesh: 1 ---- !u!114 &7034513263638092388 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5507657471101954199} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &379448452010022709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5507657471101954199} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!1 &7617685218845582727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2993541527497414948} - - component: {fileID: 4336319649774895248} - - component: {fileID: 5830598202637093084} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2993541527497414948 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7617685218845582727} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4558350226998646492} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 27.088018, y: 0.5727863} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &4336319649774895248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7617685218845582727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 16 - m_Right: 16 - m_Top: 12 - m_Bottom: 12 - m_ChildAlignment: 0 - m_Spacing: 8 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &5830598202637093084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7617685218845582727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!1 &7713624964636010189 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8684544896258824048} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8684544896258824048 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7713624964636010189} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6817195836431992253} - m_Father: {fileID: 8128863749803209789} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8908293314071552192 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4451514694375844671} - - component: {fileID: 6771061199845259360} - - component: {fileID: 5701708531216688908} - - component: {fileID: 8915376192930860593} - m_Layer: 5 - m_Name: Scrollbar Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4451514694375844671 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8908293314071552192} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2090578403611810331} - m_Father: {fileID: 3441857903058390880} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6771061199845259360 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8908293314071552192} - m_CullTransparentMesh: 1 ---- !u!114 &5701708531216688908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8908293314071552192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.101960786} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8915376192930860593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8908293314071552192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5039049764830588271} - m_HandleRect: {fileID: 7533351787154748278} - m_Direction: 2 - m_Value: 0 - m_Size: 0.95952785 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab.meta b/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab.meta deleted file mode 100644 index 865b5aadb..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Console.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3bd1ffa1267fbef6fbdd99b4a8e699ff -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab b/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab deleted file mode 100644 index 057c8572d..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab +++ /dev/null @@ -1,320 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2894631413469463848 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2894631413469463849} - - component: {fileID: 2894631413469463851} - - component: {fileID: 2894631413469463850} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2894631413469463849 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413469463848} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2894631413651981082} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &2894631413469463851 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413469463848} - m_CullTransparentMesh: 1 ---- !u!114 &2894631413469463850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413469463848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!1 &2894631413968208288 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2894631413968208289} - - component: {fileID: 2894631413968208291} - - component: {fileID: 2894631413968208290} - m_Layer: 5 - m_Name: Message - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2894631413968208289 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413968208288} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2894631413651981082} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &2894631413968208291 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413968208288} - m_CullTransparentMesh: 1 ---- !u!114 &2894631413968208290 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631413968208288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 289 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!1 &2894631414300269451 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2894631413651981082} - - component: {fileID: 2894631414300269493} - - component: {fileID: 6811715620017639003} - m_Layer: 5 - m_Name: Log Line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2894631413651981082 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414300269451} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2894631413469463849} - - {fileID: 2894631414545771617} - - {fileID: 2894631413968208289} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &2894631414300269493 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414300269451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 12 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &6811715620017639003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414300269451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 405a6db3b0cb700fbb3f15f3f11d3af5, type: 3} - m_Name: - m_EditorClassIdentifier: - _utcTimeArea: {fileID: 2894631413469463850} - _tagArea: {fileID: 2894631414545771618} - _messageArea: {fileID: 2894631413968208290} ---- !u!1 &2894631414545771616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2894631414545771617} - - component: {fileID: 2894631414545771619} - - component: {fileID: 2894631414545771618} - m_Layer: 5 - m_Name: Tag - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2894631414545771617 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414545771616} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2894631413651981082} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &2894631414545771619 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414545771616} - m_CullTransparentMesh: 1 ---- !u!114 &2894631414545771618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2894631414545771616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab.meta b/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab.meta deleted file mode 100644 index 303cfb686..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Console/Log Line.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b3a48036f640af0a8b3f1705d5d7e461 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/UI/Objects/Main Canvas.prefab b/Assets/MediaPipeUnity/Samples/UI/Objects/Main Canvas.prefab index 959235ef7..82de6e461 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Objects/Main Canvas.prefab +++ b/Assets/MediaPipeUnity/Samples/UI/Objects/Main Canvas.prefab @@ -1,64 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &9217008185109822974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4073763783843571381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} - m_Name: - m_EditorClassIdentifier: - _modalPanel: {fileID: 8571076843237194837} - _contents: {fileID: 2286573430237446446, guid: 5920f5c607ecc6ea88b86fbecab72418, - type: 3} ---- !u!114 &8571076843968688109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5158692484344150006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} - m_Name: - m_EditorClassIdentifier: - _modalPanel: {fileID: 8571076843237194837} - _contents: {fileID: 6134773167894791910, guid: d00f9eb5648585662ba6825f8ab8400f, - type: 3} ---- !u!114 &8571076843139220523 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5158692485022354233} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} - m_Name: - m_EditorClassIdentifier: - _modalPanel: {fileID: 8571076843237194837} - _contents: {fileID: 6938625115693525800, guid: 43e0b06a07be91d9ab8df9c5e822664a, - type: 3} ---- !u!114 &8571076843980202029 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5158692485785395903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} - m_Name: - m_EditorClassIdentifier: - _modalPanel: {fileID: 8571076843237194837} - _contents: {fileID: 0} --- !u!1 &8571076842338426121 GameObject: m_ObjectHideFlags: 0 @@ -88,11 +29,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8571076842583978917} - {fileID: 8571076843237194836} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -116,7 +57,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -189,10 +132,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8571076844286272849} m_Father: {fileID: 8571076842583978917} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -291,12 +234,12 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8571076844135231236} - {fileID: 8571076842341243443} - {fileID: 8571076843876106073} m_Father: {fileID: 8571076842338426133} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -372,9 +315,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8571076842338426133} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -436,7 +379,9 @@ Canvas: m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 2 m_TargetDisplay: 0 @@ -470,6 +415,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _solution: {fileID: 0} + _taskApiRunner: {fileID: 0} --- !u!1 &8571076843876106078 GameObject: m_ObjectHideFlags: 0 @@ -499,13 +445,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5158692485785395896} - {fileID: 5158692485022354238} - - {fileID: 5158692484344150001} - - {fileID: 4073763783843571378} m_Father: {fileID: 8571076842583978917} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -604,9 +548,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8571076842583978917} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -651,53 +595,14 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8747516472398760886 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8571076844286272854} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} - m_Name: - m_EditorClassIdentifier: - _modalPanel: {fileID: 8571076843237194837} - _contents: {fileID: 6134773167894791910, guid: c11d1e65e08886c308c31ea8d84e4ee6, - type: 3} ---- !u!1001 &715268676278483529 +--- !u!1001 &5158692485707364778 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8571076843876106073} + serializedVersion: 3 + m_TransformParent: {fileID: 8571076842341243443} m_Modifications: - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -712,7 +617,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 9217008185109822974} + objectReference: {fileID: 8747516472398760886} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -721,7 +626,7 @@ PrefabInstance: - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Open + value: OpenAndPause objectReference: {fileID: 0} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -746,7 +651,7 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -771,12 +676,12 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_SizeDelta.x - value: 90 + value: 80 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_SizeDelta.y - value: 90 + value: 80 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -801,17 +706,17 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -841,54 +746,67 @@ PrefabInstance: - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_Name - value: Console Button - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Text - value: \uf120 - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Color.r - value: 0 + value: MenuButton objectReference: {fileID: 0} - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_FontData.m_FontSize - value: 36 + value: 40 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8747516472398760886} m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!1 &4073763783843571381 stripped +--- !u!224 &8571076844286272849 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + m_PrefabInstance: {fileID: 5158692485707364778} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8571076844286272854 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} - m_PrefabInstance: {fileID: 715268676278483529} + m_PrefabInstance: {fileID: 5158692485707364778} m_PrefabAsset: {fileID: 0} ---- !u!224 &4073763783843571378 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 715268676278483529} +--- !u!114 &8747516472398760886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5158692485707364778 + m_GameObject: {fileID: 8571076844286272854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} + m_Name: + m_EditorClassIdentifier: + _modalPanel: {fileID: 8571076843237194837} + _contents: {fileID: 6134773167894791910, guid: c11d1e65e08886c308c31ea8d84e4ee6, + type: 3} +--- !u!1001 &8571076842728855493 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8571076842341243443} + serializedVersion: 3 + m_TransformParent: {fileID: 8571076843876106073} m_Modifications: + - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -903,7 +821,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 8747516472398760886} + objectReference: {fileID: 8571076843139220523} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -937,7 +855,7 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -962,12 +880,12 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_SizeDelta.x - value: 80 + value: 90 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 90 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -992,17 +910,17 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -1032,7 +950,12 @@ PrefabInstance: - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_Name - value: MenuButton + value: ImageSource Config Button + objectReference: {fileID: 0} + - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + propertyPath: m_Text + value: \uf030 objectReference: {fileID: 0} - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -1040,24 +963,47 @@ PrefabInstance: value: 40 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8571076843139220523} m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!1 &8571076844286272854 stripped +--- !u!1 &5158692485022354233 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} - m_PrefabInstance: {fileID: 5158692485707364778} + m_PrefabInstance: {fileID: 8571076842728855493} m_PrefabAsset: {fileID: 0} ---- !u!224 &8571076844286272849 stripped +--- !u!114 &8571076843139220523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5158692485022354233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} + m_Name: + m_EditorClassIdentifier: + _modalPanel: {fileID: 8571076843237194837} + _contents: {fileID: 6938625115693525800, guid: 43e0b06a07be91d9ab8df9c5e822664a, + type: 3} +--- !u!224 &5158692485022354238 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} - m_PrefabInstance: {fileID: 5158692485707364778} + m_PrefabInstance: {fileID: 8571076842728855493} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8571076842728855493 +--- !u!1001 &8571076843558747715 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8571076843876106073} m_Modifications: - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, @@ -1084,7 +1030,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 8571076843139220523} + objectReference: {fileID: 8571076843980202029} - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -1118,7 +1064,7 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -1173,17 +1119,17 @@ PrefabInstance: - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} @@ -1213,401 +1159,50 @@ PrefabInstance: - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_Name - value: ImageSource Config Button + value: Graph Config Button objectReference: {fileID: 0} - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_Text - value: \uf030 + value: \uf7d9 objectReference: {fileID: 0} - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} propertyPath: m_FontData.m_FontSize - value: 40 + value: 36 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8571076843980202029} m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!224 &5158692485022354238 stripped +--- !u!224 &5158692485785395896 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} - m_PrefabInstance: {fileID: 8571076842728855493} + m_PrefabInstance: {fileID: 8571076843558747715} m_PrefabAsset: {fileID: 0} ---- !u!1 &5158692485022354233 stripped +--- !u!1 &5158692485785395903 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} - m_PrefabInstance: {fileID: 8571076842728855493} + m_PrefabInstance: {fileID: 8571076843558747715} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8571076842849397514 -PrefabInstance: +--- !u!114 &8571076843980202029 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8571076843876106073} - m_Modifications: - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 8571076843968688109} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Open - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Mediapipe.Unity.UI.ModalButton, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Name - value: Global Config Button - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Text - value: \uf0ac - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_FontData.m_FontSize - value: 42 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!224 &5158692484344150001 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 8571076842849397514} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5158692484344150006 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 8571076842849397514} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8571076843558747715 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8571076843876106073} - m_Modifications: - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484025, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 8571076843980202029} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OpenAndPause - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Mediapipe.Unity.UI.ModalButton, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484026, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_SizeDelta.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Name - value: Graph Config Button - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_Text - value: \uf7d9 - objectReference: {fileID: 0} - - target: {fileID: 3559479237152386007, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - propertyPath: m_FontData.m_FontSize - value: 36 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 43e9f0194e843b641ab8083b120feac8, type: 3} ---- !u!1 &5158692485785395903 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3559479236321484028, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 8571076843558747715} - m_PrefabAsset: {fileID: 0} ---- !u!224 &5158692485785395896 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3559479236321484027, guid: 43e9f0194e843b641ab8083b120feac8, - type: 3} - m_PrefabInstance: {fileID: 8571076843558747715} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5158692485785395903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8fb55141659b9607bbd8859e1dbcf04, type: 3} + m_Name: + m_EditorClassIdentifier: + _modalPanel: {fileID: 8571076843237194837} + _contents: {fileID: 0} diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs deleted file mode 100644 index 2d0f0e54d..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -namespace Mediapipe.Unity.UI -{ - public class GUIConsole : MonoBehaviour - { - [SerializeField] private GameObject _logLinePrefab; - [SerializeField] private int _maxLines = 200; - - private const string _ContentPath = "Viewport/Content"; - - private Transform _contentRoot; - private MemoizedLogger _logger; - private Queue _scheduledLogs; - private int _lines = 0; - - private ScrollRect scrollRect => gameObject.GetComponent(); - - private void Start() - { - _scheduledLogs = new Queue(); - InitializeView(); - } - - private void LateUpdate() - { - RenderScheduledLogs(); - } - - private void OnDestroy() - { - _logger.OnLogOutput -= ScheduleLog; - } - - private void InitializeView() - { - _contentRoot = gameObject.transform.Find(_ContentPath).gameObject.transform; - - if (!(Logger.InternalLogger is MemoizedLogger)) - { - return; - } - - _logger = (MemoizedLogger)Logger.InternalLogger; - lock (((ICollection)_logger.histories).SyncRoot) - { - foreach (var log in _logger.histories) - { - AppendLog(log); - } - _logger.OnLogOutput += ScheduleLog; - } - - var _ = StartCoroutine(ScrollToBottom()); - } - - private void ScheduleLog(MemoizedLogger.LogStruct logStruct) - { - lock (((ICollection)_scheduledLogs).SyncRoot) - { - _scheduledLogs.Enqueue(logStruct); - } - } - - private void RenderScheduledLogs() - { - lock (((ICollection)_scheduledLogs).SyncRoot) - { - while (_scheduledLogs.Count > 0) - { - AppendLog(_scheduledLogs.Dequeue()); - } - } - - if (scrollRect.verticalNormalizedPosition < 1e-6) - { - var _ = StartCoroutine(ScrollToBottom()); - } - } - - private void AppendLog(MemoizedLogger.LogStruct logStruct) - { - var logLine = Instantiate(_logLinePrefab, _contentRoot).GetComponent(); - logLine.SetLog(logStruct); - - if (++_lines > _maxLines) - { - Destroy(_contentRoot.GetChild(0).gameObject); - _lines--; - } - } - - private IEnumerator ScrollToBottom() - { - yield return new WaitForEndOfFrame(); - Canvas.ForceUpdateCanvases(); - scrollRect.verticalNormalizedPosition = 0f; - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs.meta b/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs.meta deleted file mode 100644 index 9062f454a..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 627c44f7498ce8ccfa83e353108ae40a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs deleted file mode 100644 index 47961318e..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using UnityEngine.UI; - -namespace Mediapipe.Unity.UI -{ - public class GlobalConfig : ModalContents - { - private const string _GlogLogtostederrPath = "Scroll View/Viewport/Contents/GlogLogtostderr/Toggle"; - private const string _GlogStderrthresholdPath = "Scroll View/Viewport/Contents/GlogStderrthreshold/Dropdown"; - private const string _GlogMinloglevelPath = "Scroll View/Viewport/Contents/GlogMinloglevel/Dropdown"; - private const string _GlogVPath = "Scroll View/Viewport/Contents/GlogV/Dropdown"; - private const string _GlogLogDirPath = "Scroll View/Viewport/Contents/GlogLogDir/InputField"; - - private Toggle _glogLogtostderrInput; - private Dropdown _glogStderrthresholdInput; - private Dropdown _glogMinloglevelInput; - private Dropdown _glogVInput; - private InputField _glogLogDirInput; - - private void Start() - { - InitializeGlogLogtostderr(); - InitializeGlogStderrthreshold(); - InitializeGlogMinloglevel(); - InitializeGlogV(); - InitializeGlogLogDir(); - } - - public void SaveAndExit() - { - GlobalConfigManager.GlogLogtostderr = _glogLogtostderrInput.isOn; - GlobalConfigManager.GlogStderrthreshold = _glogStderrthresholdInput.value; - GlobalConfigManager.GlogMinloglevel = _glogMinloglevelInput.value; - GlobalConfigManager.GlogLogDir = _glogLogDirInput.text; - GlobalConfigManager.GlogV = _glogVInput.value; - - GlobalConfigManager.Commit(); - Exit(); - } - - private void InitializeGlogLogtostderr() - { - _glogLogtostderrInput = gameObject.transform.Find(_GlogLogtostederrPath).gameObject.GetComponent(); - _glogLogtostderrInput.isOn = GlobalConfigManager.GlogLogtostderr; - } - - private void InitializeGlogStderrthreshold() - { - _glogStderrthresholdInput = gameObject.transform.Find(_GlogStderrthresholdPath).gameObject.GetComponent(); - _glogStderrthresholdInput.value = GlobalConfigManager.GlogStderrthreshold; - } - - private void InitializeGlogMinloglevel() - { - _glogMinloglevelInput = gameObject.transform.Find(_GlogMinloglevelPath).gameObject.GetComponent(); - _glogMinloglevelInput.value = GlobalConfigManager.GlogMinloglevel; - } - - private void InitializeGlogV() - { - _glogVInput = gameObject.transform.Find(_GlogVPath).gameObject.GetComponent(); - _glogVInput.value = GlobalConfigManager.GlogV; - } - - private void InitializeGlogLogDir() - { - _glogLogDirInput = gameObject.transform.Find(_GlogLogDirPath).gameObject.GetComponent(); - _glogLogDirInput.text = GlobalConfigManager.GlogLogDir; - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs.meta b/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs.meta deleted file mode 100644 index b62b0b398..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/GlobalConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5a0e103d2920f990ab08fe7bada48cc4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/ImageSourceConfig.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/ImageSourceConfig.cs index 18a998dac..335ecd2e8 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/ImageSourceConfig.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/ImageSourceConfig.cs @@ -10,7 +10,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Mediapipe.Unity.UI +namespace Mediapipe.Unity.Sample.UI { public class ImageSourceConfig : ModalContents { @@ -65,7 +65,7 @@ private void InitializeSourceType() _sourceTypeInput.onValueChanged.AddListener(delegate { - ImageSourceProvider.ImageSource = _solution.bootstrap.GetImageSource((ImageSourceType)_sourceTypeInput.value); + ImageSourceProvider.Switch((ImageSourceType)_sourceTypeInput.value); _isChanged = true; InitializeContents(); }); diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs deleted file mode 100644 index 07f71e888..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) 2021 homuler -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -using System; -using UnityEngine; -using UnityEngine.UI; - -namespace Mediapipe.Unity -{ -#pragma warning disable IDE0065 - using Color = UnityEngine.Color; -#pragma warning restore IDE0065 - - public class LogLine : MonoBehaviour - { - [SerializeField] private Text _utcTimeArea; - [SerializeField] private Text _tagArea; - [SerializeField] private Text _messageArea; - - public void SetLog(MemoizedLogger.LogStruct logStruct) - { - _utcTimeArea.text = FormatUtcTime(logStruct.utcTime); - _tagArea.text = FormatTag(logStruct.tag); - _messageArea.text = FormatMessage(logStruct.message); - _messageArea.color = GetMessageColor(logStruct.logLevel); - } - - private string FormatUtcTime(DateTime utcTime) - { - return utcTime.ToString("MMM dd hh:mm:ss.fff"); - } - - private string FormatTag(string tag) - { - return (tag == null || tag.Length == 0) ? null : $"{tag}:"; - } - - private string FormatMessage(object message) - { - return message == null ? "Null" : message.ToString(); - } - - private Color GetMessageColor(Logger.LogLevel logLevel) - { - switch (logLevel) - { - case Logger.LogLevel.Fatal: - case Logger.LogLevel.Error: - { - return Color.red; - } - case Logger.LogLevel.Warn: - { - return Color.yellow; - } - case Logger.LogLevel.Info: - { - return Color.green; - } - case Logger.LogLevel.Debug: - { - return Color.gray; - } - case Logger.LogLevel.Verbose: - default: - { - return Color.white; - } - } - } - } -} diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs.meta b/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs.meta deleted file mode 100644 index 3960076fb..000000000 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/LogLine.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 405a6db3b0cb700fbb3f15f3f11d3af5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/Modal.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/Modal.cs index caa5f5b68..5d5013b39 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/Modal.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/Modal.cs @@ -6,12 +6,12 @@ using UnityEngine; -namespace Mediapipe.Unity.UI +namespace Mediapipe.Unity.Sample.UI { public class Modal : MonoBehaviour { [SerializeField] private Solution _solution; // TODO: remove this field - [SerializeField] private Sample.TaskApiRunner _taskApiRunner; + [SerializeField] private TaskApiRunner _taskApiRunner; private GameObject _contents; diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalButton.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalButton.cs index 6588bcd20..49f6b557a 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalButton.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalButton.cs @@ -6,7 +6,7 @@ using UnityEngine; -namespace Mediapipe.Unity.UI +namespace Mediapipe.Unity.Sample.UI { public class ModalButton : MonoBehaviour { diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalContents.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalContents.cs index be85e318b..b616bfef4 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalContents.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/ModalContents.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Mediapipe.Unity.UI +namespace Mediapipe.Unity.Sample.UI { public class ModalContents : MonoBehaviour { diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/SolutionMenu.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/SolutionMenu.cs index 259b3ab77..cff724f8e 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/SolutionMenu.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/SolutionMenu.cs @@ -10,7 +10,7 @@ using UnityEngine.UI; using UnityEngine.SceneManagement; -namespace Mediapipe.Unity.UI +namespace Mediapipe.Unity.Sample.UI { #pragma warning disable IDE0065 using Color = UnityEngine.Color; @@ -31,22 +31,22 @@ private void Start() var solutionCount = SceneManager.sceneCountInBuildSettings; Transform currentRow = null; - for (var i = 1; i < solutionCount; i++) - { // skip the first scene (i.e. Start Scene) - if (i % 2 == 1) + for (var i = 0; i < solutionCount; i++) + { + if (i % 2 == 0) { // 2 buttons in a row currentRow = InitializeRow(); } - var button = GetButtonInRow(currentRow, (i - 1) % 2); + var button = GetButtonInRow(currentRow, i % 2); var buildIndex = i; button.transform.GetComponentInChildren().text = GetSceneNameByBuildIndex(buildIndex); button.onClick.AddListener(() => { var _ = StartCoroutine(LoadSceneAsync(buildIndex)); }); } - if (solutionCount % 2 == 0) - { // (solutionCount - 1) % 2 == 1 + if (solutionCount % 2 == 1) + { var unusedButton = GetButtonInRow(currentRow, 1); HideButton(unusedButton); } diff --git a/Packages/com.github.homuler.mediapipe/package.json b/Packages/com.github.homuler.mediapipe/package.json index 095dcf1e8..971c28cfa 100644 --- a/Packages/com.github.homuler.mediapipe/package.json +++ b/Packages/com.github.homuler.mediapipe/package.json @@ -15,8 +15,7 @@ ], "scripts": { "setupSampleDir": "rm -rf $(npm prefix)/Samples~ && mkdir -p $(npm prefix)/Samples~", - "removeStartScene": "rm \"$(npm prefix)/Samples~/Solutions/Scenes/Start Scene.unity\" && rm \"$(npm prefix)/Samples~/Solutions/Scenes/Start Scene.unity.meta\"", - "copySolutionSamples": "cp -r $(npm prefix)/../../Assets/MediaPipeUnity/Samples $(npm prefix)/Samples~/Solutions && npm run removeStartScene", + "copySolutionSamples": "cp -r $(npm prefix)/../../Assets/MediaPipeUnity/Samples $(npm prefix)/Samples~/Solutions", "copyTutorial": "cp -r $(npm prefix)/../../Assets/MediaPipeUnity/Tutorial $(npm prefix)/Samples~/Tutorial", "prepack": "npm run setupSampleDir && npm run copySolutionSamples && npm run copyTutorial", "postpack": "rm -rf $(npm prefix)/Samples~" diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7c868b604..372eab2ac 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,6 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/MediaPipeUnity/Samples/Scenes/Start Scene.unity - guid: f7b359c19e6ae2d208e5ca4608b7c0b8 - enabled: 1 path: Assets/MediaPipeUnity/Samples/Scenes/Face Detection/Face Detection.unity guid: 17a223a9abd188eb6b6656cf37880d62 diff --git a/README.md b/README.md index 09c14a0b1..a1ad58031 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Here is a list of [solutions](https://google.github.io/mediapipe/solutions/solut | Object Detection | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | ### UnityEditor -Select `Mediapipe/Samples/Scenes/Start Scene` and play. +Select any scenes under `Mediapipe/Samples/Scenes` and play. ### Desktop