diff --git a/wrappers/csharp/Intel.RealSense/CMakeLists.txt b/wrappers/csharp/Intel.RealSense/CMakeLists.txt index 822c617cf6..ce5089614a 100644 --- a/wrappers/csharp/Intel.RealSense/CMakeLists.txt +++ b/wrappers/csharp/Intel.RealSense/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(${PROJECT_NAME} StreamProfile.cs Types.cs SoftwareDevice.cs + Option.cs .nuget/Intel.RealSense.targets Properties/AssemblyInfo.cs @@ -56,4 +57,8 @@ add_dependencies(${PROJECT_NAME} realsense2) set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER Wrappers/csharp -) \ No newline at end of file +) + +set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES + "System" +) diff --git a/wrappers/csharp/Intel.RealSense/Device.cs b/wrappers/csharp/Intel.RealSense/Device.cs index a24aff0964..1da9cb9b50 100644 --- a/wrappers/csharp/Intel.RealSense/Device.cs +++ b/wrappers/csharp/Intel.RealSense/Device.cs @@ -110,7 +110,7 @@ internal Device(IntPtr dev) public class CameraInfos { - IntPtr m_device; + readonly IntPtr m_device; public CameraInfos(IntPtr device) { m_device = device; } public string this[CameraInfo info] @@ -258,6 +258,12 @@ internal PlaybackDevice(IntPtr dev) : base(dev) } + + protected override void Dispose(bool disposing) + { + // Intentionally empty, does not own the native device, only wraps it. + } + public static PlaybackDevice FromDevice(Device dev) { object error; @@ -346,7 +352,7 @@ public float Speed public class RecordDevice : Device { - IntPtr m_dev; + readonly IntPtr m_dev; public RecordDevice(Device dev, string file) : base(IntPtr.Zero) { diff --git a/wrappers/csharp/Intel.RealSense/Frame.cs b/wrappers/csharp/Intel.RealSense/Frame.cs index e484467a26..6ed2f3fa7f 100644 --- a/wrappers/csharp/Intel.RealSense/Frame.cs +++ b/wrappers/csharp/Intel.RealSense/Frame.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Runtime.InteropServices; namespace Intel.RealSense @@ -6,15 +7,30 @@ namespace Intel.RealSense public class Frame : IDisposable { internal HandleRef m_instance; + public static readonly FramePool Pool = new FramePool(ptr => new Frame(ptr)); + + public IntPtr NativePtr { get { return m_instance.Handle; } } public Frame(IntPtr ptr) { m_instance = new HandleRef(this, ptr); - NativeMethods.rs2_keep_frame(m_instance.Handle); + } + + internal static Frame CreateFrame(IntPtr ptr) + { + object error; + if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.Points, out error) > 0) + return Points.Pool.Get(ptr); + else if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.DepthFrame, out error) > 0) + return DepthFrame.Pool.Get(ptr); + else if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.VideoFrame, out error) > 0) + return VideoFrame.Pool.Get(ptr); + else + return Frame.Pool.Get(ptr); } #region IDisposable Support - private bool disposedValue = false; // To detect redundant calls + internal bool disposedValue = false; // To detect redundant calls protected virtual void Dispose(bool disposing) { @@ -49,18 +65,28 @@ public void Dispose() } #endregion - public void Release() + public virtual void Release() { if (m_instance.Handle != IntPtr.Zero) NativeMethods.rs2_release_frame(m_instance.Handle); m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); } public Frame Clone() { object error; NativeMethods.rs2_frame_add_ref(m_instance.Handle, out error); - return new Frame(m_instance.Handle); + return CreateFrame(m_instance.Handle); + } + + public bool IsComposite + { + get + { + object error; + return NativeMethods.rs2_is_frame_extendable_to(m_instance.Handle, Extension.CompositeFrame, out error) > 0; + } } public IntPtr Data @@ -77,7 +103,7 @@ public StreamProfile Profile get { object error; - return new StreamProfile(NativeMethods.rs2_get_frame_stream_profile(m_instance.Handle, out error)); + return StreamProfile.Pool.Get(NativeMethods.rs2_get_frame_stream_profile(m_instance.Handle, out error)); } } @@ -115,6 +141,8 @@ public TimestampDomain TimestampDomain public class VideoFrame : Frame { + public static readonly new FramePool Pool = new FramePool(ptr => new VideoFrame(ptr)); + public VideoFrame(IntPtr ptr) : base(ptr) { } @@ -164,26 +192,69 @@ public int BitsPerPixel /// /// /// - //public void CopyTo(out T[] array) public void CopyTo(T[] array) { if (array == null) - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); + var handle = GCHandle.Alloc(array, GCHandleType.Pinned); + try + { + //System.Diagnostics.Debug.Assert((array.Length * Marshal.SizeOf(typeof(T))) == (Stride * Height)); + CopyTo(handle.AddrOfPinnedObject()); + } + finally + { + handle.Free(); + } + } + + public void CopyTo(IntPtr ptr) + { + //System.Diagnostics.Debug.Assert(ptr != IntPtr.Zero); + NativeMethods.memcpy(ptr, Data, Stride * Height); + } + + /// + /// Copy from data from managed array + /// + /// + /// + public void CopyFrom(T[] array) + { + if (array == null) + throw new ArgumentNullException(nameof(array)); var handle = GCHandle.Alloc(array, GCHandleType.Pinned); try { //System.Diagnostics.Debug.Assert((array.Length * Marshal.SizeOf(typeof(T))) == (Stride * Height)); - NativeMethods.memcpy(handle.AddrOfPinnedObject(), Data, Stride * Height); + CopyFrom(handle.AddrOfPinnedObject()); } finally { handle.Free(); } } + + public void CopyFrom(IntPtr ptr) + { + //System.Diagnostics.Debug.Assert(ptr != IntPtr.Zero); + NativeMethods.memcpy(Data, ptr, Stride * Height); + } + + public override void Release() + { + //base.Release(); + if (m_instance.Handle != IntPtr.Zero) + NativeMethods.rs2_release_frame(m_instance.Handle); + m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); + } } public class DepthFrame : VideoFrame { + public static readonly new FramePool Pool = new FramePool(ptr => new DepthFrame(ptr)); + public DepthFrame(IntPtr ptr) : base(ptr) { } @@ -193,11 +264,22 @@ public float GetDistance(int x, int y) object error; return NativeMethods.rs2_depth_frame_get_distance(m_instance.Handle, x, y, out error); } + + public override void Release() + { + //base.Release(); + if (m_instance.Handle != IntPtr.Zero) + NativeMethods.rs2_release_frame(m_instance.Handle); + m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); + } } public class Points : Frame { + public static readonly new FramePool Pool = new FramePool(ptr => new Points(ptr)); + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)] public struct Vertex { @@ -210,6 +292,7 @@ public struct TextureCoordinate public float u; public float v; } + public Points(IntPtr ptr) : base(ptr) { } @@ -240,7 +323,7 @@ public IntPtr VertexData public void CopyTo(Vertex[] array) { if (array == null) - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); var handle = GCHandle.Alloc(array, GCHandleType.Pinned); try { @@ -267,7 +350,7 @@ public IntPtr TextureData public void CopyTo(TextureCoordinate[] textureArray) { if (textureArray == null) - throw new ArgumentNullException("textureArray"); + throw new ArgumentNullException(nameof(textureArray)); var handle = GCHandle.Alloc(textureArray, GCHandleType.Pinned); try @@ -280,45 +363,49 @@ public void CopyTo(TextureCoordinate[] textureArray) handle.Free(); } } - } - - - - class FrameMarshaler : ICustomMarshaler - { - private static FrameMarshaler Instance; - - public static ICustomMarshaler GetInstance(string s) - { - if (Instance == null) - { - Instance = new FrameMarshaler(); - } - return Instance; - } - public void CleanUpManagedData(object ManagedObj) + public override void Release() { + //base.Release(); + if (m_instance.Handle != IntPtr.Zero) + NativeMethods.rs2_release_frame(m_instance.Handle); + m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); } + } - public void CleanUpNativeData(IntPtr pNativeData) - { - } + public class FramePool where T : Frame + { + readonly Stack stack = new Stack(); + readonly object locker = new object(); + readonly Func factory; - public int GetNativeDataSize() + public FramePool(Func factory) { - //return IntPtr.Size; - return -1; + this.factory = factory; } - public IntPtr MarshalManagedToNative(object ManagedObj) + public T Get(IntPtr ptr) { - throw new NotImplementedException(); + + lock (locker) + { + if(stack.Count == 0) + return factory(ptr); + T f = stack.Pop(); + f.m_instance = new HandleRef(f, ptr); + f.disposedValue = false; + //NativeMethods.rs2_keep_frame(ptr); + return f; + } } - public object MarshalNativeToManaged(IntPtr pNativeData) + public void Release(T t) { - return new Frame(pNativeData); + lock (locker) + { + stack.Push(t); + } } } } diff --git a/wrappers/csharp/Intel.RealSense/FrameQueue.cs b/wrappers/csharp/Intel.RealSense/FrameQueue.cs index 2581186ec1..bd46378f6f 100644 --- a/wrappers/csharp/Intel.RealSense/FrameQueue.cs +++ b/wrappers/csharp/Intel.RealSense/FrameQueue.cs @@ -11,35 +11,37 @@ public class FrameQueue : IDisposable, IEnumerable { internal HandleRef m_instance; - public FrameQueue(int capacity = 10) + public FrameQueue(int capacity = 1) { object error; m_instance = new HandleRef(this, NativeMethods.rs2_create_frame_queue(capacity, out error)); } - public bool PollForFrame(out Frame frame, FramesReleaser releaser = null) + public bool PollForFrame(out Frame frame) { object error; - if (NativeMethods.rs2_poll_for_frame(m_instance.Handle, out frame, out error) > 0) + IntPtr ptr; + if (NativeMethods.rs2_poll_for_frame(m_instance.Handle, out ptr, out error) > 0) { - frame = FramesReleaser.ScopedReturn(releaser, FrameSet.CreateFrame(frame.m_instance.Handle)); + frame = Frame.CreateFrame(ptr); return true; } + frame = null; return false; } - public Frame WaitForFrame(FramesReleaser releaser = null) + public Frame WaitForFrame(uint timeout_ms = 5000) { object error; - var ptr = NativeMethods.rs2_wait_for_frame(m_instance.Handle, 5000, out error); - return FramesReleaser.ScopedReturn(releaser, FrameSet.CreateFrame(ptr)); + var ptr = NativeMethods.rs2_wait_for_frame(m_instance.Handle, timeout_ms, out error); + return Frame.CreateFrame(ptr); } - public FrameSet WaitForFrames(FramesReleaser releaser = null) + public FrameSet WaitForFrames(uint timeout_ms = 5000) { object error; - var ptr = NativeMethods.rs2_wait_for_frame(m_instance.Handle, 5000, out error); - return FramesReleaser.ScopedReturn(releaser, new FrameSet(ptr)); + var ptr = NativeMethods.rs2_wait_for_frame(m_instance.Handle, timeout_ms, out error); + return FrameSet.Pool.Get(ptr); } public void Enqueue(Frame f) diff --git a/wrappers/csharp/Intel.RealSense/FrameSet.cs b/wrappers/csharp/Intel.RealSense/FrameSet.cs index 5c69e0d464..24cf115263 100644 --- a/wrappers/csharp/Intel.RealSense/FrameSet.cs +++ b/wrappers/csharp/Intel.RealSense/FrameSet.cs @@ -5,48 +5,67 @@ namespace Intel.RealSense { - public class FrameSet : IDisposable, IEnumerable + public class FrameSet : ICompositeDisposable, IEnumerable { internal HandleRef m_instance; - readonly int m_count; + internal int m_count; + internal static readonly FrameSetPool Pool = new FrameSetPool(); + internal readonly FrameEnumerator m_enum; + + public IntPtr NativePtr { get { return m_instance.Handle; } } public Frame AsFrame() { object error; NativeMethods.rs2_frame_add_ref(m_instance.Handle, out error); - return CreateFrame(m_instance.Handle); + return Frame.CreateFrame(m_instance.Handle); } - public static FrameSet FromFrame(Frame composite, FramesReleaser releaser = null) + public static FrameSet FromFrame(Frame composite) { - object error; - if (NativeMethods.rs2_is_frame_extendable_to(composite.m_instance.Handle, - Extension.CompositeFrame, out error) > 0) + if (composite.IsComposite) { + object error; NativeMethods.rs2_frame_add_ref(composite.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, new FrameSet(composite.m_instance.Handle)); + return FrameSet.Pool.Get(composite.m_instance.Handle); } - throw new Exception("The frame is a not composite frame"); + throw new ArgumentException("The frame is a not composite frame", nameof(composite)); } - internal static Frame CreateFrame(IntPtr ptr) + [Obsolete("This method is obsolete. Use DisposeWith method instead")] + public static FrameSet FromFrame(Frame composite, FramesReleaser releaser) { - object error; - if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.Points, out error) > 0) - return new Points(ptr); - else if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.DepthFrame, out error) > 0) - return new DepthFrame(ptr); - else if (NativeMethods.rs2_is_frame_extendable_to(ptr, Extension.VideoFrame, out error) > 0) - return new VideoFrame(ptr); - else - return new Frame(ptr); + return FromFrame(composite).DisposeWith(releaser); + } + + public void ForEach(Action action) + { + for (int i = 0; i < m_count; i++) + { + using (var frame = this[i]) + action(frame); + } } public T FirstOrDefault(Stream stream, Format format = Format.Any) where T : Frame { - foreach (Frame frame in this) + for (int i = 0; i < m_count; i++) + { + var frame = this[i]; + using (var fp = frame.Profile) + if (fp.Stream == stream && (format == Format.Any || fp.Format == format)) + return frame as T; + frame.Dispose(); + } + return null; + } + + public T FirstOrDefault(Predicate predicate) where T : Frame + { + for (int i = 0; i < m_count; i++) { - if (frame.Profile.Stream == stream && (Format.Any == format || frame.Profile.Format == format)) + var frame = this[i]; + if (predicate(frame)) return frame as T; frame.Dispose(); } @@ -57,7 +76,7 @@ public DepthFrame DepthFrame { get { - return FirstOrDefault(Stream.Depth); + return FirstOrDefault(Stream.Depth, Format.Z16); } } @@ -69,19 +88,24 @@ public VideoFrame ColorFrame } } - public IEnumerator GetEnumerator() + public VideoFrame InfraredFrame { - object error; - for (int i = 0; i < m_count; i++) + get { - var ptr = NativeMethods.rs2_extract_frame(m_instance.Handle, i, out error); - yield return CreateFrame(ptr); + return FirstOrDefault(Stream.Infrared); } } + public IEnumerator GetEnumerator() + { + m_enum.Reset(); + return m_enum; + } + IEnumerator IEnumerable.GetEnumerator() { - return GetEnumerator(); + m_enum.Reset(); + return m_enum; } public int Count @@ -98,7 +122,7 @@ public Frame this[int index] { object error; var ptr = NativeMethods.rs2_extract_frame(m_instance.Handle, index, out error); - return CreateFrame(ptr); + return Frame.CreateFrame(ptr); } } @@ -106,14 +130,24 @@ public Frame this[int index] { get { - foreach (Frame frame in this) + return FirstOrDefault(f => { - var p = frame.Profile; - if (p.Stream == stream && p.Index == index) - return frame; - frame.Dispose(); - } - return null; + using (var p = f.Profile) + return p.Stream == stream && p.Index == index; + }); + } + } + + + public Frame this[Stream stream, Format format, int index = 0] + { + get + { + return FirstOrDefault(f => + { + using (var p = f.Profile) + return p.Stream == stream && p.Format == format && p.Index == index; + }); } } @@ -122,10 +156,11 @@ internal FrameSet(IntPtr ptr) m_instance = new HandleRef(this, ptr); object error; m_count = NativeMethods.rs2_embedded_frames_count(m_instance.Handle, out error); + m_enum = new FrameEnumerator(this); } #region IDisposable Support - private bool disposedValue = false; // To detect redundant calls + internal bool disposedValue = false; // To detect redundant calls protected virtual void Dispose(bool disposing) { @@ -138,7 +173,11 @@ protected virtual void Dispose(bool disposing) // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below. // TODO: set large fields to null. + + disposables.ForEach(d => d?.Dispose()); + Release(); + disposedValue = true; } } @@ -165,43 +204,114 @@ public void Release() if (m_instance.Handle != IntPtr.Zero) NativeMethods.rs2_release_frame(m_instance.Handle); m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); + } + + internal readonly List disposables = new List(); + public void AddDisposable(IDisposable disposable) + { + disposables.Add(disposable); } } - class FrameSetMarshaler : ICustomMarshaler - { - private static FrameSetMarshaler Instance; + public static class FrameSetExtensions { + public static FrameSet AsFrameSet(this Frame frame) + { + return FrameSet.FromFrame(frame); + } + } - public static ICustomMarshaler GetInstance(string s) + public class FrameSetPool + { + readonly Stack stack = new Stack(); + readonly object locker = new object(); + public FrameSet Get(IntPtr ptr) { - if (Instance == null) + lock (locker) { - Instance = new FrameSetMarshaler(); + if (stack.Count != 0) + { + FrameSet f = stack.Pop(); + f.m_instance = new HandleRef(f, ptr); + f.disposedValue = false; + object error; + f.m_count = NativeMethods.rs2_embedded_frames_count(f.m_instance.Handle, out error); + f.m_enum.Reset(); + //f.m_disposable = new EmptyDisposable(); + f.disposables.Clear(); + return f; + } + else + { + return new FrameSet(ptr); + } } - return Instance; + + } + + public void Release(FrameSet t) + { + stack.Push(t); } + } + + public class FrameEnumerator : IEnumerator + { + private readonly FrameSet fs; + private Frame current; + private int index; - public void CleanUpManagedData(object ManagedObj) + public FrameEnumerator(FrameSet fs) { + this.fs = fs; + index = 0; + current = default(Frame); + } + + public Frame Current + { + get + { + return current; + } } - public void CleanUpNativeData(IntPtr pNativeData) + object IEnumerator.Current { + get + { + if (index == 0 || index == fs.m_count + 1) + { + throw new InvalidOperationException(); + } + return Current; + } } - public int GetNativeDataSize() + public void Dispose() { - return -1; + // Method intentionally left empty. } - public IntPtr MarshalManagedToNative(object ManagedObj) + public bool MoveNext() { - throw new NotImplementedException(); + if ((uint)index < (uint)fs.m_count) + { + object error; + var ptr = NativeMethods.rs2_extract_frame(fs.m_instance.Handle, index, out error); + current = Frame.CreateFrame(ptr); + index++; + return true; + } + index = fs.m_count + 1; + current = null; + return false; } - public object MarshalNativeToManaged(IntPtr pNativeData) + public void Reset() { - return new FrameSet(pNativeData); + index = 0; + current = null; } } } diff --git a/wrappers/csharp/Intel.RealSense/Helpers.cs b/wrappers/csharp/Intel.RealSense/Helpers.cs index 52185648e4..e2e15c4644 100644 --- a/wrappers/csharp/Intel.RealSense/Helpers.cs +++ b/wrappers/csharp/Intel.RealSense/Helpers.cs @@ -5,48 +5,96 @@ namespace Intel.RealSense { - public class FramesReleaser : IDisposable + public class FramesReleaser : ICompositeDisposable { - public FramesReleaser() { } + internal readonly List disposables = new List(); - public void AddFrameToRelease(T f) where T : IDisposable + public void AddDisposable(IDisposable disposable) { - if (!m_objects.Contains(f)) - m_objects.Add(f); + disposables.Add(disposable); } + [Obsolete("This method is obsolete. Use AddDisposable method instead")] // Add an object to a releaser (if one is provided) and return the object public static T ScopedReturn(FramesReleaser releaser, T obj) where T : IDisposable { - if (releaser != null) releaser.AddFrameToRelease(obj); + if (releaser != null) releaser.AddDisposable(obj); return obj; } - private HashSet m_objects = new HashSet(); - private bool disposedValue = false; // To detect redundant calls + #region IDisposable Support + internal bool disposedValue = false; // To detect redundant calls protected virtual void Dispose(bool disposing) { if (!disposedValue) { - foreach (var o in m_objects) - o.Dispose(); + if (disposing) + { + // TODO: dispose managed state (managed objects). + } + + // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below. + // TODO: set large fields to null. + + disposables.ForEach(d => d?.Dispose()); + disposedValue = true; } } + // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources. ~FramesReleaser() { + // Do not change this code. Put cleanup code in Dispose(bool disposing) above. Dispose(false); } + // This code added to correctly implement the disposable pattern. public void Dispose() { + // Do not change this code. Put cleanup code in Dispose(bool disposing) above. Dispose(true); + // TODO: uncomment the following line if the finalizer is overridden above. GC.SuppressFinalize(this); } + #endregion + } + + public struct StreamComparer : IEqualityComparer + { + public static readonly StreamComparer Default = new StreamComparer(); + + public bool Equals(Stream x, Stream y) + { + return x == y; + } + + public int GetHashCode(Stream obj) + { + // you need to do some thinking here, + return (int)obj; + } + } + + public interface ICompositeDisposable : IDisposable + { + void AddDisposable(IDisposable disposable); } + // https://leeoades.wordpress.com/2012/08/29/neat-disposal-pattern/ + public static class DisposableExtensions + { + public static T DisposeWith(this T disposable, ICompositeDisposable composite) where T : IDisposable + { + if (disposable == null || composite == null) + return disposable; + composite.AddDisposable(disposable); + return disposable; + } + } + + public static class Helpers { /// @@ -100,17 +148,8 @@ public object MarshalNativeToManaged(IntPtr pNativeData) string args = Marshal.PtrToStringAnsi(NativeMethods.rs2_get_failed_args(pNativeData)); string message = Marshal.PtrToStringAnsi(NativeMethods.rs2_get_error_message(pNativeData)); - //Debug.LogError("rs_error was raised when calling " + function + "(" + args + ")" + ""); - //Debug.LogError("Message: " + message + ""); - - //NativeMethods.rs_free_error(pNativeData); - - var f = String.Format("{0}({1})", function, args); - //StackTrace stackTrace = new StackTrace(1, true); - //Debug.Log(stackTrace.GetFrame(0).GetFileName()); - //!TODO: custom exception type? - var e = new Exception(message + Environment.NewLine + f); + var e = new Exception($"{message}{Environment.NewLine}{function}({args})"); //!TODO: maybe throw only in debug? would need to change all methods to return error\null throw e; diff --git a/wrappers/csharp/Intel.RealSense/NativeMethods.cs b/wrappers/csharp/Intel.RealSense/NativeMethods.cs index 1bab567133..4a8c6f035b 100644 --- a/wrappers/csharp/Intel.RealSense/NativeMethods.cs +++ b/wrappers/csharp/Intel.RealSense/NativeMethods.cs @@ -129,8 +129,7 @@ internal static extern IntPtr rs2_wait_for_frame(IntPtr queue, uint timeout_ms, [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] - internal static extern int rs2_poll_for_frame(IntPtr queue, - [Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FrameMarshaler))] out Frame output_frame, + internal static extern int rs2_poll_for_frame(IntPtr queue, out IntPtr frame, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); @@ -247,7 +246,7 @@ internal static extern int rs2_poll_for_frame(IntPtr queue, [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_get_frame_vertices(IntPtr frame, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); - + [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_get_frame_texture_coordinates(IntPtr frame, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); @@ -271,6 +270,9 @@ internal static extern int rs2_poll_for_frame(IntPtr queue, [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_allocate_composite_frame(IntPtr source, [In]IntPtr[] frames, int count, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); + [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] + internal static extern IntPtr rs2_allocate_composite_frame(IntPtr source, [In]IntPtr frames, int count, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); + [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_extract_frame(IntPtr composite, int index, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); @@ -485,7 +487,7 @@ internal static extern int rs2_poll_for_frame(IntPtr queue, [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern void rs2_delete_context(IntPtr context); - + [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_context_add_device(IntPtr ctx, [MarshalAs(UnmanagedType.LPStr)] string file, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); @@ -692,24 +694,6 @@ internal static extern int rs2_poll_for_frame(IntPtr queue, [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern IntPtr rs2_software_device_add_sensor(IntPtr dev, [MarshalAs(UnmanagedType.LPStr)] string sensor_name, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); - /// - /// Video stream intrinsics - /// - [System.Serializable] - [StructLayout(LayoutKind.Sequential)] - public struct SoftwareVideoFrame - { - public IntPtr pixels; - [MarshalAs(UnmanagedType.FunctionPtr)] - public frame_deleter deleter; - public int stride; - public int bpp; - public double timestamp; - public TimestampDomain domain; - public int frame_number; - public IntPtr profile; - } - [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern void rs2_software_sensor_on_video_frame(IntPtr sensor, SoftwareVideoFrame frame, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); @@ -744,7 +728,8 @@ public struct SoftwareVideoFrame [DllImport(dllName, CallingConvention = CallingConvention.Cdecl)] internal static extern int rs2_pipeline_poll_for_frames(IntPtr pipe, - [Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FrameSetMarshaler))] out FrameSet output_frame, + //[Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FrameSetMarshaler))] out FrameSet output_frame, + out IntPtr output_frame, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Helpers.ErrorMarshaler))] out object error); diff --git a/wrappers/csharp/Intel.RealSense/Option.cs b/wrappers/csharp/Intel.RealSense/Option.cs new file mode 100644 index 0000000000..f142f7ff4d --- /dev/null +++ b/wrappers/csharp/Intel.RealSense/Option.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Intel.RealSense +{ + public interface IOption + { + Option Key { get; } + bool Supported { get; } + float Value { get; set; } + float Min { get; } + float Max { get; } + float Step { get; } + float Default { get; } + bool ReadOnly { get; } + string Description { get; } + string ValueDescription { get; } + } +} diff --git a/wrappers/csharp/Intel.RealSense/Pipeline.cs b/wrappers/csharp/Intel.RealSense/Pipeline.cs index a4fd2c643f..f0bb9e26b1 100644 --- a/wrappers/csharp/Intel.RealSense/Pipeline.cs +++ b/wrappers/csharp/Intel.RealSense/Pipeline.cs @@ -1,9 +1,11 @@ using System; +using System.Collections; +using System.Collections.Generic; using System.Runtime.InteropServices; namespace Intel.RealSense { - public class Pipeline : IDisposable + public class Pipeline : IDisposable, IEnumerable { internal HandleRef m_instance; @@ -42,26 +44,43 @@ public void Stop() NativeMethods.rs2_pipeline_stop(m_instance.Handle, out error); } - public FrameSet WaitForFrames(uint timeout_ms = 5000, FramesReleaser releaser = null) + public FrameSet WaitForFrames(uint timeout_ms = 5000) { object error; var ptr = NativeMethods.rs2_pipeline_wait_for_frames(m_instance.Handle, timeout_ms, out error); - return FramesReleaser.ScopedReturn(releaser, new FrameSet(ptr)); + return FrameSet.Pool.Get(ptr); } - public bool PollForFrames(out FrameSet result, FramesReleaser releaser = null) + public bool PollForFrames(out FrameSet result) { object error; - FrameSet fs; + IntPtr fs; if (NativeMethods.rs2_pipeline_poll_for_frames(m_instance.Handle, out fs, out error) > 0) { - result = FramesReleaser.ScopedReturn(releaser, fs); + result = FrameSet.Pool.Get(fs); return true; } result = null; return false; } + public IEnumerator GetEnumerator() + { + FrameSet frames; + while (PollForFrames(out frames)) + { + using (frames) + using (var frame = frames.AsFrame()) + yield return frame; + } + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + #region IDisposable Support private bool disposedValue = false; // To detect redundant calls diff --git a/wrappers/csharp/Intel.RealSense/Processing.cs b/wrappers/csharp/Intel.RealSense/Processing.cs index 0320ab2ea3..881ebc1e0f 100644 --- a/wrappers/csharp/Intel.RealSense/Processing.cs +++ b/wrappers/csharp/Intel.RealSense/Processing.cs @@ -1,377 +1,475 @@ -using System; -using System.Runtime.InteropServices; -using System.Linq; - -namespace Intel.RealSense -{ - public class ProcessingBlock : IDisposable - { - internal HandleRef m_instance; - - Sensor.SensorOptions m_options; - public Sensor.SensorOptions Options - { - get - { - return m_options = m_options ?? new Sensor.SensorOptions(m_instance.Handle); - } - } - - #region IDisposable Support - private bool disposedValue = false; // To detect redundant calls - - protected virtual void Dispose(bool disposing) - { - if (!disposedValue) - { - if (disposing) - { - // TODO: dispose managed state (managed objects). - } - - // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below. - // TODO: set large fields to null. - Release(); - disposedValue = true; - } - } - - // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources. - ~ProcessingBlock() - { - // Do not change this code. Put cleanup code in Dispose(bool disposing) above. - Dispose(false); - } - - // This code added to correctly implement the disposable pattern. - public void Dispose() - { - // Do not change this code. Put cleanup code in Dispose(bool disposing) above. - Dispose(true); - // TODO: uncomment the following line if the finalizer is overridden above. - GC.SuppressFinalize(this); - } - #endregion - - public void Release() - { - if (m_instance.Handle != IntPtr.Zero) - NativeMethods.rs2_delete_processing_block(m_instance.Handle); - m_instance = new HandleRef(this, IntPtr.Zero); - } - } - - public class Colorizer : ProcessingBlock - { - public Colorizer() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_colorizer(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame Colorize(VideoFrame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as VideoFrame); - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class Syncer : ProcessingBlock - { - public Syncer() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_sync_processing_block(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public void SubmitFrame(Frame f, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(f.m_instance.Handle, out error); +using System; +using System.Runtime.InteropServices; +using System.Collections.Generic; +using System.Linq; + +namespace Intel.RealSense +{ + public interface IProcessingBlock : IOptions + { + Frame Process(Frame original); + FrameSet Process(FrameSet original); + } + + public abstract class ProcessingBlock : IProcessingBlock, IDisposable + { + public readonly FrameQueue queue = new FrameQueue(1); + + internal HandleRef m_instance; + + Sensor.SensorOptions m_options; + public IOptionsContainer Options + { + get + { + return m_options = m_options ?? new Sensor.SensorOptions(m_instance.Handle); + } + } + + #region IDisposable Support + private bool disposedValue = false; // To detect redundant calls + + protected virtual void Dispose(bool disposing) + { + if (!disposedValue) + { + if (disposing) + { + // TODO: dispose managed state (managed objects). + } + + // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below. + // TODO: set large fields to null. + Release(); + disposedValue = true; + } + } + + // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources. + ~ProcessingBlock() + { + // Do not change this code. Put cleanup code in Dispose(bool disposing) above. + Dispose(false); + } + + // This code added to correctly implement the disposable pattern. + public void Dispose() + { + // Do not change this code. Put cleanup code in Dispose(bool disposing) above. + Dispose(true); + // TODO: uncomment the following line if the finalizer is overridden above. + GC.SuppressFinalize(this); + } + #endregion + + public void Release() + { + if (m_instance.Handle != IntPtr.Zero) + NativeMethods.rs2_delete_processing_block(m_instance.Handle); + m_instance = new HandleRef(this, IntPtr.Zero); + } + + /// + /// Process frame and return the result + /// + /// + /// + public Frame Process(Frame original) + { + object error; + NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); + NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); + Frame f; + if (queue.PollForFrame(out f)) + { + return f; + } + return original; + } + + public FrameSet Process(FrameSet original) + { + FrameSet rv; + using (var singleOriginal = original.AsFrame()) + { + using (var processed = Process(singleOriginal)) + { + rv = FrameSet.FromFrame(processed); + } + } + return rv; + } + } + + public static class IProcessingBlockExtensions + { + public static Frame ApplyFilter(this Frame frame, IProcessingBlock block) + { + return block.Process(frame); + } + + public static FrameSet ApplyFilter(this FrameSet frames, IProcessingBlock block) + { + return block.Process(frames); + } + } + + public class Colorizer : ProcessingBlock + { + public Colorizer() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_colorizer(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame Colorize(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class Syncer : ProcessingBlock + { + public Syncer() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_sync_processing_block(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + public void SubmitFrame(Frame f) + { + object error; + NativeMethods.rs2_frame_add_ref(f.m_instance.Handle, out error); NativeMethods.rs2_process_frame(m_instance.Handle, f.m_instance.Handle, out error); - } - - public FrameSet WaitForFrames(uint timeout_ms = 5000, FramesReleaser releaser = null) + } + + public FrameSet WaitForFrames(uint timeout_ms = 5000) { object error; var ptr = NativeMethods.rs2_wait_for_frame(queue.m_instance.Handle, timeout_ms, out error); - return FramesReleaser.ScopedReturn(releaser, new FrameSet(ptr)); + return FrameSet.Pool.Get(ptr); } - public bool PollForFrames(out FrameSet result, FramesReleaser releaser = null) + public bool PollForFrames(out FrameSet result) { object error; - Frame f; - if (NativeMethods.rs2_poll_for_frame(queue.m_instance.Handle, out f, out error) > 0) + IntPtr ptr; + if (NativeMethods.rs2_poll_for_frame(queue.m_instance.Handle, out ptr, out error) > 0) { - result = FramesReleaser.ScopedReturn(releaser, new FrameSet(f.m_instance.Handle)); - f.Dispose(); + result = FrameSet.Pool.Get(ptr); return true; } result = null; return false; - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class Align : ProcessingBlock - { - public Align(Stream align_to) - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_align(align_to, out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public FrameSet Process(FrameSet original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrames() as FrameSet); - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class DisparityTransform : ProcessingBlock - { - public DisparityTransform(bool transform_to_disparity = true) - { - object error; - byte transform_direction = transform_to_disparity ? (byte)1 : (byte)0; - m_instance = new HandleRef(this, NativeMethods.rs2_create_disparity_transform_block(transform_direction, out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame ApplyFilter(VideoFrame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as VideoFrame); - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class DecimationFilter : ProcessingBlock - { - public DecimationFilter() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_decimation_filter_block(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame ApplyFilter(VideoFrame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as VideoFrame); - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class SpatialFilter : ProcessingBlock - { - public SpatialFilter() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_spatial_filter_block(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame ApplyFilter(VideoFrame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as VideoFrame); - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class TemporalFilter : ProcessingBlock - { - public TemporalFilter() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_temporal_filter_block(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame ApplyFilter(VideoFrame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as VideoFrame); - } - - readonly FrameQueue queue = new FrameQueue(1); + } + } + + public class Align : ProcessingBlock + { + public Align(Stream align_to) + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_align(align_to, out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process with DisposeWith method instead")] + public FrameSet Process(FrameSet original, FramesReleaser releaser) + { + return Process(original).DisposeWith(releaser); + } + } + + public class DisparityTransform : ProcessingBlock + { + public DisparityTransform(bool transform_to_disparity = true) + { + object error; + byte transform_direction = transform_to_disparity ? (byte)1 : (byte)0; + m_instance = new HandleRef(this, NativeMethods.rs2_create_disparity_transform_block(transform_direction, out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame ApplyFilter(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class DecimationFilter : ProcessingBlock + { + public DecimationFilter() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_decimation_filter_block(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame ApplyFilter(Frame original, FramesReleaser releaser) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class SpatialFilter : ProcessingBlock + { + public SpatialFilter() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_spatial_filter_block(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame ApplyFilter(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class TemporalFilter : ProcessingBlock + { + public TemporalFilter() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_temporal_filter_block(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame ApplyFilter(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class HoleFillingFilter : ProcessingBlock + { + public HoleFillingFilter() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_hole_filling_filter_block(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public VideoFrame ApplyFilter(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as VideoFrame; + } + } + + public class PointCloud : ProcessingBlock + { + private readonly IOption formatFilter; + private readonly IOption indexFilter; + private readonly IOption streamFilter; + + public PointCloud() + { + object error; + m_instance = new HandleRef(this, NativeMethods.rs2_create_pointcloud(out error)); + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + + streamFilter = Options[Option.StreamFilter]; + formatFilter = Options[Option.StreamFormatFilter]; + indexFilter = Options[Option.StreamIndexFilter]; + } + + [Obsolete("This method is obsolete. Use Process method instead")] + public Points Calculate(Frame original, FramesReleaser releaser = null) + { + return Process(original).DisposeWith(releaser) as Points; + } + + public void MapTexture(VideoFrame texture) + { + using (var p = texture.Profile) { + streamFilter.Value = (float)p.Stream; + formatFilter.Value = (float)p.Format; + indexFilter.Value = (float)p.Index; + } + using (var f = Process(texture)); + } } - public class HoleFillingFilter : ProcessingBlock - { - public HoleFillingFilter() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_hole_filling_filter_block(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public VideoFrame ApplyFilter(VideoFrame original) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return queue.WaitForFrame() as VideoFrame; - } - - readonly FrameQueue queue = new FrameQueue(1); - } - - public class PointCloud : ProcessingBlock - { - readonly FrameQueue queue = new FrameQueue(1); - - public PointCloud() - { - object error; - m_instance = new HandleRef(this, NativeMethods.rs2_create_pointcloud(out error)); - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - } - - public Points Calculate(Frame original, FramesReleaser releaser = null) - { - object error; - NativeMethods.rs2_frame_add_ref(original.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, original.m_instance.Handle, out error); - return FramesReleaser.ScopedReturn(releaser, queue.WaitForFrame() as Points); - } - - public void MapTexture(VideoFrame texture) - { - object error; - Options[Option.StreamFilter].Value = Convert.ToSingle(texture.Profile.Stream); - Options[Option.StreamFormatFilter].Value = Convert.ToSingle(texture.Profile.Format); - Options[Option.StreamIndexFilter].Value = Convert.ToSingle(texture.Profile.Index); - NativeMethods.rs2_frame_add_ref(texture.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, texture.m_instance.Handle, out error); - } - } - - public class FrameSource - { - internal HandleRef m_instance; - - internal FrameSource(HandleRef instance) - { - m_instance = instance; - } - - public VideoFrame AllocateVideoFrame(StreamProfile profile, Frame original, int bpp, int width, int height, int stride, Extension extension = Extension.VideoFrame ) - { - object error; + public struct FrameSource + { + internal readonly HandleRef m_instance; + + internal FrameSource(HandleRef instance) + { + m_instance = instance; + } + + public T AllocateVideoFrame(StreamProfile profile, Frame original, + int bpp, int width, int height, int stride, Extension extension = Extension.VideoFrame) where T : Frame + { + object error; var fref = NativeMethods.rs2_allocate_synthetic_video_frame(m_instance.Handle, profile.m_instance.Handle, original.m_instance.Handle, bpp, width, height, stride, extension, out error); - return new VideoFrame(fref); - } - - public FrameSet AllocateCompositeFrame(FramesReleaser releaser, params Frame[] frames) - { - object error; - var frame_refs = frames.Select(x => x.m_instance.Handle).ToArray(); - foreach (var fref in frame_refs) NativeMethods.rs2_frame_add_ref(fref, out error); - var frame_ref = NativeMethods.rs2_allocate_composite_frame(m_instance.Handle, frame_refs, frames.Count(), out error); - return FramesReleaser.ScopedReturn(releaser, new FrameSet(frame_ref)); - } - - public FrameSet AllocateCompositeFrame(params Frame[] frames) - { - return AllocateCompositeFrame(null, frames); - } - - public void FrameReady(Frame f) - { - object error; - NativeMethods.rs2_frame_add_ref(f.m_instance.Handle, out error); - NativeMethods.rs2_synthetic_frame_ready(m_instance.Handle, f.m_instance.Handle, out error); - } - - public void FramesReady(FrameSet fs) - { - using (var f = fs.AsFrame()) - FrameReady(f); - } - } - - public class CustomProcessingBlock : ProcessingBlock - { - public delegate void FrameProcessorCallback(Frame frame, FrameSource source); - - public CustomProcessingBlock(FrameProcessorCallback cb) - { - object error; - frame_processor_callback cb2 = (IntPtr f, IntPtr src, IntPtr u) => - { - using (var frame = new Frame(f)) - cb(frame, new FrameSource(new HandleRef(this, src))); - }; - m_proc_callback = cb2; - m_instance = new HandleRef(this, NativeMethods.rs2_create_processing_block_fptr(cb2, IntPtr.Zero, out error)); - } - - public void ProcessFrame(Frame f) - { - object error; - NativeMethods.rs2_frame_add_ref(f.m_instance.Handle, out error); - NativeMethods.rs2_process_frame(m_instance.Handle, f.m_instance.Handle, out error); - } - - public void ProcessFrames(FrameSet fs) - { - using (var f = fs.AsFrame()) - ProcessFrame(f); - } - - public void Start(FrameQueue queue) - { - object error; - NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); - - m_callback = null; - m_queue = queue; - } - - //public delegate void FrameCallback(Frame frame, T user_data); - public delegate void FrameCallback(Frame frame); - - public void Start(FrameCallback cb) - { - object error; - frame_callback cb2 = (IntPtr f, IntPtr u) => - { - using (var frame = new Frame(f)) - cb(frame); - }; - NativeMethods.rs2_start_processing_fptr(m_instance.Handle, cb2, IntPtr.Zero, out error); - m_callback = cb2; - m_queue = null; - } - - private frame_callback m_callback = null; - private frame_processor_callback m_proc_callback = null; - private FrameQueue m_queue = null; - } + return Frame.CreateFrame(fref) as T; + } + + [Obsolete("This method is obsolete. Use AllocateCompositeFrame with DisposeWith method instead")] + public FrameSet AllocateCompositeFrame(FramesReleaser releaser, params Frame[] frames) + { + return AllocateCompositeFrame((IList)frames).DisposeWith(releaser); + } + + public FrameSet AllocateCompositeFrame(params Frame[] frames) + { + return AllocateCompositeFrame((IList)frames); + } + + + public FrameSet AllocateCompositeFrame(IList frames) + { + if (frames == null) + throw new ArgumentNullException(nameof(frames)); + + IntPtr frame_refs = IntPtr.Zero; + + try { + object error; + int fl = frames.Count; + frame_refs = Marshal.AllocHGlobal(fl * IntPtr.Size); + for (int i = 0; i < fl; i++) + { + var fr = frames[i].m_instance.Handle; + Marshal.WriteIntPtr(frame_refs, i * IntPtr.Size, fr); + NativeMethods.rs2_frame_add_ref(fr, out error); + } + + var frame_ref = NativeMethods.rs2_allocate_composite_frame(m_instance.Handle, frame_refs, fl, out error); + return FrameSet.Pool.Get(frame_ref); + } + finally + { + if (frame_refs != IntPtr.Zero) + Marshal.FreeHGlobal(frame_refs); + } + } + + private void FrameReady(IntPtr ptr) + { + object error; + NativeMethods.rs2_frame_add_ref(ptr, out error); + NativeMethods.rs2_synthetic_frame_ready(m_instance.Handle, ptr, out error); + } + + public void FrameReady(Frame f) + { + FrameReady(f.m_instance.Handle); + } + + public void FramesReady(FrameSet fs) + { + using (fs) + FrameReady(fs.m_instance.Handle); + } + } + + public class CustomProcessingBlock : ProcessingBlock + { + public delegate void FrameProcessorCallback(Frame frame, FrameSource source); + + public CustomProcessingBlock(FrameProcessorCallback cb) + { + frameProcessorCallbackHandle = GCHandle.Alloc(cb, GCHandleType.Normal); + IntPtr cbPtr = GCHandle.ToIntPtr(frameProcessorCallbackHandle); + + object error; + var pb = NativeMethods.rs2_create_processing_block_fptr(fpc, cbPtr, out error); + m_instance = new HandleRef(this, pb); + } + + readonly frame_processor_callback fpc = new frame_processor_callback(ProcessingBlockCallback); + + static void ProcessingBlockCallback(IntPtr f, IntPtr src, IntPtr u) + { + var callback = GCHandle.FromIntPtr(u).Target as FrameProcessorCallback; + using (var frame = Frame.CreateFrame(f)) + callback(frame, new FrameSource(new HandleRef(frame, src))); + } + + public void ProcessFrame(Frame f) + { + object error; + NativeMethods.rs2_frame_add_ref(f.m_instance.Handle, out error); + NativeMethods.rs2_process_frame(m_instance.Handle, f.m_instance.Handle, out error); + } + + public void ProcessFrames(FrameSet fs) + { + using (var f = fs.AsFrame()) + ProcessFrame(f); + } + + /// + /// Start the processing block, delivering frames to external queue + /// + /// + public void Start(FrameQueue queue) + { + object error; + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + /// + /// Start the processing block + /// + public void Start() + { + object error; + NativeMethods.rs2_start_processing_queue(m_instance.Handle, queue.m_instance.Handle, out error); + } + + public delegate void FrameCallback(Frame frame); + + /// + /// Start the processing block, delivering frames to a callback + /// + /// + public void Start(FrameCallback cb) + { + frameCallbackHandle = GCHandle.Alloc(cb, GCHandleType.Normal); + IntPtr cbPtr = GCHandle.ToIntPtr(frameCallbackHandle); + + object error; + NativeMethods.rs2_start_processing_fptr(m_instance.Handle, m_frameCallback, cbPtr, out error); + } + + readonly frame_callback m_frameCallback = new frame_callback(ProcessingBlockFrameCallback); + static void ProcessingBlockFrameCallback(IntPtr f, IntPtr u) + { + var callback = GCHandle.FromIntPtr(u).Target as FrameCallback; + using (var frame = Frame.CreateFrame(f)) + callback(frame); + } + + private GCHandle frameCallbackHandle; + private readonly GCHandle frameProcessorCallbackHandle; + + protected override void Dispose(bool disposing) + { + //if (!disposedValue) + { + if (disposing) + { + if (frameCallbackHandle.IsAllocated) + frameCallbackHandle.Free(); + + if (frameProcessorCallbackHandle.IsAllocated) + frameProcessorCallbackHandle.Free(); + } + } + + base.Dispose(disposing); + } + } } \ No newline at end of file diff --git a/wrappers/csharp/Intel.RealSense/Sensor.cs b/wrappers/csharp/Intel.RealSense/Sensor.cs index a7d26f39cd..6b3179708a 100644 --- a/wrappers/csharp/Intel.RealSense/Sensor.cs +++ b/wrappers/csharp/Intel.RealSense/Sensor.cs @@ -6,6 +6,16 @@ namespace Intel.RealSense { + public interface IOptionsContainer : IEnumerable + { + IOption this[Option option] { get; } + string OptionValueDescription(Option option, float value); + } + + public interface IOptions { + IOptionsContainer Options { get; } + } + public class SensorList : IDisposable, IEnumerable { IntPtr m_instance; @@ -91,7 +101,6 @@ public void Dispose() } #endregion } - public struct ROI { public int minX, minY, maxX, maxY; @@ -118,7 +127,7 @@ public void SetRegionOfInterest(ROI value) } } - public class Sensor : IDisposable + public class Sensor : IOptions, IDisposable { protected readonly IntPtr m_instance; @@ -177,7 +186,7 @@ public CameraInfos Info } - public class CameraOption + internal class CameraOption : IOption { readonly IntPtr m_sensor; readonly Option option; @@ -186,7 +195,7 @@ public class CameraOption private readonly float max; private readonly float step; private readonly float @default; - private readonly string description; + private string description; public CameraOption(IntPtr sensor, Option option) { @@ -197,9 +206,6 @@ public CameraOption(IntPtr sensor, Option option) { object error; NativeMethods.rs2_get_option_range(m_sensor, option, out min, out max, out step, out @default, out error); - - var str = NativeMethods.rs2_get_option_description(m_sensor, option, out error); - description = Marshal.PtrToStringAnsi(str); } } @@ -231,6 +237,12 @@ public string Description { get { + if(description == null) + { + object error; + var str = NativeMethods.rs2_get_option_description(m_sensor, option, out error); + description = Marshal.PtrToStringAnsi(str); + } return description; } } @@ -305,22 +317,23 @@ public bool ReadOnly } } } - - public class SensorOptions : IEnumerable + + public class SensorOptions : IOptionsContainer { readonly IntPtr m_sensor; - public SensorOptions(IntPtr sensor) + internal SensorOptions(IntPtr sensor) { m_sensor = sensor; } - public CameraOption this[Option option] + public IOption this[Option option] { get { return new CameraOption(m_sensor, option); } } + public string OptionValueDescription(Option option, float value) { object error; @@ -334,7 +347,7 @@ public string OptionValueDescription(Option option, float value) static readonly Option[] OptionValues = Enum.GetValues(typeof(Option)) as Option[]; - public IEnumerator GetEnumerator() + public IEnumerator GetEnumerator() { foreach (var v in OptionValues) @@ -349,8 +362,9 @@ IEnumerator IEnumerable.GetEnumerator() return GetEnumerator(); } } + SensorOptions m_options; - public SensorOptions Options + public IOptionsContainer Options { get { diff --git a/wrappers/csharp/Intel.RealSense/SoftwareDevice.cs b/wrappers/csharp/Intel.RealSense/SoftwareDevice.cs index 4d0262b2b5..7cf03805f8 100644 --- a/wrappers/csharp/Intel.RealSense/SoftwareDevice.cs +++ b/wrappers/csharp/Intel.RealSense/SoftwareDevice.cs @@ -38,25 +38,28 @@ internal SoftwareSensor(IntPtr ptr) : base(ptr) { } - public void AddVideoFrame(byte[] pixels, int stride, int bpp, double timestamp, TimestampDomain domain, int frameNumber, VideoStreamProfile profile) + public void AddVideoFrame(SoftwareVideoFrame f) { object error; + NativeMethods.rs2_software_sensor_on_video_frame(m_instance, f, out error); + } + + public void AddVideoFrame(byte[] pixels, int stride, int bpp, double timestamp, TimestampDomain domain, int frameNumber, VideoStreamProfile profile) + { IntPtr hglobal = Marshal.AllocHGlobal(profile.Height * stride); - var del = new frame_deleter(p => { Marshal.FreeHGlobal(p); }); Marshal.Copy(pixels, 0, hglobal, profile.Height * stride); - var s = new NativeMethods.SoftwareVideoFrame + AddVideoFrame(new SoftwareVideoFrame { pixels = hglobal, - deleter = del, + deleter = (p) => { Marshal.FreeHGlobal(p); }, stride = stride, bpp = bpp, timestamp = timestamp, domain = domain, - frame_number = frameNumber, + frame_number = frameNumber, profile = profile.m_instance.Handle - }; - NativeMethods.rs2_software_sensor_on_video_frame(m_instance, s, out error); + }); } public VideoStreamProfile AddVideoStream(VideoStream profile) diff --git a/wrappers/csharp/Intel.RealSense/StreamProfile.cs b/wrappers/csharp/Intel.RealSense/StreamProfile.cs index 0c6d591e25..865b14f886 100644 --- a/wrappers/csharp/Intel.RealSense/StreamProfile.cs +++ b/wrappers/csharp/Intel.RealSense/StreamProfile.cs @@ -25,9 +25,9 @@ public IEnumerator GetEnumerator() var ptr = NativeMethods.rs2_get_stream_profile(m_instance, i, out error); if (NativeMethods.rs2_stream_profile_is(ptr, Extension.VideoProfile, out error) > 0) - yield return new VideoStreamProfile(ptr); + yield return VideoStreamProfile.Pool.Get(ptr); else - yield return new StreamProfile(ptr); + yield return StreamProfile.Pool.Get(ptr); } } @@ -55,7 +55,7 @@ public StreamProfile this[int index] if (NativeMethods.rs2_stream_profile_is(ptr, Extension.VideoProfile, out error) > 0) return new VideoStreamProfile(ptr); else - return new StreamProfile(ptr); + return StreamProfile.Pool.Get(ptr); } } @@ -102,22 +102,27 @@ public class StreamProfile : IDisposable { internal HandleRef m_instance; + internal static readonly ProfilePool Pool = new ProfilePool(); + public StreamProfile(IntPtr ptr) { m_instance = new HandleRef(this, ptr); object e; - NativeMethods.rs2_get_stream_profile_data(m_instance.Handle, out Stream, out Format, out Index, out UniqueID, out Framerate, out e); + NativeMethods.rs2_get_stream_profile_data(m_instance.Handle, out _stream, out _format, out _index, out _uniqueId, out _framerate, out e); } - public readonly Stream Stream; - public readonly Format Format; - - public readonly int Framerate; + internal Stream _stream; + internal Format _format; + internal int _framerate; + internal int _index; + internal int _uniqueId; - public readonly int Index; - - public readonly int UniqueID; + public Stream Stream { get { return _stream; } } + public Format Format { get { return _format; } } + public int Framerate { get { return _framerate; } } + public int Index { get { return _index; } } + public int UniqueID { get { return _uniqueId; } } public IntPtr Ptr { @@ -133,7 +138,7 @@ public Extrinsics GetExtrinsicsTo(StreamProfile other) } #region IDisposable Support - private bool disposedValue = false; // To detect redundant calls + internal bool disposedValue = false; // To detect redundant calls protected virtual void Dispose(bool disposing) { @@ -170,9 +175,8 @@ public void Dispose() public void Release() { - //if(m_instance.Handle != IntPtr.Zero) - //NativeMethods.rs2_delete_str(m_instance.Handle); m_instance = new HandleRef(this, IntPtr.Zero); + Pool.Release(this); } } @@ -181,7 +185,7 @@ public class VideoStreamProfile : StreamProfile public VideoStreamProfile(IntPtr ptr) : base(ptr) { object error; - NativeMethods.rs2_get_video_stream_resolution(ptr, out Width, out Height, out error); + NativeMethods.rs2_get_video_stream_resolution(ptr, out width, out height, out error); } public Intrinsics GetIntrinsics() @@ -192,9 +196,56 @@ public Intrinsics GetIntrinsics() return intrinsics; } - public readonly int Width; + public int Width { get { return width; } } + + public int Height { get { return height; } } + + internal int width; + internal int height; + } + + + public class ProfilePool where T : StreamProfile + { + readonly Stack stack = new Stack(); + readonly object locker = new object(); + + public T Get(IntPtr ptr) + { + + object error; + bool isVideo = NativeMethods.rs2_stream_profile_is(ptr, Extension.VideoProfile, out error) > 0; + + T p; + lock (locker) + { + if (stack.Count != 0) + p = stack.Pop(); + else + p = (isVideo ? new VideoStreamProfile(ptr) : new StreamProfile(ptr)) as T; + } + + p.m_instance = new HandleRef(p, ptr); + p.disposedValue = false; + + NativeMethods.rs2_get_stream_profile_data(ptr, out p._stream, out p._format, out p._index, out p._uniqueId, out p._framerate, out error); + + if(isVideo) + { + var v = p as VideoStreamProfile; + NativeMethods.rs2_get_video_stream_resolution(ptr, out v.width, out v.height, out error); + return v as T; + } - public readonly int Height; + return p; + } + public void Release(T t) + { + lock (locker) + { + stack.Push(t); + } + } } } diff --git a/wrappers/csharp/Intel.RealSense/Types.cs b/wrappers/csharp/Intel.RealSense/Types.cs index 1f3f62905e..283cb1793a 100644 --- a/wrappers/csharp/Intel.RealSense/Types.cs +++ b/wrappers/csharp/Intel.RealSense/Types.cs @@ -5,10 +5,9 @@ namespace Intel.RealSense { [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void frame_callback(IntPtr frame, IntPtr user_data); - //public delegate void frame_callback([Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FrameMarshaler))] out Frame frame, IntPtr user_data); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void frame_processor_callback(IntPtr frame, IntPtr user, IntPtr user_data); + public delegate void frame_processor_callback(IntPtr frame, IntPtr frame_src, IntPtr user_data); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void frame_deleter(IntPtr frame); @@ -124,6 +123,8 @@ public enum Format MotionRaw = 15, MotionXyz32f = 16, GpioRaw = 17, + SixDOF = 18, + Disparity32 = 19, } public enum TimestampDomain @@ -348,16 +349,12 @@ public struct SoftwareVideoStream public Intrinsics intrinsics; } - - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void Deleter(); - [System.Serializable] [StructLayout(LayoutKind.Sequential)] public class SoftwareVideoFrame { public IntPtr pixels; - public Deleter deleter = delegate { }; + public frame_deleter deleter = delegate { }; public int stride; public int bpp; public double timestamp; @@ -365,6 +362,4 @@ public class SoftwareVideoFrame public int frame_number; public IntPtr profile; } - - } diff --git a/wrappers/csharp/cs-tutorial-2-capture/Window.xaml.cs b/wrappers/csharp/cs-tutorial-2-capture/Window.xaml.cs index f6d01646f5..8bbe269855 100644 --- a/wrappers/csharp/cs-tutorial-2-capture/Window.xaml.cs +++ b/wrappers/csharp/cs-tutorial-2-capture/Window.xaml.cs @@ -13,6 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using System.Windows.Threading; namespace Intel.RealSense { @@ -23,79 +24,87 @@ public partial class CaptureWindow : Window { private Pipeline pipeline; private Colorizer colorizer; - private CancellationTokenSource tokenSource = new CancellationTokenSource(); - private void UploadImage(Image img, VideoFrame frame) + static Action UpdateImage(Image img) { - Dispatcher.Invoke(new Action(() => + var wbmp = img.Source as WriteableBitmap; + return new Action(frame => { - if (frame.Width == 0) return; - - var bytes = new byte[frame.Stride * frame.Height]; - frame.CopyTo(bytes); - - var bs = BitmapSource.Create(frame.Width, frame.Height, - 300, 300, - PixelFormats.Rgb24, - null, - bytes, - frame.Stride); - - var imgSrc = bs as ImageSource; - - img.Source = imgSrc; - })); + using (frame) + { + var rect = new Int32Rect(0, 0, frame.Width, frame.Height); + wbmp.WritePixels(rect, frame.Data, frame.Stride * frame.Height, frame.Stride); + } + }); } public CaptureWindow() { + InitializeComponent(); + try { - pipeline = new Pipeline(); + Action updateDepth; + Action updateColor; + + // The colorizer processing block will be used to visualize the depth frames. colorizer = new Colorizer(); + // Create and config the pipeline to strem color and depth frames. + pipeline = new Pipeline(); + var cfg = new Config(); cfg.EnableStream(Stream.Depth, 640, 480); cfg.EnableStream(Stream.Color, Format.Rgb8); - pipeline.Start(cfg); + var pp = pipeline.Start(cfg); - var token = tokenSource.Token; + SetupWindow(pp, out updateDepth, out updateColor); - var t = Task.Factory.StartNew(() => + Task.Factory.StartNew(() => { - while (!token.IsCancellationRequested) + while (!tokenSource.Token.IsCancellationRequested) { - var frames = pipeline.WaitForFrames(); - - var colorized_depth_frame = colorizer.Colorize(frames.DepthFrame); - var color_frame = frames.ColorFrame; - - UploadImage(imgDepth, colorized_depth_frame); - UploadImage(imgColor, color_frame); - - // It is important to pre-emptively dispose of native resources - // to avoid creating bottleneck at finalization stage after GC - // (Also see FrameReleaser helper object in next tutorial) - frames.Dispose(); - colorized_depth_frame.Dispose(); - color_frame.Dispose(); + // We wait for the next available FrameSet and using it as a releaser object that would track + // all newly allocated .NET frames, and ensure deterministic finalization + // at the end of scope. + using (var frames = pipeline.WaitForFrames()) + { + var colorFrame = frames.ColorFrame.DisposeWith(frames); + var depthFrame = frames.DepthFrame.DisposeWith(frames); + + // We colorize the depth frame for visualization purposes, . + var colorizedDepth = colorizer.Process(depthFrame).DisposeWith(frames); + + // Render the frames. + Dispatcher.Invoke(DispatcherPriority.Render, updateDepth, colorizedDepth); + Dispatcher.Invoke(DispatcherPriority.Render, updateColor, colorFrame); + } } - }, token); + }, tokenSource.Token); } catch (Exception ex) { MessageBox.Show(ex.Message); Application.Current.Shutdown(); } - - InitializeComponent(); } private void control_Closing(object sender, System.ComponentModel.CancelEventArgs e) { tokenSource.Cancel(); } + + private void SetupWindow(PipelineProfile pipelineProfile, out Action depth, out Action color) + { + using (var p = pipelineProfile.GetStream(Stream.Depth) as VideoStreamProfile) + imgDepth.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + depth = UpdateImage(imgDepth); + + using (var p = pipelineProfile.GetStream(Stream.Color) as VideoStreamProfile) + imgColor.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + color = UpdateImage(imgColor); + } } } diff --git a/wrappers/csharp/cs-tutorial-3-processing/Window.xaml b/wrappers/csharp/cs-tutorial-3-processing/Window.xaml index d900dd2502..6a331bab09 100644 --- a/wrappers/csharp/cs-tutorial-3-processing/Window.xaml +++ b/wrappers/csharp/cs-tutorial-3-processing/Window.xaml @@ -11,4 +11,4 @@ - + \ No newline at end of file diff --git a/wrappers/csharp/cs-tutorial-3-processing/Window.xaml.cs b/wrappers/csharp/cs-tutorial-3-processing/Window.xaml.cs index 2770868f91..563ca8d7b1 100644 --- a/wrappers/csharp/cs-tutorial-3-processing/Window.xaml.cs +++ b/wrappers/csharp/cs-tutorial-3-processing/Window.xaml.cs @@ -13,6 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using System.Windows.Threading; // This demo showcases some of the more advanced API concepts: // a. Post-processing and stream alignment @@ -35,43 +36,43 @@ public partial class ProcessingWindow : Window private CustomProcessingBlock block; private CancellationTokenSource tokenSource = new CancellationTokenSource(); - private void UploadImage(Image img, VideoFrame frame) + static Action UpdateImage(Image img) { - Dispatcher.Invoke(new Action(() => + var wbmp = img.Source as WriteableBitmap; + return new Action(frame => { - if (frame.Width == 0) return; - - var bytes = new byte[frame.Stride * frame.Height]; - frame.CopyTo(bytes); - - var bs = BitmapSource.Create(frame.Width, frame.Height, - 300, 300, - PixelFormats.Rgb24, - null, - bytes, - frame.Stride); - - var imgSrc = bs as ImageSource; - - img.Source = imgSrc; - })); + using (frame) + { + var rect = new Int32Rect(0, 0, frame.Width, frame.Height); + wbmp.WritePixels(rect, frame.Data, frame.Stride * frame.Height, frame.Stride); + } + }); } public ProcessingWindow() { + InitializeComponent(); + try { var cfg = new Config(); cfg.EnableStream(Stream.Depth, 640, 480); cfg.EnableStream(Stream.Color, Format.Rgb8); - pipeline.Start(cfg); + var pp = pipeline.Start(cfg); + + using (var p = pp.GetStream(Stream.Depth) as VideoStreamProfile) + imgDepth.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + var updateDepth = UpdateImage(imgDepth); + + using (var p = pp.GetStream(Stream.Color) as VideoStreamProfile) + imgColor.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + var updateColor = UpdateImage(imgColor); // Create custom processing block // For demonstration purposes it will: // a. Get a frameset - // b. Break it down to frames - // c. Run post-processing on the depth frame - // d. Combine the result back into a frameset + // b. Run post-processing on the depth frame + // c. Combine the result back into a frameset // Processing blocks are inherently thread-safe and play well with // other API primitives such as frame-queues, // and can be used to encapsulate advanced operations. @@ -84,18 +85,19 @@ public ProcessingWindow() // at the end of scope. using (var releaser = new FramesReleaser()) { - var frames = FrameSet.FromFrame(f, releaser); + var frames = FrameSet.FromFrame(f).DisposeWith(releaser); - VideoFrame depth = FramesReleaser.ScopedReturn(releaser, frames.DepthFrame); - VideoFrame color = FramesReleaser.ScopedReturn(releaser, frames.ColorFrame); + var processedFrames = frames.ApplyFilter(decimate).DisposeWith(releaser) + .ApplyFilter(spatial).DisposeWith(releaser) + .ApplyFilter(temp).DisposeWith(releaser) + .ApplyFilter(align).DisposeWith(releaser) + .ApplyFilter(colorizer).DisposeWith(releaser); - // Apply depth post-processing - depth = decimate.ApplyFilter(depth, releaser); - depth = spatial.ApplyFilter(depth, releaser); - depth = temp.ApplyFilter(depth, releaser); + var colorFrame = processedFrames.ColorFrame.DisposeWith(releaser); + var colorizedDepth = processedFrames[Stream.Depth, Format.Rgb8].DisposeWith(releaser); // Combine the frames into a single result - var res = src.AllocateCompositeFrame(releaser, depth, color); + var res = src.AllocateCompositeFrame(colorizedDepth, colorFrame).DisposeWith(releaser); // Send it to the next processing stage src.FramesReady(res); } @@ -104,19 +106,13 @@ public ProcessingWindow() // Register to results of processing via a callback: block.Start(f => { - using (var releaser = new FramesReleaser()) + using (var frames = FrameSet.FromFrame(f)) { - // Align, colorize and upload frames for rendering - var frames = FrameSet.FromFrame(f, releaser); - - // Align both frames to the viewport of color camera - frames = align.Process(frames, releaser); - - var depth_frame = FramesReleaser.ScopedReturn(releaser, frames.DepthFrame); - var color_frame = FramesReleaser.ScopedReturn(releaser, frames.ColorFrame); + var colorFrame = frames.ColorFrame.DisposeWith(frames); + var colorizedDepth = frames[Stream.Depth, Format.Rgb8].DisposeWith(frames); - UploadImage(imgDepth, colorizer.Colorize(depth_frame, releaser)); - UploadImage(imgColor, color_frame); + Dispatcher.Invoke(DispatcherPriority.Render, updateDepth, colorizedDepth); + Dispatcher.Invoke(DispatcherPriority.Render, updateColor, colorFrame); } }); diff --git a/wrappers/csharp/cs-tutorial-4-software-dev/Window.xaml.cs b/wrappers/csharp/cs-tutorial-4-software-dev/Window.xaml.cs index 32c68d5c05..0ca2f42f4c 100644 --- a/wrappers/csharp/cs-tutorial-4-software-dev/Window.xaml.cs +++ b/wrappers/csharp/cs-tutorial-4-software-dev/Window.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; - +using System.Windows.Threading; namespace Intel.RealSense { @@ -23,47 +23,44 @@ namespace Intel.RealSense /// public partial class CaptureWindow : Window { - private Pipeline pipeline; + private Pipeline pipeline; private Colorizer colorizer; private CancellationTokenSource tokenSource = new CancellationTokenSource(); - private void UploadImage(Image img, VideoFrame frame) + static Action UpdateImage(Image img) { - Dispatcher.Invoke(new Action(() => + var wbmp = img.Source as WriteableBitmap; + return new Action(frame => { - if (frame.Width == 0) return; - - var bytes = new byte[frame.Stride * frame.Height]; - frame.CopyTo(bytes); - - var bs = BitmapSource.Create(frame.Width, frame.Height, - 300, 300, - PixelFormats.Rgb24, - null, - bytes, - frame.Stride); - - var imgSrc = bs as ImageSource; - - img.Source = imgSrc; - })); + using (frame) + { + var rect = new Int32Rect(0, 0, frame.Width, frame.Height); + wbmp.WritePixels(rect, frame.Data, frame.Stride * frame.Height, frame.Stride); + } + }); } public CaptureWindow() { - //Log.ToFile(LogSeverity.Debug, "1.log"); + InitializeComponent(); try { + Action updateDepth; + Action updateColor; + pipeline = new Pipeline(); colorizer = new Colorizer(); var cfg = new Config(); - cfg.EnableStream(Stream.Depth, 640, 480, Format.Z16, 30); + cfg.EnableStream(Stream.Depth, 640, 480, Format.Z16, 30); cfg.EnableStream(Stream.Color, 640, 480, Format.Rgb8, 30); var profile = pipeline.Start(cfg); + SetupWindow(profile, out updateDepth, out updateColor); + + // Setup the SW device and sensors var software_dev = new SoftwareDevice(); var depth_sensor = software_dev.AddSensor("Depth"); var depth_profile = depth_sensor.AddVideoStream(new VideoStream @@ -87,10 +84,11 @@ public CaptureWindow() width = 640, height = 480, fps = 30, - bpp = 2, - fmt = Format.Z16, + bpp = 3, + fmt = Format.Rgb8, intrinsics = (profile.GetStream(Stream.Color) as VideoStreamProfile).GetIntrinsics() }); + // Note about the Syncer: If actual FPS is significantly different from reported FPS in AddVideoStream // this can confuse the syncer and prevent it from producing synchronized pairs software_dev.SetMatcher(Matchers.Default); @@ -100,15 +98,9 @@ public CaptureWindow() depth_sensor.Open(depth_profile); color_sensor.Open(color_profile); - depth_sensor.Start(f => - { - sync.SubmitFrame(f); - //Debug.WriteLine("D"); - }); - color_sensor.Start(f => { - sync.SubmitFrame(f); - //Debug.WriteLine("C"); - }); + // Push the SW device frames to the syncer + depth_sensor.Start(f => { sync.SubmitFrame(f); }); + color_sensor.Start(f => { sync.SubmitFrame(f); }); var token = tokenSource.Token; @@ -116,43 +108,38 @@ public CaptureWindow() { while (!token.IsCancellationRequested) { - var frames = pipeline.WaitForFrames(); - - var depth_frame = frames.DepthFrame; - var color_frame = frames.ColorFrame; - - var bytes = new byte[depth_frame.Stride * depth_frame.Height]; - depth_frame.CopyTo(bytes); - depth_sensor.AddVideoFrame(bytes, depth_frame.Stride, 2, depth_frame.Timestamp, - depth_frame.TimestampDomain, (int)depth_frame.Number, - depth_profile); - - bytes = new byte[color_frame.Stride * color_frame.Height]; - color_frame.CopyTo(bytes); - color_sensor.AddVideoFrame(bytes, color_frame.Stride, 2, depth_frame.Timestamp, - color_frame.TimestampDomain, (int)depth_frame.Number, - color_profile); - - depth_frame.Dispose(); - color_frame.Dispose(); - frames.Dispose(); - - var new_frames = sync.WaitForFrames(); - if (new_frames.Count == 2) + // We use the frames that are captured from live camera as the input data for the SW device + using (var frames = pipeline.WaitForFrames()) { - depth_frame = new_frames.DepthFrame; - color_frame = new_frames.ColorFrame; + var depthFrame = frames.DepthFrame.DisposeWith(frames); + var colorFrame = frames.ColorFrame.DisposeWith(frames); + + var depthBytes = new byte[depthFrame.Stride * depthFrame.Height]; + depthFrame.CopyTo(depthBytes); + depth_sensor.AddVideoFrame(depthBytes, depthFrame.Stride, depthFrame.BitsPerPixel / 8, depthFrame.Timestamp, + depthFrame.TimestampDomain, (int)depthFrame.Number, depth_profile); + + var colorBytes = new byte[colorFrame.Stride * colorFrame.Height]; + colorFrame.CopyTo(colorBytes); + color_sensor.AddVideoFrame(colorBytes, colorFrame.Stride, colorFrame.BitsPerPixel / 8, colorFrame.Timestamp, + colorFrame.TimestampDomain, (int)colorFrame.Number, color_profile); + } - var colorized_depth = colorizer.Colorize(depth_frame); + // Dispaly the frames that come from the SW device after synchronization + using (var new_frames = sync.WaitForFrames()) + { + if (new_frames.Count == 2) + { + var depthFrame = new_frames.DepthFrame.DisposeWith(new_frames); + var colorFrame = new_frames.ColorFrame.DisposeWith(new_frames); - UploadImage(imgDepth, colorized_depth); - UploadImage(imgColor, color_frame); + VideoFrame colorizedDepth = colorizer.Process(depthFrame).DisposeWith(new_frames) as VideoFrame; - depth_frame.Dispose(); - colorized_depth.Dispose(); - color_frame.Dispose(); + // Render the frames. + Dispatcher.Invoke(DispatcherPriority.Render, updateDepth, colorizedDepth); + Dispatcher.Invoke(DispatcherPriority.Render, updateColor, colorFrame); + } } - new_frames.Dispose(); } }, token); } @@ -161,13 +148,22 @@ public CaptureWindow() MessageBox.Show(ex.Message); Application.Current.Shutdown(); } - - InitializeComponent(); } private void control_Closing(object sender, System.ComponentModel.CancelEventArgs e) { tokenSource.Cancel(); } + + private void SetupWindow(PipelineProfile pipelineProfile, out Action depth, out Action color) + { + using (var p = pipelineProfile.GetStream(Stream.Depth) as VideoStreamProfile) + imgDepth.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + depth = UpdateImage(imgDepth); + + using (var p = pipelineProfile.GetStream(Stream.Color) as VideoStreamProfile) + imgColor.Source = new WriteableBitmap(p.Width, p.Height, 96d, 96d, PixelFormats.Rgb24, null); + color = UpdateImage(imgColor); + } } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs deleted file mode 100644 index 9b83c48b50..0000000000 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Intel.RealSense; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(RsStreamTextureRenderer), true)] -public class DefaultStreamPropertyDrawer : Editor -{ - bool hasDefault = false; - - private SerializedProperty stream; - private SerializedProperty format; - - void OnEnable() - { - stream = serializedObject.FindProperty("sourceStreamType"); - format = serializedObject.FindProperty("textureFormat"); - hasDefault = false; - - var t = target.GetType(); - var a = t.GetCustomAttributes(typeof(DefaultStreamAttribute), false); - if (a.Length > 0) - { - hasDefault = true; - var d = a[0] as DefaultStreamAttribute; - stream.enumValueIndex = (int)d.stream; - format.intValue = (int)d.format; - serializedObject.ApplyModifiedProperties(); - } - } - - public override void OnInspectorGUI() - { - EditorGUI.BeginChangeCheck(); - serializedObject.Update(); - SerializedProperty iterator = serializedObject.GetIterator(); - bool enterChildren = true; - while (iterator.NextVisible(enterChildren)) - { - if (hasDefault) - { - if (iterator.propertyPath == stream.propertyPath || iterator.propertyPath == format.propertyPath) - continue; - } - using (new EditorGUI.DisabledScope("m_Script" == iterator.propertyPath)) - { - EditorGUILayout.PropertyField(iterator, true, new GUILayoutOption[0]); - } - enterChildren = false; - } - serializedObject.ApplyModifiedProperties(); - EditorGUI.EndChangeCheck(); - - } - -} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceEditor.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceEditor.cs index f563956271..eddfaac2a0 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceEditor.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceEditor.cs @@ -77,8 +77,8 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); EditorGUILayout.PropertyField(config.FindPropertyRelative("Profiles"), true); - EditorGUILayout.Space(); - EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); + // EditorGUILayout.Space(); + // EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); EditorGUILayout.Space(); EditorGUI.EndDisabledGroup(); break; @@ -98,8 +98,8 @@ public override void OnInspectorGUI() } } EditorGUILayout.EndHorizontal(); - EditorGUILayout.Space(); - EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); + // EditorGUILayout.Space(); + // EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); EditorGUILayout.Space(); EditorGUI.EndDisabledGroup(); @@ -184,8 +184,8 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); EditorGUILayout.PropertyField(config.FindPropertyRelative("Profiles"), true); - EditorGUILayout.Space(); - EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); + // EditorGUILayout.Space(); + // EditorGUILayout.PropertyField(serializedObject.FindProperty("_processingPipe"), false); EditorGUILayout.Space(); EditorGUI.EndDisabledGroup(); } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs index 622b55a1b6..d03bbfa039 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs @@ -9,14 +9,14 @@ public static class CameraOptionExtensions { - public static bool IsCheckbox(this Sensor.CameraOption opt) + public static bool IsCheckbox(this IOption opt) { return opt.Max == 1.0f && opt.Min == 0.0f && opt.Step == 1.0f; } - public static bool IsEnum(this Sensor.CameraOption opt, Sensor.SensorOptions s) + public static bool IsEnum(this IOption opt, IOptionsContainer s) { if (opt.Step < 0.001f) return false; @@ -29,7 +29,7 @@ public static bool IsEnum(this Sensor.CameraOption opt, Sensor.SensorOptions s) return true; } - public static bool IsIntegersOnly(this Sensor.CameraOption opt) + public static bool IsIntegersOnly(this IOption opt) { Func is_integer = (v) => v == Math.Floor(v); return is_integer(opt.Min) && is_integer(opt.Max) && @@ -87,9 +87,9 @@ public override void OnInspectorGUI() } } - readonly Dictionary cachedValue = new Dictionary(); + readonly Dictionary cachedValue = new Dictionary(); - void DrawOption(Sensor sensor, Sensor.CameraOption opt) + void DrawOption(Sensor sensor, IOption opt) { if (!cachedValue.ContainsKey(opt)) cachedValue[opt] = opt.Value; diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs.meta index b3df68f641..cc0b401c9d 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsDeviceInspectorEditor.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 967fa27358fa26d428f89abc9b1cafb4 -timeCreated: 1518513392 -licenseType: Pro +guid: b67cf45d4563c6343bade4572d6e638d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs new file mode 100644 index 0000000000..3ad12c78c3 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs @@ -0,0 +1,251 @@ +using UnityEngine; +using UnityEditor; +using UnityEditorInternal; +using System; +using System.Linq; +using System.Collections.Generic; + +[CustomEditor(typeof(RsProcessingProfile))] +public class RsProcessingPipeEditor : Editor +{ + private SerializedProperty _property; + private ReorderableList _list; + + private void OnEnable() + { + _property = serializedObject.FindProperty("_processingBlocks"); + _list = new ReorderableList(serializedObject, _property, true, true, true, true) + { + drawHeaderCallback = DrawListHeader, + drawElementCallback = DrawListElement, + drawElementBackgroundCallback = DrawElementBackground, + elementHeightCallback = GetElementHeightCallback, + onAddDropdownCallback = AddDropdownCallback, + onRemoveCallback = RemoveCallback, +#if UNITY_2018_1_OR_NEWER + //onReorderCallbackWithDetails = ReorderCallbackWithDetails, +#endif + onSelectCallback = SelectElement, + }; + } + + private void SelectElement(ReorderableList list) + { + var element = list.serializedProperty.GetArrayElementAtIndex(list.index); + EditorGUIUtility.PingObject(element.objectReferenceValue); + } + + private void ReorderCallbackWithDetails(ReorderableList list, int oldIndex, int newIndex) + { + var e0 = list.serializedProperty.GetArrayElementAtIndex(oldIndex).isExpanded; + var e = list.serializedProperty.GetArrayElementAtIndex(newIndex).isExpanded; + list.serializedProperty.GetArrayElementAtIndex(newIndex).isExpanded = e0; + list.serializedProperty.GetArrayElementAtIndex(oldIndex).isExpanded = e; + } + + + private void DrawElementBackground(Rect rect, int index, bool isActive, bool isFocused) + { + if (Event.current.type == EventType.Repaint) + { + rect.height = GetElementHeightCallback(index); + // rect.height += 3f; + ReorderableList.defaultBehaviours.DrawElementBackground(rect, index, isActive, isFocused, true); + + // Color color = (!EditorGUIUtility.isProSkin) ? new Color(0.6f, 0.6f, 0.6f, 0.333f) : new Color(0.12f, 0.12f, 0.12f, 0.333f); + // if (index < _list.count - 1) + // EditorGUI.DrawRect(new Rect(rect.x, rect.y + rect.height - 1f, rect.width, 1f), color); + // EditorGUI.DrawRect(new Rect(rect.x + 20f, rect.y, 1f, rect.height), color); + + // var s = new GUIStyle("IN Title"); + // s.Draw(new Rect(rect.x + 1f, rect.y, 19f, rect.height), false, false, true, false); + + } + } + + private void RemoveCallback(ReorderableList list) + { + var element = list.serializedProperty.GetArrayElementAtIndex(list.index); + + ScriptableObject.DestroyImmediate(element.objectReferenceValue, true); + AssetDatabase.SaveAssets(); + + + element.objectReferenceValue = null; + list.serializedProperty.DeleteArrayElementAtIndex(list.index); + if (list.index >= list.serializedProperty.arraySize - 1) + { + list.index = list.serializedProperty.arraySize - 1; + } + } + + private void AddDropdownCallback(Rect buttonRect, ReorderableList list) + { + var menu = new GenericMenu(); + + // var blocks = AppDomain.CurrentDomain.GetAssemblies() + // .SelectMany(a => a.GetTypes()) + // .Where(t => t.IsSubclassOf(typeof(Intel.RealSense.ProcessingBlock))) + // .ToArray(); + + var blocks = AppDomain.CurrentDomain.GetAssemblies() + .SelectMany(a => a.GetTypes()) + .Select(t => new + { + Type = t, + Attribute = t.GetCustomAttributes(typeof(ProcessingBlockDataAttribute), false).FirstOrDefault() as ProcessingBlockDataAttribute + }).Where(a => a.Attribute != null) + ; + + foreach (var b in blocks) + { + var t = b.Attribute.blockClass.ToString(); + t = t.Replace('.', '/'); + menu.AddItem(new GUIContent(t), false, data => + { + serializedObject.UpdateIfRequiredOrScript(); + + var block = (data as object[])[0] as Type; + var index = list.serializedProperty.arraySize; + list.serializedProperty.arraySize++; + list.index = index; + var element = list.serializedProperty.GetArrayElementAtIndex(index); + + var obj = ScriptableObject.CreateInstance(block); + // UnityEditor.ObjectNames.GetUniqueName(names.ToArray(), block.Name); + obj.name = block.Name; + AssetDatabase.AddObjectToAsset(obj, target); + element.objectReferenceValue = obj; + + serializedObject.ApplyModifiedProperties(); + AssetDatabase.SaveAssets(); + + }, new object[] { b.Type, b.Attribute }); + } + + menu.ShowAsContext(); + } + + private float GetElementHeightCallback(int index) + { + if (index < 0) + return 0; + + var item = _property.GetArrayElementAtIndex(index); + + if (item == null || item.objectReferenceValue == null) + return 0; + + if (!item.isExpanded) + return EditorGUIUtility.singleLineHeight * 1.5f; + + var obj = new SerializedObject(item.objectReferenceValue); + + var h = EditorGUIUtility.singleLineHeight * 1.5f; + + SerializedProperty iterator = obj.GetIterator(); + bool enterChildren = true; + while (iterator.NextVisible(enterChildren)) + { + if (iterator.name == "m_Script") + continue; + if (iterator.name == "enabled") + continue; + h += EditorGUI.GetPropertyHeight(iterator, GUIContent.none, iterator.isExpanded); + h += 4f; + enterChildren = false; + } + + return h; + } + + private void DrawListHeader(Rect rect) + { + GUI.Label(rect, "Processing Blocks"); + } + + private static GUIStyle inspectorTitlebar; + private static GUIStyle inspectorTitlebarText; + + public static bool InspectorFoldout(Rect position, bool foldout, UnityEngine.Object[] targetObjs) + { + if (inspectorTitlebar == null) + { + inspectorTitlebar = "IN Title"; + inspectorTitlebarText = "IN TitleText"; + } + + foldout = EditorGUI.Foldout(position, foldout, GUIContent.none, true, inspectorTitlebar); + + position = inspectorTitlebar.padding.Remove(position); + if (Event.current.type == EventType.Repaint) + inspectorTitlebarText.Draw(position, ObjectNames.GetInspectorTitle(targetObjs[0]), false, false, foldout, false); + + return foldout; + } + + private void DrawListElement(Rect rect, int index, bool isActive, bool isFocused) + { + var item = _property.GetArrayElementAtIndex(index); + + if (item.objectReferenceValue == null) + { + return; + } + + var pb = item.objectReferenceValue; + var obj = new SerializedObject(pb); + obj.Update(); + + var r = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight); + + var enabled = obj.FindProperty("enabled"); + enabled.boolValue = EditorUtility.GetObjectEnabled(obj.targetObject) == 1; + item.isExpanded = EditorGUI.InspectorTitlebar(r, item.isExpanded, obj.targetObject, true); + + if (!item.isExpanded) + { + obj.ApplyModifiedProperties(); + return; + } + + r.y += EditorGUIUtility.singleLineHeight * 1.5f; + + SerializedProperty iterator = obj.GetIterator(); + bool enterChildren = true; + while (iterator.NextVisible(enterChildren)) + { + if (iterator.name == "m_Script") + continue; + + if (iterator.name == "enabled") + continue; + + r.height = EditorGUI.GetPropertyHeight(iterator, GUIContent.none, iterator.isExpanded); + EditorGUI.PropertyField(r, iterator, true); + enterChildren = false; + r.y += r.height + 4f; + } + + obj.ApplyModifiedProperties(); + } + + protected override bool ShouldHideOpenButton() + { + return true; + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + EditorGUILayout.Space(); + using (new EditorGUI.DisabledScope(true)) + EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Script")); + EditorGUILayout.Space(); + _list.DoLayoutList(); + EditorGUILayout.Space(); + serializedObject.ApplyModifiedProperties(); + + EditorUtility.SetDirty(target); + } +} \ No newline at end of file diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs.meta similarity index 83% rename from wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs.meta rename to wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs.meta index ce9aa14b4c..3b20d3bad2 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea7d1f94ef528924fbcca8f5b4cb831b +guid: 555afb609e13e3a4dbf5ff342793fda4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs deleted file mode 100644 index 8770ad67b1..0000000000 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs +++ /dev/null @@ -1,212 +0,0 @@ -using UnityEngine; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; -using System; -using Intel.RealSense; - -public class NewPlayModeTest -{ - // A UnityTest behaves like a coroutine in PlayMode - // and allows you to yield null to skip a frame in EditMode - [UnityTest] - [Category("Live")] - public IEnumerator TestLiveCamera() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - Assert.NotNull(go); - Assert.NotNull(go.GetComponent()); - - var rs = RsDevice.Instance; - Assert.NotNull(rs); - - bool started = false; - rs.OnStart += delegate - { - Assert.IsFalse(started); - started = true; - }; - - Assert.IsFalse(started); - yield return new WaitUntil(() => started); - Assert.IsTrue(started); - - rs.OnNewSample += sample => - { - Debug.Log(sample); - }; - - GameObject.Destroy(go); - yield return null; - Assert.That(go == null); - Assert.IsNull(RsDevice.Instance); - } - - [UnityTest] - [Category("Live")] - public IEnumerator TestLiveDepthTexture() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - - var depth_go = new GameObject("Depth"); - var depth = depth_go.AddComponent(); - - depth._stream = Stream.Depth; - depth._format = Format.Z16; - - depth.textureBinding = new RsStreamTextureRenderer.TextureEvent(); - Assert.IsNotNull(depth.textureBinding); - - Texture depth_tex = null; - depth.textureBinding.AddListener(t => depth_tex = t); - - yield return new WaitUntil(() => RsDevice.Instance.Streaming); - Assert.IsNotNull(depth_tex); - - using (var depth_profile = RsDevice.Instance.ActiveProfile.GetStream(Stream.Depth) as VideoStreamProfile) - { - Assert.AreEqual(depth_tex.width, depth_profile.Width); - Assert.AreEqual(depth_tex.height, depth_profile.Height); - } - - GameObject.Destroy(depth_go); - GameObject.Destroy(go); - } - - - [UnityTest] - [Category("Live")] - public IEnumerator TestDisabledNoStart() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - var rs = RsDevice.Instance; - - rs.OnStop += Assert.Fail; - rs.OnStart += delegate - { - Assert.Fail(); - }; - - go.SetActive(false); - - GameObject.Destroy(go); - yield return null; - Assert.That(go == null); - Assert.IsNull(RsDevice.Instance); - } - - [UnityTest] - [Category("Live")] - public IEnumerator TestDisableStop() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - var rs = RsDevice.Instance; - - bool started = false; - rs.OnStart += delegate - { - Assert.True(started = true); - }; - - yield return new WaitUntil(() => started); - - bool stopped = false; - rs.OnStop += delegate - { - Assert.True(stopped = true); - }; - - go.SetActive(false); - - yield return new WaitUntil(() => stopped); - - GameObject.Destroy(go); - yield return null; - Assert.That(go == null); - } - - [Test] - [Category("Live")] - public void TestExtrinsics() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - var rs = RsDevice.Instance; - - var depth = rs.ActiveProfile.GetStream(Stream.Depth); - Assert.IsNotNull(depth); - - var color = rs.ActiveProfile.GetStream(Stream.Color); - Assert.IsNotNull(color); - - var ex = depth.GetExtrinsicsTo(color); - Assert.True(Array.TrueForAll(ex.translation, x => x != 0)); - Assert.True(Array.TrueForAll(ex.rotation, x => x != 0)); - - GameObject.Destroy(go); - } - - [UnityTest] - [Category("Live"), Category("Record")] - public IEnumerator TestRecord() - { - var go = new GameObject("RealSenseDevice", typeof(RsDevice)); - var rs = RsDevice.Instance; - - go.SetActive(false); - - rs.processMode = RsDevice.ProcessMode.UnityThread; - rs.DeviceConfiguration.mode = RsConfiguration.Mode.Record; - var path = "D:/test.bag"; - rs.DeviceConfiguration.RecordPath = path; - - go.SetActive(true); - - yield return new WaitForSeconds(2f); - GameObject.Destroy(go); - yield return null; - - Assert.That(go == null); - - rs = null; - - // GC.Collect(); - // GC.WaitForPendingFinalizers(); - - var fi = new System.IO.FileInfo(path); - fi.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read); - Assert.True(fi.Exists); - Assert.Greater(fi.Length, 0); - } - - - [UnityTest] - [Category("Playback")] - public IEnumerator TestPlayback() - { - var go = new GameObject("RealSenseDevice"); - go.SetActive(false); - - var rs = go.AddComponent(); - - Debug.Log(JsonUtility.ToJson(rs.DeviceConfiguration, true)); - - var path = "D:/test.bag"; - var fi = new System.IO.FileInfo(path); - Assert.True(fi.Exists); - rs.DeviceConfiguration.PlaybackFile = path; - rs.DeviceConfiguration.mode = RsConfiguration.Mode.Playback; - rs.DeviceConfiguration.Profiles = null; - - Debug.Log(JsonUtility.ToJson(rs.DeviceConfiguration, true)); - - yield return null; - - go.SetActive(true); - - Debug.Log(rs.ActiveProfile.Streams.Count); - - yield return new WaitForSeconds(2f); - GameObject.Destroy(go); - yield return null; - } -} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/ARBackgroundMat.mat b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/ARBackgroundMat.mat index 257e387fec..ef7f9054c4 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/ARBackgroundMat.mat +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/ARBackgroundMat.mat @@ -31,7 +31,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _Colormap: 4 + - _Colormap: 6 - _MaxRange: 5.4285717 - _MinRange: 0 m_Colors: [] diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/BGSegMat.mat b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/BGSegMat.mat index 0cf401d96b..5f96a9baa5 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/BGSegMat.mat +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/BGSegMat.mat @@ -28,9 +28,9 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _DepthScale: 0.001 - - _Feather: 0.17238982 + - _Feather: 0.26692617 - _Gamma: 1.2 - _HasColor: 1 - - _MaxRange: 10.042387 - - _MinRange: 0.8111881 + - _MaxRange: 20 + - _MinRange: 0 m_Colors: [] diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/PointCloudMat.mat b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/PointCloudMat.mat index bdaf0b5b72..f9f36af8ce 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/PointCloudMat.mat +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/PointCloudMat.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: PointCloudMat m_Shader: {fileID: 4800000, guid: 3a8f8c691fcc38d4c956485dfc073ab4, type: 3} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/depthMat.mat b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/depthMat.mat index cdfa899a16..3987de203d 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Materials/depthMat.mat +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Materials/depthMat.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: depthMat m_Shader: {fileID: 4800000, guid: f8395e4599857704d889f76eb8a306b5, type: 3} @@ -29,6 +29,6 @@ Material: m_Floats: - _Colormap: 3 - _DepthScale: 0.001 - - _MaxRange: 2.2857144 + - _MaxRange: 7.714286 - _MinRange: 0 m_Colors: [] diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab b/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab index c1fcfb4c51..f4882744f1 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab @@ -9,25 +9,17 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1649515266839326} + m_RootGameObject: {fileID: 1194601629348710} m_IsPrefabParent: 1 ---- !u!1 &1649515266839326 +--- !u!1 &1194601629348710 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + serializedVersion: 6 m_Component: - - component: {fileID: 4990807242063666} - - component: {fileID: 114996183639889976} - - component: {fileID: 114369489459814890} - - component: {fileID: 114089908946363984} - - component: {fileID: 114182888788218134} - - component: {fileID: 114925312041241192} - - component: {fileID: 114771760120453086} - - component: {fileID: 114278852761199728} - - component: {fileID: 114345603966601980} - - component: {fileID: 114419132739168124} + - component: {fileID: 4669229571324224} + - component: {fileID: 114785398265965568} m_Layer: 0 m_Name: RsProcessingPipe m_TagString: Untagged @@ -35,12 +27,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4990807242063666 +--- !u!4 &4669229571324224 Transform: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} + m_GameObject: {fileID: 1194601629348710} 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} @@ -48,131 +40,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114089908946363984 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 5 - _fork: 0 - _alignTo: 1 ---- !u!114 &114182888788218134 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3c7c85f25773f544c8740f97326ede05, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 5 - _fork: 1 - colorMap: 0 ---- !u!114 &114278852761199728 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f09640427e9920f43ba2dc134aed8bde, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 3 - _fork: 0 - _filterMagnitude: 2 - _filterSmoothAlpha: 0.5 - _filterSmoothDelta: 20 - _holesFill: 0 ---- !u!114 &114345603966601980 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 230cf074ab7534243bf62887095e6fcd, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 2 - _fork: 0 - _filterSmoothAlpha: 0.4 - _filterSmoothDelta: 20 - _temporalPersistence: 3 ---- !u!114 &114369489459814890 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5682605caa58bff4fb904f0231347097, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 1 - _fork: 0 - _holesFill: 0 ---- !u!114 &114419132739168124 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ab94c438ce58954b8f8731e229cf3ec, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 6 - _fork: 1 - _textureStream: 2 ---- !u!114 &114771760120453086 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea7d1f94ef528924fbcca8f5b4cb831b, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 4 - _fork: 0 - _depthResolution: 0 ---- !u!114 &114925312041241192 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45103df07b2af6c42911fb1ecce0c394, type: 3} - m_Name: - m_EditorClassIdentifier: - _order: 0 - _fork: 0 - _filterMagnitude: 2 ---- !u!114 &114996183639889976 +--- !u!114 &114785398265965568 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1649515266839326} - m_Enabled: 0 + m_GameObject: {fileID: 1194601629348710} + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} m_Name: m_EditorClassIdentifier: + Source: {fileID: 0} + profile: {fileID: 0} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab.meta index 157f7576a4..837fadd962 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Prefabs/RsProcessingPipe.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a373cb4460200774cbd7eabd5efab5ba +guid: 88101aaad380d2446b34d5110becbc5f NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe.meta similarity index 77% rename from wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests.meta rename to wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe.meta index 9b0b8feffe..5e3edea3dc 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 329acf72f0a5c214da48cffd8f30266a +guid: 083e01cc55192eb468ab9f3f5a7bb9ba folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset new file mode 100644 index 0000000000..28e0cb5a1d --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} + m_Name: ARBackground + m_EditorClassIdentifier: + _processingBlocks: + - {fileID: 114566306482336930} +--- !u!114 &114566306482336930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} + m_Name: RsAlign + m_EditorClassIdentifier: + enabled: 1 + _alignTo: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset.meta new file mode 100644 index 0000000000..e3a36279b8 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a06ba8591029d64c80177d3eac903f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: sample_assets + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset new file mode 100644 index 0000000000..8aacd04cc3 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} + m_Name: AlignmentSample + m_EditorClassIdentifier: + _processingBlocks: + - {fileID: 114274902827505706} +--- !u!114 &114274902827505706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} + m_Name: RsAlign + m_EditorClassIdentifier: + enabled: 1 + _alignTo: 1 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset.meta new file mode 100644 index 0000000000..35a58bc40f --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2aa3ac11b42b754081322be7318d71e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: sample_assets + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset new file mode 100644 index 0000000000..db947f3423 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} + m_Name: BackgroundSegmentation + m_EditorClassIdentifier: + _processingBlocks: + - {fileID: 114988252412256958} +--- !u!114 &114988252412256958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} + m_Name: RsAlign + m_EditorClassIdentifier: + enabled: 1 + _alignTo: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset.meta new file mode 100644 index 0000000000..fab23d3d8e --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 023db5934bbb74141a7d8b4a65c04e4c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: sample_assets + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset new file mode 100644 index 0000000000..10405f03a4 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} + m_Name: PointCloudDepthAndColor + m_EditorClassIdentifier: + _processingBlocks: + - {fileID: 114654795777124322} +--- !u!114 &114654795777124322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 949c0815228b7334a89a9b09ff0c7fdb, type: 3} + m_Name: RsPointCloud + m_EditorClassIdentifier: + enabled: 1 + TextureStream: 2 + TextureFormat: 5 + _occlusionRemoval: 0 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset.meta new file mode 100644 index 0000000000..a7dd49f94f --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5b0f2c5908cd7140acd24ad517229da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: sample_assets + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset new file mode 100644 index 0000000000..6d78c63552 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} + m_Name: PointCloudProcessingBlocks + m_EditorClassIdentifier: + _processingBlocks: + - {fileID: 114476060953143426} + - {fileID: 114544001719900210} + - {fileID: 114401103692956310} + - {fileID: 114093195037715096} + - {fileID: 114340648865021418} + - {fileID: 114947088938950326} + - {fileID: 114189879441361140} + - {fileID: 114894276943703578} +--- !u!114 &114093195037715096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bec95ba2af23efd408d33138086f1c65, type: 3} + m_Name: RsTemporalFilter + m_EditorClassIdentifier: + enabled: 1 + _filterSmoothAlpha: 1 + _filterSmoothDelta: 100 + _temporalPersistence: 8 +--- !u!114 &114189879441361140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70a93f62582029d4aab3757e6e2fcaf2, type: 3} + m_Name: RsColorizer + m_EditorClassIdentifier: + enabled: 1 + visualPreset: 0 + colorScheme: 0 + histogramEqualization: 1 + minDist: 0 + maxDist: 6 +--- !u!114 &114340648865021418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18bce048bd313fc40b6eb0a08d7f83ab, type: 3} + m_Name: RsDisparityTransform + m_EditorClassIdentifier: + enabled: 1 + Mode: 0 +--- !u!114 &114401103692956310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48f1a4dc738fa514aa5e5d4cc3665aae, type: 3} + m_Name: RsSpatialFilter + m_EditorClassIdentifier: + enabled: 1 + _filterMagnitude: 5 + _filterSmoothAlpha: 1 + _filterSmoothDelta: 50 + _holeFillingMode: 5 +--- !u!114 &114476060953143426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab8658da5fac1924385546d4cfccbea4, type: 3} + m_Name: RsDecimationFilter + m_EditorClassIdentifier: + enabled: 1 + StreamFilter: 0 + FormatFilter: 0 + _filterMagnitude: 2 +--- !u!114 &114544001719900210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18bce048bd313fc40b6eb0a08d7f83ab, type: 3} + m_Name: RsDisparityTransform + m_EditorClassIdentifier: + enabled: 1 + Mode: 1 +--- !u!114 &114894276943703578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 949c0815228b7334a89a9b09ff0c7fdb, type: 3} + m_Name: RsPointCloud + m_EditorClassIdentifier: + enabled: 1 + TextureStream: 1 + TextureFormat: 5 + _occlusionRemoval: 0 +--- !u!114 &114947088938950326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a370b019fb25fbe4384bc45033197fcd, type: 3} + m_Name: RsHoleFillingFilter + m_EditorClassIdentifier: + enabled: 1 + _holesFill: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset.meta b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset.meta new file mode 100644 index 0000000000..d3521b86d5 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f1f4d0a8f3f052419ca9059315d7fe0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: sample_assets + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/ARBackground.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/ARBackground.unity index 5270ad0b88..8a738b0ea3 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/ARBackground.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/ARBackground.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -113,45 +113,106 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &21846752 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114601604562832142, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 479322210} - m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} ---- !u!1 &111368528 stripped -GameObject: - m_PrefabParentObject: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - m_PrefabInternal: {fileID: 1697272955} ---- !u!114 &111368531 -MonoBehaviour: +--- !u!1001 &40068296 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 111368528} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a1efe8d13569ef747ae9556b47f8ac80, type: 3} - m_Name: - m_EditorClassIdentifier: - textureName: _DepthTex - textureBinding: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - m_MethodName: SetTexture - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: NamedTextureBinding+NamedTextureEvent, Utils, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 161552843} + m_Modifications: + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_IsPrefabParent: 0 --- !u!1 &161552839 GameObject: m_ObjectHideFlags: 0 @@ -239,10 +300,8 @@ RectTransform: m_Children: - {fileID: 1125046571} - {fileID: 710549596} - - {fileID: 1554552000} - - {fileID: 580899516} - - {fileID: 1564107245} - {fileID: 920132865} + - {fileID: 1988146953} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -251,227 +310,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &479322210 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 114147760771576290, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114147760771576290, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: _alignTo - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &580899515 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 161552843} - m_Modifications: - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 337.9 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 84.899994 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_SizeDelta.x - value: 160 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_SizeDelta.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.015000001 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.015000001 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114935396537026552, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 114935396537026552, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetFloat - objectReference: {fileID: 0} - - target: {fileID: 114477156514432408, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: material - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 114803314124960982, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 114803314124960982, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetFloat - objectReference: {fileID: 0} - - target: {fileID: 114726209392144524, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: material - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 1428737934256336, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &580899516 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 580899515} --- !u!1 &596698669 GameObject: m_ObjectHideFlags: 0 @@ -715,6 +553,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736868988} +--- !u!114 &765644480 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + m_PrefabInternal: {fileID: 1941816568} + m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} --- !u!1 &786523636 GameObject: m_ObjectHideFlags: 0 @@ -783,11 +627,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 786523636} ---- !u!1 &902534697 stripped -GameObject: - m_PrefabParentObject: {fileID: 1525210846044518, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - m_PrefabInternal: {fileID: 1284782194} --- !u!1 &920132864 GameObject: m_ObjectHideFlags: 0 @@ -819,7 +658,7 @@ RectTransform: - {fileID: 1011870289} - {fileID: 1261546184} m_Father: {fileID: 161552843} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -868,7 +707,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 902534697} + - m_Target: {fileID: 0} m_MethodName: SetActive m_Mode: 0 m_Arguments: @@ -879,7 +718,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1940816200} + - m_Target: {fileID: 0} m_MethodName: SetActive m_Mode: 0 m_Arguments: @@ -1027,6 +866,176 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1011870288} +--- !u!1001 &1025618165 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 765644480} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1243706648} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_Texture + objectReference: {fileID: 0} + - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 765644480} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_mainTexture + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1125046570 GameObject: m_ObjectHideFlags: 0 @@ -1263,6 +1272,39 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1241049264} +--- !u!1 &1243706646 stripped +GameObject: + m_PrefabParentObject: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 1025618165} +--- !u!114 &1243706648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1243706646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1efe8d13569ef747ae9556b47f8ac80, type: 3} + m_Name: + m_EditorClassIdentifier: + textureName: _DepthTex + textureBinding: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} + m_MethodName: SetTexture + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: NamedTextureBinding+NamedTextureEvent, Utils, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null --- !u!1 &1261546183 GameObject: m_ObjectHideFlags: 0 @@ -1333,259 +1375,10 @@ MonoBehaviour: m_Text: Show Depth --- !u!222 &1261546186 CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1261546183} ---- !u!1001 &1284782194 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 161552843} - m_Modifications: - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 194.1 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 84.899994 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114359177376467254, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 114359177376467254, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: Binding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetInt - objectReference: {fileID: 0} - - target: {fileID: 114207460937626212, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: material - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 1525210846044518, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &1554552000 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - m_PrefabInternal: {fileID: 1284782194} ---- !u!1001 &1564107244 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 161552843} - m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.x - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.y - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &1564107245 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - m_PrefabInternal: {fileID: 1564107244} + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1261546183} --- !u!1 &1568271676 GameObject: m_ObjectHideFlags: 0 @@ -1679,6 +1472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab85129d6ab9eae4aa6773f7276abff1, type: 3} m_Name: m_EditorClassIdentifier: + Source: {fileID: 1972790791} material: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} --- !u!1 &1585828150 GameObject: @@ -1724,7 +1518,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: b655c8c282701ad449d0eacb8dac3f9b, type: 2} m_StaticBatchInfo: @@ -1811,275 +1604,104 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1697272955 +--- !u!1 &1836960444 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1836960445} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1836960445 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1836960444} + 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: 786523637} + m_Father: {fileID: 710549596} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0} + m_AnchorMax: {x: 0.75, y: 1} + m_AnchoredPosition: {x: 0, y: -5.000061} + m_SizeDelta: {x: 0, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1941816568 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: 6e1f5e9643df5bb4bb6205cfa99759a7, type: 2} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_mainTexture - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: profile value: - objectReference: {fileID: 111368531} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_Texture - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: filterMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + objectReference: {fileID: 11400000, guid: 2a06ba8591029d64c80177d3eac903f9, type: 2} - propertyPath: _format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} - propertyPath: _processingPipe + propertyPath: Source value: - objectReference: {fileID: 21846752} + objectReference: {fileID: 1972790791} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1836960444 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1836960445} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1836960445 +--- !u!114 &1972790791 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 1025618165} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} +--- !u!224 &1988146953 stripped RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1836960444} - 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: 786523637} - m_Father: {fileID: 710549596} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.75, y: 1} - m_AnchoredPosition: {x: 0, y: -5.000061} - m_SizeDelta: {x: 0, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1940816200 stripped -GameObject: - m_PrefabParentObject: {fileID: 1428737934256336, guid: 27320a2a761fec34f84dbda2f1ec860c, + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_PrefabInternal: {fileID: 580899515} + m_PrefabInternal: {fileID: 40068296} --- !u!1 &2077207544 GameObject: m_ObjectHideFlags: 0 @@ -2140,5 +1762,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity index 046d96da46..aae05431d8 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -184,8 +184,7 @@ CanvasRenderer: --- !u!1 &29198032 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1099464781215092, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -202,8 +201,7 @@ GameObject: --- !u!224 &29198033 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224285753986236318, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29198032} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -221,66 +219,9 @@ RectTransform: --- !u!222 &29198034 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222533055332735852, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29198032} ---- !u!1001 &118567012 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 114147760771576290, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114089908946363984, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - m_IsPrefabParent: 0 --- !u!1001 &183059718 Prefab: m_ObjectHideFlags: 0 @@ -409,8 +350,21 @@ Prefab: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} + m_ParentPrefab: {fileID: 0} m_IsPrefabParent: 0 +--- !u!4 &183059719 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 183059718} + m_GameObject: {fileID: 1691001522} + 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: 401479010} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &229598339 GameObject: m_ObjectHideFlags: 0 @@ -445,6 +399,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &233073768 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 653401233} + serializedVersion: 5 + m_Component: + - component: {fileID: 653401234} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &253509931 GameObject: m_ObjectHideFlags: 0 @@ -566,8 +535,7 @@ MonoBehaviour: --- !u!114 &312912468 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114586623054535830, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29198032} m_Enabled: 1 @@ -590,18 +558,35 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!114 &365887012 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114089908946363984, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 118567012} - m_Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} ---- !u!114 &365887014 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114996183639889976, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 118567012} - m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} +--- !u!1 &401479009 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 183059718} + serializedVersion: 5 + m_Component: + - component: {fileID: 401479010} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &401479010 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 183059718} + m_GameObject: {fileID: 401479009} + 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: 183059719} + m_Father: {fileID: 904710441} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &413936637 GameObject: m_ObjectHideFlags: 0 @@ -948,8 +933,9 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 365887012} - m_MethodName: set_AlignColorToDepth + - m_Target: {fileID: 114274902827505706, guid: e2aa3ac11b42b754081322be7318d71e, + type: 2} + m_MethodName: set_AlignOtherToDepth m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1155,8 +1141,21 @@ Prefab: value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} + m_ParentPrefab: {fileID: 0} m_IsPrefabParent: 0 +--- !u!4 &653401234 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 653401233} + m_GameObject: {fileID: 233073768} + 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: 692437148} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &659927586 GameObject: m_ObjectHideFlags: 0 @@ -1225,16 +1224,144 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 659927586} ---- !u!224 &728555513 stripped +--- !u!1 &692437147 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 653401233} + serializedVersion: 5 + m_Component: + - component: {fileID: 692437148} + m_Layer: 0 + m_Name: Missing Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &692437148 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 653401233} + m_GameObject: {fileID: 692437147} + 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: 653401234} + m_Father: {fileID: 904710441} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &705516566 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1270348810} + m_Modifications: + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_IsPrefabParent: 0 +--- !u!224 &705516567 stripped RectTransform: - m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_PrefabInternal: {fileID: 653401233} + m_PrefabInternal: {fileID: 705516566} --- !u!114 &791310447 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114768335087863362, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1399807542} m_Enabled: 1 @@ -1257,29 +1384,88 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1 &812124441 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 812124443} - - component: {fileID: 812124442} - m_Layer: 5 - m_Name: AlignDepthToColor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &812124442 -MonoBehaviour: +--- !u!1001 &800706008 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 812124441} - m_Enabled: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1706558665} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: profile + value: + objectReference: {fileID: 11400000, guid: e2aa3ac11b42b754081322be7318d71e, + type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &800706009 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + m_PrefabInternal: {fileID: 800706008} + m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} +--- !u!1 &812124441 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 812124443} + - component: {fileID: 812124442} + m_Layer: 5 + m_Name: AlignDepthToColor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &812124442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 812124441} + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1315,7 +1501,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 365887012} + - m_Target: {fileID: 114274902827505706, guid: e2aa3ac11b42b754081322be7318d71e, + type: 2} m_MethodName: set_AlignDepthToColor m_Mode: 0 m_Arguments: @@ -1374,8 +1561,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1159112420} - - {fileID: 728555513} + - {fileID: 401479010} + - {fileID: 692437148} m_Father: {fileID: 1270348810} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1444,7 +1631,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1070013921 GameObject: @@ -1520,11 +1707,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1070013921} ---- !u!224 &1159112420 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 183059718} --- !u!1 &1194772351 GameObject: m_ObjectHideFlags: 0 @@ -1620,7 +1802,7 @@ RectTransform: m_Children: - {fileID: 289895322} - {fileID: 904710441} - - {fileID: 1583970822} + - {fileID: 705516567} m_Father: {fileID: 580749883} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1700,8 +1882,7 @@ CanvasRenderer: --- !u!1 &1399807542 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1848174744757286, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -1718,8 +1899,7 @@ GameObject: --- !u!224 &1399807543 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224416760474647550, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1399807542} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1737,8 +1917,7 @@ RectTransform: --- !u!222 &1399807544 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222775306524607124, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1399807542} --- !u!1 &1569722009 @@ -1810,131 +1989,182 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!1001 &1583970821 +--- !u!1 &1691001522 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 183059718} + serializedVersion: 5 + m_Component: + - component: {fileID: 183059719} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1001 &1706558664 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1270348810} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchoredPosition.x - value: -36 + propertyPath: Source + value: + objectReference: {fileID: 800706009} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchoredPosition.y - value: -36 + propertyPath: _format + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_SizeDelta.x - value: 36 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 791310447} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_SizeDelta.y - value: 36 + propertyPath: Source + value: + objectReference: {fileID: 800706009} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 2 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchorMin.x - value: 1 + propertyPath: _format + value: 5 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchorMin.y - value: 1 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 312912468} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchorMax.x - value: 1 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream + value: 2 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_Pivot.y - value: 0.5 + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format + value: 5 objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} m_IsPrefabParent: 0 ---- !u!224 &1583970822 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, +--- !u!114 &1706558665 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_PrefabInternal: {fileID: 1583970821} + m_PrefabInternal: {fileID: 1706558664} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} --- !u!1 &1738236611 GameObject: m_ObjectHideFlags: 0 @@ -2071,196 +2301,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1833289437} ---- !u!1001 &1878000804 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 312912468} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 791310447} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _processingPipe - value: - objectReference: {fileID: 365887014} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1942059520 GameObject: m_ObjectHideFlags: 0 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/BackgroundSegmentation.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/BackgroundSegmentation.unity index d839800638..d7e9a48219 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/BackgroundSegmentation.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/BackgroundSegmentation.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -257,6 +257,111 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 72867180} +--- !u!1001 &143539700 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1871308802} + m_Modifications: + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_IsPrefabParent: 0 +--- !u!224 &143539701 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + m_PrefabInternal: {fileID: 143539700} --- !u!1 &183908771 GameObject: m_ObjectHideFlags: 0 @@ -334,8 +439,7 @@ CanvasRenderer: --- !u!1 &193702534 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1428737934256336, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -351,8 +455,7 @@ GameObject: --- !u!224 &193702535 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 193702534} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -372,8 +475,7 @@ RectTransform: --- !u!114 &193702536 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114962626815417522, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 193702534} m_Enabled: 1 @@ -455,8 +557,7 @@ CanvasRenderer: --- !u!1 &246589039 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1211050588461648, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -471,8 +572,7 @@ GameObject: --- !u!224 &246589040 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224689283272489252, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 246589039} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -525,8 +625,7 @@ RectTransform: --- !u!1 &433587494 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1803115165261326, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -545,8 +644,7 @@ GameObject: --- !u!224 &433587495 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224940779620816996, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 433587494} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -567,8 +665,7 @@ RectTransform: --- !u!114 &433587496 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114477156514432408, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 433587494} m_Enabled: 1 @@ -597,8 +694,7 @@ MonoBehaviour: --- !u!114 &433587497 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114935396537026552, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 433587494} m_Enabled: 1 @@ -626,8 +722,7 @@ MonoBehaviour: --- !u!114 &433587498 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114653117510288892, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 433587494} m_Enabled: 1 @@ -931,137 +1026,6 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &643574339 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114601604562832142, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1651105485} - m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} ---- !u!1001 &678948289 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1871308802} - m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.x - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.y - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &678948290 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - m_PrefabInternal: {fileID: 678948289} --- !u!1 &696312253 GameObject: m_ObjectHideFlags: 0 @@ -1204,40 +1168,7 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 739925366} ---- !u!1 &831312451 stripped -GameObject: - m_PrefabParentObject: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - m_PrefabInternal: {fileID: 1020778242} ---- !u!114 &831312452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 831312451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a1efe8d13569ef747ae9556b47f8ac80, type: 3} - m_Name: - m_EditorClassIdentifier: - textureName: _ColorTex - textureBinding: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} - m_MethodName: SetTexture - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: NamedTextureBinding+NamedTextureEvent, Utils, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null ---- !u!1 &870050339 +--- !u!1 &870050339 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -1302,8 +1233,7 @@ Transform: --- !u!1 &895737727 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1789155049978404, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -1320,8 +1250,7 @@ GameObject: --- !u!224 &895737728 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224921839329566712, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 895737727} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1339,8 +1268,7 @@ RectTransform: --- !u!114 &895737729 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114080300322441736, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 895737727} m_Enabled: 1 @@ -1367,11 +1295,203 @@ MonoBehaviour: --- !u!222 &895737730 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222604339782680452, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 895737727} ---- !u!1001 &1020778242 +--- !u!1 &1027275149 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1027275150} + - component: {fileID: 1027275153} + - component: {fileID: 1027275152} + - component: {fileID: 1027275151} + - component: {fileID: 1027275154} + m_Layer: 5 + m_Name: MaxSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1027275150 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1027275149} + 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: 1687894210} + m_Father: {fileID: 193702535} + m_RootOrder: 1 + 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!114 &1027275151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1027275149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00041e24a8ebd6a498e0ce1832ce37c2, type: 3} + m_Name: + m_EditorClassIdentifier: + material: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} + propertyName: _MaxRange + Binding: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1027275153} + m_MethodName: set_value + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: GetMaterialFloat+FloatEvent, Utils, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null +--- !u!114 &1027275152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1027275149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: edcacd9285a1fb242a7a1797a63904c6, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: _MaxRange + Binding: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} + m_MethodName: SetFloat + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: StringFloatBinding+StringFloatEvent, Utils, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null +--- !u!114 &1027275153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1027275149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1730680628} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 1730680627} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 20 + m_WholeNumbers: 0 + m_Value: 2 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1027275152} + m_MethodName: set_Value + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1027275154} + m_MethodName: set_Value + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1027275154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1027275149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89232479b8ac84145a0f2949ae7c1ac8, type: 3} + m_Name: + m_EditorClassIdentifier: + format: 'Max: {0:F2}m' + Binding: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 739925368} + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: FloatToStringFormat+StringEvent, Utils, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null +--- !u!1001 &1051014907 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1420,50 +1540,49 @@ Prefab: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 1421940970626846, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: Source value: - objectReference: {fileID: 2014043423} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture + objectReference: {fileID: 1962560375} + - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: Source value: - objectReference: {fileID: 831312452} + objectReference: {fileID: 1962560375} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 0 + propertyPath: _stream + value: 2 objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 + propertyPath: _format + value: 5 objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 556956186} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: set_texture + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1051014910} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -1479,83 +1598,30 @@ Prefab: propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: _videoStreamFilter.Stream - value: 2 - objectReference: {fileID: 0} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 556956186} - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: set_texture objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2014043423} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Height - value: 480 + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture objectReference: {fileID: 0} - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} @@ -1567,211 +1633,77 @@ Prefab: propertyPath: _format value: 1 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: _stream + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream value: 2 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 5 - objectReference: {fileID: 0} - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: _processingPipe - value: - objectReference: {fileID: 643574339} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_IsPrefabParent: 0 ---- !u!1 &1027275149 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1667016444894986, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1027275150} - - component: {fileID: 1027275153} - - component: {fileID: 1027275152} - - component: {fileID: 1027275151} - - component: {fileID: 1027275154} - m_Layer: 5 - m_Name: MaxSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1027275150 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224675067278613660, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1027275149} - 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: 1687894210} - m_Father: {fileID: 193702535} - m_RootOrder: 1 - 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!114 &1027275151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114726209392144524, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1027275149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00041e24a8ebd6a498e0ce1832ce37c2, type: 3} - m_Name: - m_EditorClassIdentifier: - material: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} - propertyName: _MaxRange - Binding: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1027275153} - m_MethodName: set_value - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: GetMaterialFloat+FloatEvent, Utils, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null ---- !u!114 &1027275152 + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &1051014908 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114803314124960982, guid: 27320a2a761fec34f84dbda2f1ec860c, + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1027275149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: edcacd9285a1fb242a7a1797a63904c6, type: 3} - m_Name: - m_EditorClassIdentifier: - Name: _MaxRange - Binding: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} - m_MethodName: SetFloat - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: StringFloatBinding+StringFloatEvent, Utils, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null ---- !u!114 &1027275153 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114992624216939912, guid: 27320a2a761fec34f84dbda2f1ec860c, + m_PrefabInternal: {fileID: 1051014907} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} +--- !u!1 &1051014909 stripped +GameObject: + m_PrefabParentObject: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1027275149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_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_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1730680628} - m_FillRect: {fileID: 0} - m_HandleRect: {fileID: 1730680627} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 20 - m_WholeNumbers: 0 - m_Value: 2 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1027275152} - m_MethodName: set_Value - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1027275154} - m_MethodName: set_Value - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1027275154 + m_PrefabInternal: {fileID: 1051014907} +--- !u!114 &1051014910 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1027275149} + m_GameObject: {fileID: 1051014909} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 89232479b8ac84145a0f2949ae7c1ac8, type: 3} + m_Script: {fileID: 11500000, guid: a1efe8d13569ef747ae9556b47f8ac80, type: 3} m_Name: m_EditorClassIdentifier: - format: 'Max: {0:F2}m' - Binding: + textureName: _ColorTex + textureBinding: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 739925368} - m_MethodName: set_text + - m_Target: {fileID: 2100000, guid: b450f17118e189b44afff9200f9d1672, type: 2} + m_MethodName: SetTexture m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1781,7 +1713,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: FloatToStringFormat+StringEvent, Utils, Version=0.0.0.0, Culture=neutral, + m_TypeName: NamedTextureBinding+NamedTextureEvent, Utils, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1152207064 GameObject: @@ -2279,8 +2211,7 @@ RectTransform: --- !u!1 &1498327854 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1410478896019826, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -2295,8 +2226,7 @@ GameObject: --- !u!224 &1498327855 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224879078666065612, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1498327854} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -2386,58 +2316,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1538123434} ---- !u!1001 &1651105485 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4483221479523258, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114147760771576290, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114147760771576290, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: _alignTo - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1659404973 GameObject: m_ObjectHideFlags: 0 @@ -2574,8 +2452,7 @@ CanvasRenderer: --- !u!1 &1680793078 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1690247867902080, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -2592,8 +2469,7 @@ GameObject: --- !u!224 &1680793079 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224728005338888446, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1680793078} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2611,8 +2487,7 @@ RectTransform: --- !u!114 &1680793080 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114021321775137958, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1680793078} m_Enabled: 1 @@ -2639,15 +2514,13 @@ MonoBehaviour: --- !u!222 &1680793081 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222617977714210352, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1680793078} --- !u!1 &1687894209 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1387918562341080, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -2662,8 +2535,7 @@ GameObject: --- !u!224 &1687894210 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224569229514731876, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1687894209} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2716,8 +2588,7 @@ RectTransform: --- !u!1 &1730680626 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1675345141533020, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -2734,8 +2605,7 @@ GameObject: --- !u!224 &1730680627 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1730680626} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2753,8 +2623,7 @@ RectTransform: --- !u!114 &1730680628 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114711155753578462, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1730680626} m_Enabled: 1 @@ -2781,8 +2650,7 @@ MonoBehaviour: --- !u!222 &1730680629 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222097949444055942, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1730680626} --- !u!1 &1871308798 @@ -2873,7 +2741,7 @@ RectTransform: - {fileID: 556956185} - {fileID: 2014043422} - {fileID: 1383713844} - - {fileID: 678948290} + - {fileID: 143539701} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2950,6 +2818,65 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1937370245} +--- !u!1001 &1962560374 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1051014908} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: profile + value: + objectReference: {fileID: 11400000, guid: 023db5934bbb74141a7d8b4a65c04e4c, + type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &1962560375 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + m_PrefabInternal: {fileID: 1962560374} + m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} --- !u!1 &2014043421 GameObject: m_ObjectHideFlags: 0 @@ -3020,8 +2947,7 @@ CanvasRenderer: --- !u!1 &2130223684 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1721561986499570, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -3038,8 +2964,7 @@ GameObject: --- !u!224 &2130223685 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2130223684} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3057,8 +2982,7 @@ RectTransform: --- !u!114 &2130223686 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114872835099998368, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2130223684} m_Enabled: 1 @@ -3085,7 +3009,6 @@ MonoBehaviour: --- !u!222 &2130223687 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222032790478954914, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2130223684} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudDepthAndColor.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudDepthAndColor.unity index 43d8a35fed..c5fd12c185 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudDepthAndColor.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudDepthAndColor.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0.38451514, b: 0.5026277, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -113,18 +113,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &77125265 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114996183639889976, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1073255687} - m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} --- !u!1 &128090160 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 128090164} - component: {fileID: 128090163} @@ -140,7 +134,7 @@ GameObject: --- !u!114 &128090161 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 128090160} m_Enabled: 1 @@ -156,7 +150,7 @@ MonoBehaviour: --- !u!114 &128090162 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 128090160} m_Enabled: 1 @@ -177,7 +171,7 @@ MonoBehaviour: --- !u!223 &128090163 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 128090160} m_Enabled: 1 @@ -197,14 +191,14 @@ Canvas: --- !u!224 &128090164 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 128090160} 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: 203218191} + - {fileID: 623865073} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -213,7 +207,54 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &203218190 +--- !u!1001 &554362625 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 673504469} + m_Modifications: + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114148710568042142, guid: a2bade7ff40ff92409855b062870dccd, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1496058661} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &623865072 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -310,129 +351,228 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} m_IsPrefabParent: 0 ---- !u!224 &203218191 stripped +--- !u!224 &623865073 stripped RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + m_CorrespondingSourceObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_PrefabInternal: {fileID: 203218190} ---- !u!1001 &869395586 + m_PrefabInternal: {fileID: 623865072} +--- !u!1001 &673504467 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1865264944} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4129931741838008, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4337724551838942, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4550031925029102, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1496058661} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2100000, guid: a88d3559a65c7024fb983e435d846e5e, type: 2} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_mainTexture + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1073255687 +--- !u!114 &673504468 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 673504467} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} +--- !u!4 &673504469 stripped +Transform: + m_PrefabParentObject: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 673504467} +--- !u!1001 &1496058660 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 114419132739168124, guid: a373cb4460200774cbd7eabd5efab5ba, + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 673504468} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: profile + value: + objectReference: {fileID: 11400000, guid: f5b0f2c5908cd7140acd24ad517229da, type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} m_IsPrefabParent: 0 +--- !u!114 &1496058661 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + m_PrefabInternal: {fileID: 1496058660} + m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} --- !u!1 &1628558566 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1628558568} - component: {fileID: 1628558567} @@ -446,7 +586,7 @@ GameObject: --- !u!108 &1628558567 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1628558566} m_Enabled: 1 @@ -473,6 +613,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -482,7 +623,7 @@ Light: --- !u!4 &1628558568 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1628558566} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} @@ -492,165 +633,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1694239407 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4129931741838008, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4337724551838942, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4550031925029102, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: a88d3559a65c7024fb983e435d846e5e, type: 2} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_mainTexture - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _processingPipe - value: - objectReference: {fileID: 77125265} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_IsPrefabParent: 0 ---- !u!4 &1865264944 stripped -Transform: - m_PrefabParentObject: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - m_PrefabInternal: {fileID: 1694239407} --- !u!1 &2081674599 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 2081674602} - component: {fileID: 2081674601} @@ -665,7 +653,7 @@ GameObject: --- !u!114 &2081674600 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081674599} m_Enabled: 1 @@ -683,7 +671,7 @@ MonoBehaviour: --- !u!114 &2081674601 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081674599} m_Enabled: 1 @@ -697,7 +685,7 @@ MonoBehaviour: --- !u!4 &2081674602 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2081674599} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -710,9 +698,9 @@ Transform: --- !u!1 &2133302826 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 2133302831} - component: {fileID: 2133302830} @@ -730,34 +718,38 @@ GameObject: --- !u!81 &2133302827 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} m_Enabled: 1 --- !u!124 &2133302828 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} m_Enabled: 1 --- !u!92 &2133302829 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} m_Enabled: 1 --- !u!20 &2133302830 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} 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_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -787,7 +779,7 @@ Camera: --- !u!4 &2133302831 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} m_LocalRotation: {x: 0.05180734, y: -0.1415724, z: 0.0074194716, w: 0.9885435} @@ -800,7 +792,7 @@ Transform: --- !u!114 &2133302832 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2133302826} m_Enabled: 1 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudProcessingBlocks.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudProcessingBlocks.unity index d65de9cb8b..45af9cb619 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudProcessingBlocks.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudProcessingBlocks.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0.38451514, b: 0.5026277, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -345,7 +345,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124658} + - m_Target: {fileID: 114401103692956310, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetSmoothAlpha m_Mode: 0 m_Arguments: @@ -476,7 +477,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124658} + - m_Target: {fileID: 114401103692956310, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetHolesFill m_Mode: 0 m_Arguments: @@ -709,7 +711,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124654} + - m_Target: {fileID: 114476060953143426, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetMagnitude m_Mode: 0 m_Arguments: @@ -1007,48 +1010,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 319889504} ---- !u!1001 &321119485 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1612107313} - m_Modifications: - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a2bade7ff40ff92409855b062870dccd, type: 2} - m_IsPrefabParent: 0 --- !u!1 &347441815 GameObject: m_ObjectHideFlags: 0 @@ -1303,8 +1264,9 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124657} - m_MethodName: set_enabled + - m_Target: {fileID: 114093195037715096, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} + m_MethodName: set_Enabled m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1393,80 +1355,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 384411364} ---- !u!1 &393435009 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 393435010} - - component: {fileID: 393435012} - - component: {fileID: 393435011} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &393435010 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 393435009} - 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: 1740863971} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9, y: -0.5} - m_SizeDelta: {x: -28, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &393435011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 393435009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Depth Resolution ---- !u!222 &393435012 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 393435009} --- !u!1 &419153242 GameObject: m_ObjectHideFlags: 0 @@ -1643,6 +1531,111 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 512809247} +--- !u!1001 &517920736 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 571218083} + m_Modifications: + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_IsPrefabParent: 0 +--- !u!224 &517920737 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + m_PrefabInternal: {fileID: 517920736} --- !u!1 &523251388 GameObject: m_ObjectHideFlags: 0 @@ -1869,7 +1862,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124655} + - m_Target: {fileID: 114947088938950326, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetHoleFill m_Mode: 0 m_Arguments: @@ -1967,7 +1961,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1197250301} + - {fileID: 517920737} - {fileID: 1592578204} m_Father: {fileID: 0} m_RootOrder: 2 @@ -2181,57 +2175,211 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 755859198} ---- !u!1 &765057190 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 765057191} - - component: {fileID: 765057192} - m_Layer: 5 - m_Name: Persistence - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765057191 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 765057190} - 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: 1683590651} - - {fileID: 1129618375} - - {fileID: 575498376} - - {fileID: 2088391917} - m_Father: {fileID: 1487076863} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: -40} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &765057192 -MonoBehaviour: +--- !u!1001 &760059614 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 765057190} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[1].Height + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 4550031925029102, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4129931741838008, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4337724551838942, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 2116091798} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2100000, guid: a88d3559a65c7024fb983e435d846e5e, type: 2} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_mainTexture + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &760059615 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 760059614} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} +--- !u!4 &760059616 stripped +Transform: + m_PrefabParentObject: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 760059614} +--- !u!1 &765057190 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 765057191} + - component: {fileID: 765057192} + m_Layer: 5 + m_Name: Persistence + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &765057191 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 765057190} + 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: 1683590651} + - {fileID: 1129618375} + - {fileID: 575498376} + - {fileID: 2088391917} + m_Father: {fileID: 1487076863} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 50, y: -40} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &765057192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 765057190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2265,7 +2413,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124657} + - m_Target: {fileID: 114093195037715096, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetTemporalPersistence m_Mode: 0 m_Arguments: @@ -2638,74 +2787,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 846547291} ---- !u!1 &854721114 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 854721115} - - component: {fileID: 854721117} - - component: {fileID: 854721116} - m_Layer: 5 - m_Name: Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &854721115 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854721114} - 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: 1087449018} - 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} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &854721116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854721114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &854721117 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854721114} --- !u!1 &912442580 GameObject: m_ObjectHideFlags: 0 @@ -3022,8 +3103,9 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124658} - m_MethodName: set_enabled + - m_Target: {fileID: 114401103692956310, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} + m_MethodName: set_Enabled m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3120,7 +3202,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124658} + - m_Target: {fileID: 114401103692956310, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetSmoothDelta m_Mode: 0 m_Arguments: @@ -3133,90 +3216,22 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &1057555634 +--- !u!1 &1086177209 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1057555635} - - component: {fileID: 1057555637} - - component: {fileID: 1057555636} + - component: {fileID: 1086177210} m_Layer: 5 - m_Name: Fill + m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1057555635 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057555634} - 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: 2000311255} - 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: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1057555636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057555634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 ---- !u!222 &1057555637 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057555634} ---- !u!1 &1086177209 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1086177210} - 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 &1086177210 +--- !u!224 &1086177210 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -3235,75 +3250,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1087449017 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1087449018} - - component: {fileID: 1087449020} - - component: {fileID: 1087449019} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1087449018 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1087449017} - 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: 854721115} - m_Father: {fileID: 1740863971} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1087449019 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1087449017} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 ---- !u!222 &1087449020 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1087449017} --- !u!1 &1121707013 GameObject: m_ObjectHideFlags: 0 @@ -3490,7 +3436,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124657} + - m_Target: {fileID: 114093195037715096, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetSmoothAlpha m_Mode: 0 m_Arguments: @@ -3778,11 +3725,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195358374} ---- !u!224 &1197250301 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - m_PrefabInternal: {fileID: 1597695242} --- !u!1 &1226411217 GameObject: m_ObjectHideFlags: 0 @@ -4043,7 +3985,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124658} + - m_Target: {fileID: 114401103692956310, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetMagnitude m_Mode: 0 m_Arguments: @@ -4329,7 +4272,6 @@ RectTransform: - {fileID: 1478150893} - {fileID: 1487076863} - {fileID: 2051256245} - - {fileID: 1778513349} m_Father: {fileID: 1929505078} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4338,124 +4280,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} ---- !u!1001 &1413124653 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4990807242063666, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114419132739168124, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114419132739168124, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: _textureStream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114182888788218134, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114369489459814890, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114925312041241192, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114771760120453086, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114278852761199728, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114345603966601980, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a373cb4460200774cbd7eabd5efab5ba, type: 2} - m_IsPrefabParent: 0 ---- !u!114 &1413124654 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114925312041241192, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: 45103df07b2af6c42911fb1ecce0c394, type: 3} ---- !u!114 &1413124655 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114369489459814890, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: 5682605caa58bff4fb904f0231347097, type: 3} ---- !u!114 &1413124656 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114996183639889976, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} ---- !u!114 &1413124657 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114345603966601980, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: 230cf074ab7534243bf62887095e6fcd, type: 3} ---- !u!114 &1413124658 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114278852761199728, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: f09640427e9920f43ba2dc134aed8bde, type: 3} ---- !u!114 &1413124659 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114771760120453086, guid: a373cb4460200774cbd7eabd5efab5ba, - type: 2} - m_PrefabInternal: {fileID: 1413124653} - m_Script: {fileID: 11500000, guid: ea7d1f94ef528924fbcca8f5b4cb831b, type: 3} --- !u!1 &1416620498 GameObject: m_ObjectHideFlags: 0 @@ -4954,8 +4778,9 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124654} - m_MethodName: set_enabled + - m_Target: {fileID: 114476060953143426, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} + m_MethodName: set_Enabled m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -5036,190 +4861,80 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1576593500} ---- !u!1 &1579342638 +--- !u!1 &1592578203 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1579342639} - - component: {fileID: 1579342641} - - component: {fileID: 1579342640} + - component: {fileID: 1592578204} + - component: {fileID: 1592578207} + - component: {fileID: 1592578206} + - component: {fileID: 1592578205} m_Layer: 5 - m_Name: Text + m_Name: ProcessingBlocks m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1579342639 +--- !u!224 &1592578204 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1579342638} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1592578203} + 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: 1613296547} - m_RootOrder: 3 + m_Children: + - {fileID: 1929505078} + - {fileID: 792903467} + - {fileID: 352890519} + m_Father: {fileID: 571218083} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -110, y: -6} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 170, y: 245} + m_SizeDelta: {x: 330, y: 480} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1579342640 +--- !u!114 &1592578205 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1579342638} + m_GameObject: {fileID: 1592578203} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Depth Resolution - -' ---- !u!222 &1579342641 + 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 +--- !u!222 &1592578206 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1579342638} ---- !u!1 &1586140520 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1586140521} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1586140521 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1586140520} - 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: 2046597918} - m_Father: {fileID: 1613296547} - m_RootOrder: 2 - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1592578203 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1592578204} - - component: {fileID: 1592578207} - - component: {fileID: 1592578206} - - component: {fileID: 1592578205} - m_Layer: 5 - m_Name: ProcessingBlocks - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1592578204 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1592578203} - 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: 1929505078} - - {fileID: 792903467} - - {fileID: 352890519} - m_Father: {fileID: 571218083} - 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: 170, y: 280} - m_SizeDelta: {x: 330, y: 550} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1592578205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1592578203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 ---- !u!222 &1592578206 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1592578203} ---- !u!114 &1592578207 -MonoBehaviour: + m_GameObject: {fileID: 1592578203} +--- !u!114 &1592578207 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -5283,126 +4998,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1597695242 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 571218083} - m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.x - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.y - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1607037784 GameObject: m_ObjectHideFlags: 0 @@ -5463,294 +5058,14 @@ MonoBehaviour: m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1607037787 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1607037784} ---- !u!1001 &1612107311 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: m_processingBlocks.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureFormat - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2100000, guid: a88d3559a65c7024fb983e435d846e5e, type: 2} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_mainTexture - objectReference: {fileID: 0} - - target: {fileID: 4550031925029102, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4129931741838008, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4337724551838942, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: m_processingBlocks.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Width - value: 1280 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[0].Height - value: 720 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _processingPipe - value: - objectReference: {fileID: 1413124656} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_IsPrefabParent: 0 ---- !u!4 &1612107313 stripped -Transform: - m_PrefabParentObject: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - m_PrefabInternal: {fileID: 1612107311} ---- !u!1 &1613296546 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1613296547} - - component: {fileID: 1613296548} - m_Layer: 5 - m_Name: DepthResolution - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1613296547 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1613296546} - 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: 1778588256} - - {fileID: 2000311255} - - {fileID: 1586140521} - - {fileID: 1579342639} - m_Father: {fileID: 1778513349} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 60, y: -15} - m_SizeDelta: {x: 130, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1613296548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1613296546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_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_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2046597919} - m_FillRect: {fileID: 1057555635} - m_HandleRect: {fileID: 2046597918} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 15 - m_WholeNumbers: 1 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1413124659} - m_MethodName: SetResolution - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1607037787 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1607037784} --- !u!1 &1628558566 GameObject: m_ObjectHideFlags: 0 @@ -6006,269 +5321,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 ---- !u!222 &1683590653 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1683590650} ---- !u!1 &1700573914 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1700573915} - - component: {fileID: 1700573917} - - component: {fileID: 1700573916} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1700573915 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1700573914} - 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: 2099038032} - 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: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1700573916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1700573914} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 ---- !u!222 &1700573917 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1700573914} ---- !u!1 &1740863970 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1740863971} - - component: {fileID: 1740863972} - m_Layer: 5 - m_Name: Toggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1740863971 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1740863970} - 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: 1087449018} - - {fileID: 393435010} - m_Father: {fileID: 1778513349} - 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} - m_AnchoredPosition: {x: -50, y: 10} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1740863972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1740863970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_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_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1087449019} - toggleTransition: 1 - graphic: {fileID: 854721116} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1413124659} - m_MethodName: set_enabled - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null - m_IsOn: 1 ---- !u!1 &1748384260 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1748384261} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1748384261 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1748384260} - 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: 912442581} - m_Father: {fileID: 80154622} - m_RootOrder: 2 - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1748578272 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1748578273} - - component: {fileID: 1748578275} - - component: {fileID: 1748578274} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1748578273 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1748578272} - 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: 1086177210} - 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!114 &1748578274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1748578272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6276,69 +5329,67 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1748578275 +--- !u!222 &1683590653 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1748578272} ---- !u!1 &1778513348 + m_GameObject: {fileID: 1683590650} +--- !u!1 &1700573914 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1778513349} - - component: {fileID: 1778513351} - - component: {fileID: 1778513350} + - component: {fileID: 1700573915} + - component: {fileID: 1700573917} + - component: {fileID: 1700573916} m_Layer: 5 - m_Name: DepthResolution + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1778513349 +--- !u!224 &1700573915 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778513348} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1700573914} + 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: 1740863971} - - {fileID: 1613296547} - m_Father: {fileID: 1382451895} - m_RootOrder: 4 + m_Children: [] + m_Father: {fileID: 2099038032} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -506} - m_SizeDelta: {x: 300, y: 70} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1778513350 +--- !u!114 &1700573916 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778513348} + m_GameObject: {fileID: 1700573914} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6346,53 +5397,87 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1778513351 +--- !u!222 &1700573917 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778513348} ---- !u!1 &1778588255 + m_GameObject: {fileID: 1700573914} +--- !u!1 &1748384260 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1778588256} - - component: {fileID: 1778588258} - - component: {fileID: 1778588257} + - component: {fileID: 1748384261} m_Layer: 5 - m_Name: Background + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1748384261 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1748384260} + 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: 912442581} + m_Father: {fileID: 80154622} + m_RootOrder: 2 + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1748578272 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1748578273} + - component: {fileID: 1748578275} + - component: {fileID: 1748578274} + m_Layer: 5 + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1778588256 +--- !u!224 &1748578273 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778588255} + m_GameObject: {fileID: 1748578272} 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: 1613296547} + m_Father: {fileID: 1086177210} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + 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_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1778588257 +--- !u!114 &1748578274 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778588255} + m_GameObject: {fileID: 1748578272} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -6406,7 +5491,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6414,12 +5499,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1778588258 +--- !u!222 &1748578275 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1778588255} + m_GameObject: {fileID: 1748578272} --- !u!1 &1799714401 GameObject: m_ObjectHideFlags: 0 @@ -6641,7 +5726,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124657} + - m_Target: {fileID: 114093195037715096, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} m_MethodName: SetSmoothDelta m_Mode: 0 m_Arguments: @@ -6934,40 +6020,53 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1974270442} ---- !u!1 &2000311254 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2000311255} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2000311255 -RectTransform: +--- !u!1001 &2005407463 +Prefab: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2000311254} - 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: 1057555635} - m_Father: {fileID: 1613296547} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 760059616} + m_Modifications: + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4093320342193112, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114148710568042142, guid: a2bade7ff40ff92409855b062870dccd, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 2116091798} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: a2bade7ff40ff92409855b062870dccd, type: 2} + m_IsPrefabParent: 0 --- !u!1 &2029416511 GameObject: m_ObjectHideFlags: 0 @@ -7037,74 +6136,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2029416511} ---- !u!1 &2046597917 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2046597918} - - component: {fileID: 2046597920} - - component: {fileID: 2046597919} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2046597918 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2046597917} - 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: 1586140521} - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2046597919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2046597917} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &2046597920 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2046597917} --- !u!1 &2051256244 GameObject: m_ObjectHideFlags: 0 @@ -7394,6 +6425,65 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2110189192} +--- !u!1001 &2116091797 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4669229571324224, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 760059615} + - target: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + propertyPath: profile + value: + objectReference: {fileID: 11400000, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 88101aaad380d2446b34d5110becbc5f, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &2116091798 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114785398265965568, guid: 88101aaad380d2446b34d5110becbc5f, + type: 2} + m_PrefabInternal: {fileID: 2116091797} + m_Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} --- !u!1 &2125778041 GameObject: m_ObjectHideFlags: 0 @@ -7472,8 +6562,9 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1413124655} - m_MethodName: set_enabled + - m_Target: {fileID: 114947088938950326, guid: 6f1f4d0a8f3f052419ca9059315d7fe0, + type: 2} + m_MethodName: set_Enabled m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity index da66827609..2db3fe86ff 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -113,111 +113,227 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &233156993 +--- !u!1001 &46687156 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 738960811} m_Modifications: - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchoredPosition.x - value: -310 + value: -36 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchoredPosition.y - value: -450 + value: -36 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_SizeDelta.x - value: 100 + value: 36 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_SizeDelta.y - value: 30 + value: 36 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchorMin.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} m_IsPrefabParent: 0 ---- !u!224 &233156994 stripped +--- !u!224 &46687157 stripped RectTransform: - m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + m_PrefabInternal: {fileID: 46687156} +--- !u!1001 &227962949 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 227962950} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1231868050} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 227962950} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1259161258} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &227962950 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_PrefabInternal: {fileID: 233156993} + m_PrefabInternal: {fileID: 227962949} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} --- !u!1 &413936637 GameObject: m_ObjectHideFlags: 0 @@ -332,9 +448,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 233156994} - - {fileID: 901701467} - - {fileID: 1133301611} + - {fileID: 1206339786} + - {fileID: 1973662772} + - {fileID: 46687157} m_Father: {fileID: 1195535097} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -343,276 +459,10 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &901701466 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 738960811} - m_Modifications: - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -120 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -450 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_SizeDelta.x - value: 160 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_SizeDelta.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_LocalScale.y - value: -1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &901701467 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 901701466} ---- !u!1001 &1133301610 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 738960811} - m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.x - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_SizeDelta.y - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &1133301611 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - m_PrefabInternal: {fileID: 1133301610} --- !u!1 &1195535093 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1728025544836132, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -630,8 +480,7 @@ GameObject: --- !u!114 &1195535094 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114098791981375936, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -647,8 +496,7 @@ MonoBehaviour: --- !u!114 &1195535095 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114602318536220030, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -669,8 +517,7 @@ MonoBehaviour: --- !u!223 &1195535096 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 223496326146193792, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -682,208 +529,141 @@ Canvas: 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 &1195535097 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224795702564069544, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1195535093} - 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: 1231868049} - - {fileID: 1259161260} - - {fileID: 738960811} - 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!1001 &1228100574 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1259161258} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1153961737184912, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1231868050} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1195535097 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1195535093} + 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: 1231868049} + - {fileID: 1259161260} + - {fileID: 738960811} + 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!1001 &1206339785 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 738960811} + m_Modifications: + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: filterMode + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _videoStreamFilter.Format - value: 1 + propertyPath: m_LocalRotation.x + value: -0 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _videoStreamFilter.Stream - value: 2 + propertyPath: m_LocalRotation.y + value: -0 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _videoStreamFilter.Format - value: 5 + propertyPath: m_LocalRotation.z + value: -0 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Stream - value: 2 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].Format - value: 5 + propertyPath: m_RootOrder + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[1].StreamIndex - value: 0 + propertyPath: m_AnchoredPosition.x + value: -310 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 + propertyPath: m_AnchoredPosition.y + value: -450 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 + propertyPath: m_SizeDelta.x + value: 100 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 + propertyPath: m_AnchorMin.x + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _stream - value: 1 + propertyPath: m_AnchorMax.x + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _format + propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _stream - value: 2 + propertyPath: m_Pivot.x + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} - propertyPath: _format - value: 5 + propertyPath: m_Pivot.y + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} m_IsPrefabParent: 0 +--- !u!224 &1206339786 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + type: 2} + m_PrefabInternal: {fileID: 1206339785} --- !u!1 &1231868048 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1766176522647936, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -900,8 +680,7 @@ GameObject: --- !u!224 &1231868049 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224066454319022346, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1231868048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -919,8 +698,7 @@ RectTransform: --- !u!114 &1231868050 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114128863542472070, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1231868048} m_Enabled: 1 @@ -946,15 +724,13 @@ MonoBehaviour: --- !u!222 &1231868051 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222443125154040322, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1231868048} --- !u!1 &1259161257 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1766176522647936, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: @@ -971,8 +747,7 @@ GameObject: --- !u!114 &1259161258 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114128863542472070, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1259161257} m_Enabled: 1 @@ -998,15 +773,13 @@ MonoBehaviour: --- !u!222 &1259161259 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222443125154040322, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1259161257} --- !u!224 &1259161260 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224066454319022346, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1259161257} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1083,3 +856,128 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1973662771 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 738960811} + m_Modifications: + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -120 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -450 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} + m_IsPrefabParent: 0 +--- !u!224 &1973662772 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + m_PrefabInternal: {fileID: 1973662771} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndInfrared.unity b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndInfrared.unity index 12a7aa764a..ddcc48d47a 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndInfrared.unity +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndInfrared.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,10 +116,9 @@ NavMeshSettings: --- !u!1 &86669723 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1766176522647936, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1342166726} - component: {fileID: 86669725} @@ -134,8 +133,7 @@ GameObject: --- !u!114 &86669724 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114128863542472070, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 86669723} m_Enabled: 1 @@ -161,11 +159,10 @@ MonoBehaviour: --- !u!222 &86669725 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222443125154040322, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 86669723} ---- !u!1001 &236803942 +--- !u!1001 &174396256 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -262,21 +259,6 @@ Prefab: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 224523359661619030, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} propertyPath: m_AnchorMin.x @@ -292,130 +274,25 @@ Prefab: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &236803943 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, - type: 2} - m_PrefabInternal: {fileID: 236803942} ---- !u!1001 &240185070 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1160267441} - m_Modifications: - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -310 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -450 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + - target: {fileID: 224514934355301772, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, - type: 2} - propertyPath: m_LocalScale.y - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 27320a2a761fec34f84dbda2f1ec860c, type: 2} m_IsPrefabParent: 0 ---- !u!224 &240185071 stripped +--- !u!224 &308386453 stripped RectTransform: - m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} - m_PrefabInternal: {fileID: 240185070} + m_PrefabInternal: {fileID: 661890051} --- !u!1 &413936637 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 413936642} - component: {fileID: 413936641} @@ -432,34 +309,38 @@ GameObject: --- !u!81 &413936638 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 413936637} m_Enabled: 1 --- !u!124 &413936639 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 413936637} m_Enabled: 1 --- !u!92 &413936640 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 413936637} m_Enabled: 1 --- !u!20 &413936641 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 413936637} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.003921569, g: 0.70980394, b: 0.93333334, a: 1} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -489,7 +370,7 @@ Camera: --- !u!4 &413936642 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 413936637} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -499,12 +380,253 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &661890051 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1160267441} + m_Modifications: + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.x + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.x + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_SizeDelta.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1099465152 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1516936872940088, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width + value: 640 + objectReference: {fileID: 0} + - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 86669724} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture + objectReference: {fileID: 0} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1624455894} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_texture + objectReference: {fileID: 0} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1099465153} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _streamIndex + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: Source + value: + objectReference: {fileID: 1099465153} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _stream + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + propertyPath: _format + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} + m_IsPrefabParent: 0 +--- !u!114 &1099465153 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, + type: 2} + m_PrefabInternal: {fileID: 1099465152} + m_Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} --- !u!1 &1160267440 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1160267441} m_Layer: 5 @@ -517,16 +639,16 @@ GameObject: --- !u!224 &1160267441 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1160267440} 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: 240185071} - - {fileID: 236803943} - - {fileID: 2139790612} + - {fileID: 1789302973} + - {fileID: 1965408097} + - {fileID: 308386453} m_Father: {fileID: 1195535097} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -538,10 +660,9 @@ RectTransform: --- !u!1 &1195535093 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1728025544836132, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1195535097} - component: {fileID: 1195535096} @@ -557,8 +678,7 @@ GameObject: --- !u!114 &1195535094 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114098791981375936, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -574,8 +694,7 @@ MonoBehaviour: --- !u!114 &1195535095 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114602318536220030, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -596,8 +715,7 @@ MonoBehaviour: --- !u!223 &1195535096 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 223496326146193792, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_Enabled: 1 @@ -617,8 +735,7 @@ Canvas: --- !u!224 &1195535097 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224795702564069544, guid: e0bf6d385b3f2254dbe179f28ccbbd15, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1195535093} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -636,166 +753,10 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &1243591747 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4984196648651818, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 86669724} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 1509775526359626, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1624455894} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: textureBinding.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_texture - objectReference: {fileID: 0} - - target: {fileID: 1516936872940088, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Stream - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Format - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Framerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Width - value: 640 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].Height - value: 480 - objectReference: {fileID: 0} - - target: {fileID: 114866818567473902, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: DeviceConfiguration.Profiles.Array.data[2].StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114015623498811666, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: filterMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Stream - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.Format - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _videoStreamFilter.StreamIndex - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114070131009790432, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _stream - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114552477897960758, guid: d2790e271f1a64347bb2ede5601b1e23, - type: 2} - propertyPath: _format - value: 9 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d2790e271f1a64347bb2ede5601b1e23, type: 2} - m_IsPrefabParent: 0 --- !u!224 &1342166726 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224066454319022346, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 86669723} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -813,9 +774,9 @@ RectTransform: --- !u!1 &1538566939 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1538566942} - component: {fileID: 1538566941} @@ -830,7 +791,7 @@ GameObject: --- !u!114 &1538566940 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1538566939} m_Enabled: 1 @@ -848,7 +809,7 @@ MonoBehaviour: --- !u!114 &1538566941 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1538566939} m_Enabled: 1 @@ -862,7 +823,7 @@ MonoBehaviour: --- !u!4 &1538566942 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1538566939} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -875,10 +836,9 @@ Transform: --- !u!1 &1624455893 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1766176522647936, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1785073974} - component: {fileID: 1624455895} @@ -893,8 +853,7 @@ GameObject: --- !u!114 &1624455894 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114128863542472070, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1624455893} m_Enabled: 1 @@ -920,15 +879,14 @@ MonoBehaviour: --- !u!222 &1624455895 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 222443125154040322, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1624455893} + m_CullTransparentMesh: 0 --- !u!224 &1785073974 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 224066454319022346, guid: dc3dac117a12e58408d7c79c1d522420, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1624455893} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -943,128 +901,113 @@ RectTransform: m_AnchoredPosition: {x: 200, y: -300} m_SizeDelta: {x: 320, y: 240} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &2139790611 +--- !u!224 &1789302973 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, + type: 2} + m_PrefabInternal: {fileID: 2132650193} +--- !u!224 &1965408097 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224507834406176654, guid: 27320a2a761fec34f84dbda2f1ec860c, + type: 2} + m_PrefabInternal: {fileID: 174396256} +--- !u!1001 &2132650193 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1160267441} m_Modifications: - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchoredPosition.x - value: -36 + value: -310 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchoredPosition.y - value: -36 + value: -450 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_SizeDelta.x - value: 36 + value: 100 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_SizeDelta.y - value: 36 + value: 30 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchorMin.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, + - target: {fileID: 224095714498738930, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114376069138725616, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 114765321034744640, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: set_enabled - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e0ddc93dc1c324c4da497faef7883f19, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 946d2ca13e1ed944991bdd1374ce6ec0, type: 2} m_IsPrefabParent: 0 ---- !u!224 &2139790612 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224710244561767844, guid: e0ddc93dc1c324c4da497faef7883f19, - type: 2} - m_PrefabInternal: {fileID: 2139790611} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs new file mode 100644 index 0000000000..d8301b126b --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using Intel.RealSense; +using UnityEngine; + +[ProcessingBlockData(typeof(DepthCutoff))] +public class DepthCutoff : RsProcessingBlock +{ + public ushort Distance = 1000; + + ushort[] depthData; + + void OnDisable() + { + depthData = null; + } + + Frame ApplyFilter(DepthFrame depth, FrameSource frameSource) + { + using (var p = depth.Profile) + { + var count = depth.Width * depth.Height; + if (depthData == null || depthData.Length != count) + depthData = new ushort[count]; + + depth.CopyTo(depthData); + + for (int i = 0; i < count; i++) + { + if (depthData[i] > Distance) + depthData[i] = 0; + } + + var v = frameSource.AllocateVideoFrame(p, depth, depth.BitsPerPixel, depth.Width, depth.Height, depth.Stride, Extension.DepthFrame); + v.CopyFrom(depthData); + + return v; + } + } + + public override Frame Process(Frame frame, FrameSource frameSource) + { + if (frame.IsComposite) + { + using (var fs = FrameSet.FromFrame(frame)) + using (var depth = fs.DepthFrame) + { + var v = ApplyFilter(depth, frameSource); + // return v; + + // find and remove the original depth frame + var frames = new List(); + foreach (var f in fs) + { + using (var p1 = f.Profile) + if (p1.Stream == Stream.Depth && p1.Format == Format.Z16) + { + f.Dispose(); + continue; + } + frames.Add(f); + } + frames.Add(v); + + var res = frameSource.AllocateCompositeFrame(frames); + frames.ForEach(f => f.Dispose()); + using (res) + return res.AsFrame(); + } + } + + if (frame is DepthFrame) + return ApplyFilter(frame as DepthFrame, frameSource); + + return frame; + } +} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs.meta similarity index 71% rename from wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs.meta rename to wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs.meta index e64bd55818..8d9e74638d 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/Tests/NewPlayModeTest.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/DepthCutoff.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: a243c9c636ffb794f8231eb55d0ae07a -timeCreated: 1529318909 -licenseType: Pro +guid: e983f300be5296946991080a386e462a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsAlign.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsAlign.cs index db07cfb081..c452894b78 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsAlign.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsAlign.cs @@ -1,68 +1,45 @@ using Intel.RealSense; -using System; -using System.Collections.Generic; +[ProcessingBlockDataAttribute(typeof(Align))] public class RsAlign : RsProcessingBlock { public Stream _alignTo = Stream.Depth; + public bool AlignOtherToDepth { set { _alignTo = Stream.Depth; } } public bool AlignDepthToColor { set { _alignTo = Stream.Color; } } - public bool AlignColorToDepth { set { _alignTo = Stream.Depth; } } + public bool AlignDepthToInfrared { set { _alignTo = Stream.Infrared; } } private Stream _currAlignTo; private Align _pb; - private List _requirments = new List() { Stream.Depth, Stream.Color }; - private object _lock = new object(); - - private Dictionary _profilesIds = new Dictionary(); - - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Multi; } } - - public void Awake() - { - ResetAligner(); - } - - private void ResetAligner() + public void Init() { - if(_pb != null) + if(_pb != null) { _pb.Dispose(); + } _pb = new Align(_alignTo); _currAlignTo = _alignTo; + } - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + void OnDisable() { - lock (_lock) - { - using (var frameset = FrameSet.FromFrame(frame)) - { - using (var depth = frameset.DepthFrame) - using (var color = frameset.ColorFrame) - if (_profilesIds.Count == 0 != !_profilesIds.ContainsValue(color.Profile.UniqueID) || !_profilesIds.ContainsValue(depth.Profile.UniqueID)) - { - ResetAligner(); - _profilesIds[Stream.Depth] = depth.Profile.UniqueID; - _profilesIds[Stream.Color] = color.Profile.UniqueID; - } - return (_enabled ? _pb.Process(frameset, releaser) : frameset).AsFrame(); - } - } + if (_pb != null) + _pb.Dispose(); + _pb = null; } - public override List Requirments() + public void AlignTo(Stream s) { - return _requirments; + _alignTo = s; + Init(); } - public void Update() + public override Frame Process(Frame frame, FrameSource frameSource) { - if (_alignTo == _currAlignTo) - return; - lock (_lock) - { - ResetAligner(); - } + if (_pb == null || _alignTo != _currAlignTo) + Init(); + + return _pb.Process(frame); } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs index 0579bcb676..ea358f2a7c 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs @@ -1,11 +1,10 @@ -using Intel.RealSense; -using System; -using System.Collections.Generic; +using Intel.RealSense; +using UnityEngine; +[ProcessingBlockDataAttribute(typeof(Colorizer))] public class RsColorizer : RsProcessingBlock { - [Serializable] - public enum ColorScheme //TOOD: remove and make more robust using option.ValueDescription + public enum ColorScheme { Jet, Classic, @@ -18,29 +17,89 @@ public class RsColorizer : RsProcessingBlock Pattern } - public ColorScheme colorMap; - private List _requirments = new List() { Stream.Depth }; - private Colorizer _pb = new Colorizer(); + public enum VisualPreset + { + Dynamic = 0, + Fixed = 1, + Near = 2, + Far = 3, + } + + private Colorizer _pb; + + public VisualPreset visualPreset = VisualPreset.Dynamic; + public ColorScheme colorScheme = ColorScheme.Jet; + + public bool histogramEqualization = true; + + [Range(0, 16)] + public float minDist = 0f; + + [Range(0, 16)] + public float maxDist = 6f; + + private IOption presetOption; + private IOption schemeOption; + private IOption histEqOption; + private IOption minDistOption; + private IOption maxDistOption; - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } - public void Awake() + public void Init() { - _pb.Options[Option.ColorScheme].Value = (float)colorMap; + _pb = new Colorizer(); + presetOption = _pb.Options[Option.VisualPreset]; + schemeOption = _pb.Options[Option.ColorScheme]; + histEqOption = _pb.Options[Option.HistogramEqualizationEnabled]; + minDistOption = _pb.Options[Option.MinDistance]; + maxDistOption = _pb.Options[Option.MaxDistance]; } - public override List Requirments() + void OnDisable() { - return _requirments; + if (_pb != null) + { + _pb.Dispose(); + } } - public void Update() + + public override Frame Process(Frame frame, FrameSource frameSource) { - _pb.Options[Option.ColorScheme].Value = (float)colorMap; + if (_pb == null) + { + Init(); + } + + UpdateOptions(); + + return _pb.Process(frame); } - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + private void UpdateOptions() { - return _enabled ? _pb.Colorize(frame as VideoFrame) : frame; + if (presetOption.Value != (float)visualPreset) + { + presetOption.Value = (float)visualPreset; + + colorScheme = (ColorScheme)schemeOption.Value; + histogramEqualization = histEqOption.Value != 0f; + minDist = minDistOption.Value; + maxDist = maxDistOption.Value; + } + else + { + if (schemeOption.Value != (float)colorScheme) + schemeOption.Value = (float)colorScheme; + + if (histEqOption.Value != (float)(histogramEqualization ? 1 : 0)) + histEqOption.Value = (float)(histogramEqualization ? 1 : 0); + + if (minDistOption.Value != minDist) + minDistOption.Value = minDist; + + if (maxDistOption.Value != maxDist) + maxDistOption.Value = maxDist; + } } } \ No newline at end of file diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs.meta index 808cf7ed7e..9a16169903 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsColorizer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c7c85f25773f544c8740f97326ede05 +guid: 70a93f62582029d4aab3757e6e2fcaf2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs index 7ac541fc5c..44cd6e71ea 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs @@ -1,38 +1,65 @@ using Intel.RealSense; -using System.Collections.Generic; using UnityEngine; +[ProcessingBlockDataAttribute(typeof(DecimationFilter))] +[HelpURL("https://github.com/IntelRealSense/librealsense/blob/master/doc/post-processing-filters.md#decimation-filter")] public class RsDecimationFilter : RsProcessingBlock { + public Stream _streamFilter = Stream.Depth; + public Format _formatFilter = Format.Z16; + /// /// Number of filter iterations /// [Range(2, 8)] + [Tooltip("Number of filter iterations")] public int _filterMagnitude = 2; - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } - private List _requirments = new List() { Stream.Depth }; - private DecimationFilter _pb = new DecimationFilter(); + private DecimationFilter _pb; + private IOption filterMag; + private IOption streamFilter; + private IOption formatFilter; - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + public override Frame Process(Frame frame, FrameSource frameSource) { - return _enabled ? _pb.ApplyFilter(frame as VideoFrame) : frame; + if (_pb == null) + { + Init(); + } + + UpdateOptions(); + + return _pb.Process(frame); } - public override List Requirments() + public void Init() { - return _requirments; + _pb = new DecimationFilter(); + filterMag = _pb.Options[Option.FilterMagnitude]; + streamFilter = _pb.Options[Option.StreamFilter]; + formatFilter = _pb.Options[Option.StreamFormatFilter]; } - public void Update() + void OnDisable() { - _pb.Options[Option.FilterMagnitude].Value = _filterMagnitude; + if (_pb != null) + { + _pb.Dispose(); + _pb = null; + } } public void SetMagnitude(float val) { _filterMagnitude = (int)val; } + + private void UpdateOptions() + { + filterMag.Value = _filterMagnitude; + streamFilter.Value = (float)_streamFilter; + formatFilter.Value = (float)_formatFilter; + } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs.meta index ee4d76e84a..8dc0d0e48a 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDecimationFilter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45103df07b2af6c42911fb1ecce0c394 +guid: ab8658da5fac1924385546d4cfccbea4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs deleted file mode 100644 index 2e962682cc..0000000000 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDepthPrecision.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Intel.RealSense; -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using UnityEngine; - -public class RsDepthPrecision : RsProcessingBlock -{ - [Range(0, 15)] - public int _depthResolution = 0; - - private List _requirments = new List() { Stream.Depth }; - - private short[] _pixels; - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } - - private int _uniqueID { get; set; } - - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) - { - if (!_enabled) - return frame; - var org = frame as VideoFrame; - var stride = org.Width * org.BitsPerPixel / 8; - var newFrame = frameSource.AllocateVideoFrame(org.Profile, org, org.BitsPerPixel, org.Width, org.Height, stride, Extension.DepthFrame); - - if (_pixels == null || org.Profile.UniqueID != _uniqueID) - InitPixels(org); - Marshal.Copy(org.Data, _pixels, 0, _pixels.Length); - for (int i = 0; i < _pixels.Length; i++) - { - _pixels[i] = (short)(_pixels[i] >> _depthResolution); - _pixels[i] = (short)(_pixels[i] << _depthResolution); - } - Marshal.Copy(_pixels, 0, newFrame.Data, _pixels.Length); - return newFrame; - } - - private void InitPixels(VideoFrame frame) - { - _uniqueID = frame.Profile.UniqueID; - _pixels = new short[frame.Width * frame.Height]; - } - - public override List Requirments() - { - return _requirments; - } - - public void SetResolution(float val) - { - _depthResolution = (int)val; - } -} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs new file mode 100644 index 0000000000..902da98a81 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs @@ -0,0 +1,60 @@ +using Intel.RealSense; +using UnityEngine; + +[ProcessingBlockDataAttribute(typeof(DisparityTransform))] +public class RsDisparityTransform : RsProcessingBlock +{ + public enum DisparityMode + { + DisparityToDepth = 0, + DepthToDisparity = 1, + } + + DisparityTransform _pb; + + [Tooltip("Stereoscopic Transformation Mode")] + public DisparityMode Mode = DisparityMode.DepthToDisparity; + + private DisparityMode currMode; + private readonly object _lock = new object(); + + void OnDisable() + { + lock (_lock) + { + if (_pb != null) + { + _pb.Dispose(); + _pb = null; + } + } + } + + public void Init() + { + lock (_lock) + { + _pb = new DisparityTransform(Mode != 0); + currMode = Mode; + } + } + + public override Frame Process(Frame frame, FrameSource frameSource) + { + lock (_lock) + { + if (currMode != Mode) { + if(_pb != null) { + _pb.Dispose(); + _pb = null; + } + } + + if (_pb == null) + Init(); + + return _pb.Process(frame); + } + } +} + diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs.meta similarity index 71% rename from wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs.meta rename to wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs.meta index 38eaf01041..6cdb5dda5c 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Editor/DefaultStreamPropertyDrawer.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsDisparityTransform.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 449f471c51c81384ea3a799f9f86122c -timeCreated: 1529925802 -licenseType: Pro +guid: 18bce048bd313fc40b6eb0a08d7f83ab MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs index e644ac8305..80b4fbb09e 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs @@ -1,41 +1,60 @@ using Intel.RealSense; -using System.Collections.Generic; using UnityEngine; +[ProcessingBlockDataAttribute(typeof(HoleFillingFilter))] +[HelpURL("https://github.com/IntelRealSense/librealsense/blob/master/doc/post-processing-filters.md#hole-filling-filter")] public class RsHoleFillingFilter : RsProcessingBlock { - /// - /// Control the data that will be used to fill the invalid pixels - /// [0-2] enumerated: - /// fill_from_left - Use the value from the left neighbor pixel to fill the hole - /// farest_from_around - Use the value from the neighboring pixel which is furthest away from the sensor - /// nearest_from_around - - Use the value from the neighboring pixel closest to the sensor + /// + /// Control the data that will be used to fill the invalid pixels public enum HoleFillingMode + /// [0-2] enumerated: + /// fill_from_left - Use the value from the left neighbor pixel to fill the hole + /// farest_from_around - Use the value from the neighboring pixel which is furthest away from the sensor + /// nearest_from_around - - Use the value from the neighboring pixel closest to the sensor /// - [Range(0, 2)] - public int _holesFill = 0; + public enum HoleFillingMode + { + FillFromLeft = 0, + FarestFromAround = 1, + NearestFromAround = 2, + } - private List _requirments = new List() { Stream.Depth }; - private HoleFillingFilter _pb = new HoleFillingFilter(); + public HoleFillingMode _holesFill = HoleFillingMode.FillFromLeft; - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } + private HoleFillingFilter _pb; + private IOption holeFillOption; - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + public void Init() { - return _enabled ? _pb.ApplyFilter(frame as VideoFrame) : frame; + _pb = new HoleFillingFilter(); + holeFillOption = _pb.Options[Option.HolesFill]; } - public override List Requirments() + void OnDisable() { - return _requirments; + if (_pb != null) + _pb.Dispose(); } - public void Update() + public override Frame Process(Frame frame, FrameSource frameSource) { - _pb.Options[Option.HolesFill].Value = _holesFill; + if (_pb == null) + { + Init(); + } + + UpdateOptions(); + + return _pb.Process(frame); } public void SetHoleFill(float val) { - _holesFill = (int)val; + _holesFill = (HoleFillingMode)val; + } + + private void UpdateOptions() + { + holeFillOption.Value = (float)_holesFill; } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs.meta index cdbdc0c9d8..d0e454820f 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5682605caa58bff4fb904f0231347097 +guid: a370b019fb25fbe4384bc45033197fcd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs index cafaa011e9..ba2fe28de4 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs @@ -1,68 +1,71 @@ -using Intel.RealSense; -using System; -using System.Collections.Generic; +using Intel.RealSense; +[ProcessingBlockDataAttribute(typeof(PointCloud))] public class RsPointCloud : RsProcessingBlock { - public Stream _textureStream = Stream.Color; - - private PointCloud _pb; - private List _requirments = new List() { Stream.Depth }; + public enum OcclusionRemoval + { + Off = 0, + Heuristic = 1, + Exhaustive = 2 + } - private object _lock = new object(); + public Stream TextureStream = Stream.Color; + public Format TextureFormat = Format.Any; + public OcclusionRemoval _occlusionRemoval = OcclusionRemoval.Off; - private Dictionary _videoStreamFilter = new Dictionary(); - private Dictionary _currVideoStreamFilter = new Dictionary(); + PointCloud _pb; + private IOption filterMag; + private IOption streamFilter; + private IOption formatFilter; - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Multi; } } + private readonly object _lock = new object(); - public void Awake() + public void Init() { - ResetProcessingBlock(); - foreach(Stream stream in Enum.GetValues(typeof(Stream))) + lock (_lock) { - _videoStreamFilter[stream] = new RsVideoStreamRequest(); + _pb = new PointCloud(); + filterMag = _pb.Options[Option.FilterMagnitude]; + streamFilter = _pb.Options[Option.StreamFilter]; + formatFilter = _pb.Options[Option.StreamFormatFilter]; } } - private void ResetProcessingBlock() + void OnDisable() { - if (_pb != null) - _pb.Dispose(); - _pb = new PointCloud(); + lock (_lock) + { + if (_pb != null) + { + _pb.Dispose(); + _pb = null; + } + } } - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + public override Frame Process(Frame frame, FrameSource frameSource) { lock (_lock) { - using (var frameset = FrameSet.FromFrame(frame)) + if (_pb == null) { - using (var depth = frameset.DepthFrame) - { - using (var texture = frameset.FirstOrDefault(_textureStream)) - { - _videoStreamFilter[depth.Profile.Stream].CopyProfile(depth); - _videoStreamFilter[texture.Profile.Stream].CopyProfile(texture); - if (_currVideoStreamFilter.Count == 0 || - !_currVideoStreamFilter[depth.Profile.Stream].Equals(_videoStreamFilter[depth.Profile.Stream]) || - !_currVideoStreamFilter[texture.Profile.Stream].Equals(_videoStreamFilter[texture.Profile.Stream])) - { - ResetProcessingBlock(); - _currVideoStreamFilter[depth.Profile.Stream] = new RsVideoStreamRequest(depth); - _currVideoStreamFilter[texture.Profile.Stream] = new RsVideoStreamRequest(texture); - } - var points = _pb.Calculate(depth, releaser); - _pb.MapTexture(texture); - return frameSource.AllocateCompositeFrame(releaser, depth, points).AsFrame(); - } - } + Init(); } } + + UpdateOptions(frame.IsComposite); + + return _pb.Process(frame); } - public override List Requirments() + private void UpdateOptions(bool isComposite) { - return _requirments; + filterMag.Value = (float)_occlusionRemoval; + if (isComposite) + { + streamFilter.Value = (float)TextureStream; + formatFilter.Value = (float)TextureFormat; + } } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs.meta index 7d4c4b09f9..c1a0fcb874 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsPointCloud.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ab94c438ce58954b8f8731e229cf3ec +guid: 949c0815228b7334a89a9b09ff0c7fdb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs new file mode 100644 index 0000000000..945fb9984b --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu] +public class RsProcessingProfile : ScriptableObject, IEnumerable +{ + // [HideInInspector] + [SerializeField] + public List _processingBlocks; + + public IEnumerator GetEnumerator() + { + return _processingBlocks.GetEnumerator() as IEnumerator; + } + + IEnumerator IEnumerable.GetEnumerator() + { + return _processingBlocks.GetEnumerator(); + } + + +#if UNITY_EDITOR + void Reset() + { + + var obj = new UnityEditor.SerializedObject(this); + obj.Update(); + + var blocks = obj.FindProperty("_processingBlocks"); + blocks.ClearArray(); + + var p = UnityEditor.AssetDatabase.GetAssetPath(this); + var bl = UnityEditor.AssetDatabase.LoadAllAssetsAtPath(p); + foreach (var a in bl) + { + if (a == this) + continue; + // Debug.Log(a, a); + // DestroyImmediate(a, true); + int i = blocks.arraySize++; + var e = blocks.GetArrayElementAtIndex(i); + e.objectReferenceValue = a; + } + + obj.ApplyModifiedProperties(); + // UnityEditor.EditorUtility.SetDirty(this); + UnityEditor.AssetDatabase.SaveAssets(); + + } +#endif +} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs.meta new file mode 100644 index 0000000000..426406f26d --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsProcessingProfile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 475d71c97716db644863efe7bddfbd70 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs index ef79baf84b..df8ded190a 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs @@ -1,55 +1,83 @@ -using Intel.RealSense; -using System.Collections.Generic; +using Intel.RealSense; using UnityEngine; +[ProcessingBlockDataAttribute(typeof(SpatialFilter))] +[HelpURL("https://github.com/IntelRealSense/librealsense/blob/master/doc/post-processing-filters.md#spatial-filter")] public class RsSpatialFilter : RsProcessingBlock { /// /// Number of filter iterations /// [Range(1, 5)] + [Tooltip("Number of filter iterations")] public int _filterMagnitude = 2; /// /// The Alpha factor in an exponential moving average with Alpha=1 - no filter . Alpha = 0 - infinite filter /// [Range(0.25f, 1)] + [Tooltip("The Alpha factor in an exponential moving average with Alpha=1 - no filter . Alpha = 0 - infinite filter")] public float _filterSmoothAlpha = 0.5f; /// /// Step-size boundary. Establishes the threshold used to preserve "edges" /// [Range(1, 50)] + [Tooltip("Step-size boundary. Establishes the threshold used to preserve edges")] public int _filterSmoothDelta = 20; + public enum HoleFillingMode + { + Disabled, + HoleFill2PixelRadius, + HoleFill4PixelRadius, + HoleFill8PixelRadius, + HoleFill16PixelRadius, + Unlimited, + } + /// /// An in-place heuristic symmetric hole-filling mode applied horizontally during the filter passes. - /// Intended to rectify minor artefacts with minimal performance impact + /// Intended to rectify minor artifacts with minimal performance impact /// - [Range(0, 5)] - public int _holesFill = 0; + public HoleFillingMode _holeFillingMode = 0; - private List _requirments = new List() { Stream.Depth }; - private SpatialFilter _pb = new SpatialFilter(); - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } + private SpatialFilter _pb; + private IOption filterMag; + private IOption filterAlpha; + private IOption filterDelta; + private IOption holeFill; - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + public override Frame Process(Frame frame, FrameSource frameSource) { - return _enabled ? _pb.ApplyFilter(frame as VideoFrame) : frame; + if (_pb == null) + { + Init(); + } + + UpdateOptions(); + + return _pb.Process(frame); } - public override List Requirments() + public void Init() { - return _requirments; + _pb = new SpatialFilter(); + + filterMag = _pb.Options[Option.FilterMagnitude]; + filterAlpha = _pb.Options[Option.FilterSmoothAlpha]; + filterDelta = _pb.Options[Option.FilterSmoothDelta]; + holeFill = _pb.Options[Option.HolesFill]; } - public void Update() + void OnDisable() { - _pb.Options[Option.FilterMagnitude].Value = _filterMagnitude; - _pb.Options[Option.FilterSmoothAlpha].Value = _filterSmoothAlpha; - _pb.Options[Option.FilterSmoothDelta].Value = _filterSmoothDelta; - _pb.Options[Option.HolesFill].Value = _holesFill; + if (_pb != null) + { + _pb.Dispose(); + _pb = null; + } } public void SetMagnitude(float val) @@ -69,6 +97,15 @@ public void SetSmoothDelta(float val) public void SetHolesFill(float val) { - _holesFill = (int)val; + _holeFillingMode = (HoleFillingMode)val; + } + + private void UpdateOptions() + { + filterMag.Value = _filterMagnitude; + filterAlpha.Value = _filterSmoothAlpha; + filterDelta.Value = _filterSmoothDelta; + holeFill.Value = (float)_holeFillingMode; } } + diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs.meta index 86055a0f02..2078c5be2e 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f09640427e9920f43ba2dc134aed8bde +guid: 48f1a4dc738fa514aa5e5d4cc3665aae MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs index 40b9f258b0..0adce769a0 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs @@ -1,9 +1,13 @@ using Intel.RealSense; using System.Collections.Generic; +using System.Linq; using UnityEngine; +[ProcessingBlockDataAttribute(typeof(TemporalFilter))] +[HelpURL("https://github.com/IntelRealSense/librealsense/blob/master/doc/post-processing-filters.md#temporal-filter")] public class RsTemporalFilter : RsProcessingBlock { + /// /// The Alpha factor in an exponential moving average with Alpha=1 - no filter . Alpha = 0 - infinite filter /// @@ -31,26 +35,39 @@ public class RsTemporalFilter : RsProcessingBlock [Range(0, 8)] public int _temporalPersistence = 3; - private List _requirments = new List() { Stream.Depth }; - private TemporalFilter _pb = new TemporalFilter(); - - public override ProcessingBlockType ProcessingType { get { return ProcessingBlockType.Single; } } + private TemporalFilter _pb; + private IOption filterAlphaOpt; + private IOption filterDeltaOpt; + private IOption holesFillOpt; - public override Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser) + public override Frame Process(Frame frame, FrameSource frameSource) { - return _enabled ? _pb.ApplyFilter(frame as VideoFrame) : frame; + if (_pb == null) + { + Init(); + } + + UpdateOptions(); + + return _pb.Process(frame); } - public override List Requirments() + public void Init() { - return _requirments; + _pb = new TemporalFilter(); + + filterAlphaOpt = _pb.Options[Option.FilterSmoothAlpha]; + filterDeltaOpt = _pb.Options[Option.FilterSmoothDelta]; + holesFillOpt = _pb.Options[Option.HolesFill]; } - public void Update() + void OnDisable() { - _pb.Options[Option.FilterSmoothAlpha].Value = _filterSmoothAlpha; - _pb.Options[Option.FilterSmoothDelta].Value = _filterSmoothDelta; - _pb.Options[Option.HolesFill].Value = _temporalPersistence; + if (_pb != null) + { + _pb.Dispose(); + _pb = null; + } } public void SetSmoothAlpha(float val) @@ -67,4 +84,12 @@ public void SetTemporalPersistence(float val) { _temporalPersistence = (int)val; } + + private void UpdateOptions() + { + filterAlphaOpt.Value = _filterSmoothAlpha; + filterDeltaOpt.Value = _filterSmoothDelta; + holesFillOpt.Value = _temporalPersistence; + } } + diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs.meta index 1c2c2b7cc5..fd3c7045f0 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsTemporalFilter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 230cf074ab7534243bf62887095e6fcd +guid: bec95ba2af23efd408d33138086f1c65 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsARBackgroundRenderer.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsARBackgroundRenderer.cs index 08c89d5b14..5704741619 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsARBackgroundRenderer.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsARBackgroundRenderer.cs @@ -8,6 +8,7 @@ public class RsARBackgroundRenderer : MonoBehaviour { + public RsFrameProvider Source; public Material material; private Camera cam; private ARBackgroundRenderer bg; @@ -18,9 +19,9 @@ public class RsARBackgroundRenderer : MonoBehaviour IEnumerator Start() { - yield return new WaitUntil(() => RsDevice.Instance.Streaming); + yield return new WaitUntil(() => Source && Source.Streaming); - using (var profile = RsDevice.Instance.ActiveProfile.GetStream(Stream.Color) as VideoStreamProfile) + using (var profile = Source.ActiveProfile.GetStream(Stream.Color) as VideoStreamProfile) { intrinsics = profile.GetIntrinsics(); } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDevice.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDevice.cs index ad3e66512a..23e78acd95 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDevice.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDevice.cs @@ -12,10 +12,10 @@ /// Manages streaming using a RealSense Device /// [HelpURL("https://github.com/IntelRealSense/librealsense/tree/master/wrappers/unity")] -public class RsDevice : MonoBehaviour +public class RsDevice : RsFrameProvider { /// - /// The Paralllism mode of the module + /// The parallelism mode of the module /// public enum ProcessMode { @@ -23,40 +23,30 @@ public enum ProcessMode UnityThread, } - public static RsDevice Instance { get; private set; } + // public static RsDevice Instance { get; private set; } /// - /// Threading mode of operation, Multithreasds or Unitythread + /// Threading mode of operation, Multithread or UnityThread /// [Tooltip("Threading mode of operation, Multithreads or Unitythread")] public ProcessMode processMode; - public bool Streaming { get; private set; } + // public bool Streaming { get; private set; } /// /// Notifies upon streaming start /// - public event Action OnStart; + public override event Action OnStart; /// /// Notifies when streaming has stopped /// - public event Action OnStop; + public override event Action OnStop; /// /// Fired when a new frame is available /// - public event Action OnNewSample; - - /// - /// Fired when a new time-synchronized frame set is available - /// - public event Action OnNewSampleSet; - - /// - /// Provides access to the current pipeline profiles in use by the Manager - /// - public PipelineProfile ActiveProfile { get; private set; } //TODO: Make private and have other classes register OnStart and use that profile. + public override event Action OnNewSample; /// /// User configuration @@ -74,50 +64,17 @@ public enum ProcessMode private Thread worker; private readonly AutoResetEvent stopEvent = new AutoResetEvent(false); - private Pipeline m_pipeline; - public RsProcessingPipe _processingPipe; - - void Awake() - { - if (Instance != null && Instance != this) - throw new Exception(string.Format("{0} singleton already instanced", this.GetType())); - Instance = this; - } - void OnEnable() { m_pipeline = new Pipeline(); using (var cfg = DeviceConfiguration.ToPipelineConfig()) - { ActiveProfile = m_pipeline.Start(cfg); - } using (var activeStreams = ActiveProfile.Streams) - { - DeviceConfiguration.Profiles = new RsVideoStreamRequest[activeStreams.Count]; - for (int i = 0; i < DeviceConfiguration.Profiles.Length; i++) - { - var s = activeStreams[i]; - var p = new RsVideoStreamRequest() - { - Stream = s.Stream, - Format = s.Format, - Framerate = s.Framerate, - StreamIndex = s.Index, - }; - var vs = s as VideoStreamProfile; - if (vs != null) - { - p.Width = vs.Width; - p.Height = vs.Height; - } - DeviceConfiguration.Profiles[i] = p; - } - } - + DeviceConfiguration.Profiles = activeStreams.Select(RsVideoStreamRequest.FromProfile).ToArray(); if (processMode == ProcessMode.Multithread) { @@ -141,7 +98,7 @@ IEnumerator WaitAndStart() void OnDisable() { OnNewSample = null; - OnNewSampleSet = null; + // OnNewSampleSet = null; if (worker != null) { @@ -171,35 +128,22 @@ void OnDisable() void OnDestroy() { - OnStart = null; + // OnStart = null; OnStop = null; if (m_pipeline != null) m_pipeline.Release(); m_pipeline = null; - Instance = null; + // Instance = null; } - /// - /// Handles the current frame - /// - /// The frame instance - private void HandleFrame(Frame frame) + private void RaiseSampleEvent(Frame frame) { - var s = OnNewSample; - if (s != null) + var onNewSample = OnNewSample; + if (onNewSample != null) { - s(frame); - } - } - - private void HandleFrameSet(FrameSet frames) - { - var s = OnNewSampleSet; - if (s != null) - { - s(frames); + onNewSample(frame); } } @@ -211,9 +155,8 @@ private void WaitForFrames() while (!stopEvent.WaitOne(0)) { using (var frames = m_pipeline.WaitForFrames()) - { - OnNewFrameSet(frames); - } + using (var frame = frames.AsFrame()) + RaiseSampleEvent(frame); } } @@ -229,33 +172,11 @@ void Update() if (m_pipeline.PollForFrames(out frames)) { using (frames) + using (var frame = frames.AsFrame()) { - OnNewFrameSet(frames); - } - } - } - - private void OnNewFrameSet(FrameSet frames) - { - if (_processingPipe != null) - _block.ProcessFrames(frames); - else - { - HandleFrameSet(frames); - foreach (var fr in frames) - { - using (fr) - HandleFrame(fr); + RaiseSampleEvent(frame); } } } - private CustomProcessingBlock _block = new CustomProcessingBlock((f1, src) => - { - using (var releaser = new FramesReleaser()) - { - var frames = FrameSet.FromFrame(f1, releaser); - Instance._processingPipe.ProcessFrames(frames, src, releaser, Instance.HandleFrame, Instance.HandleFrameSet); - } - }); } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDeviceInspector.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDeviceInspector.cs index ffd327acc3..9b2b276132 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDeviceInspector.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDeviceInspector.cs @@ -7,11 +7,13 @@ public class RsDeviceInspector : MonoBehaviour { + RsDevice rsdevice; + public bool streaming; public Device device; public StreamProfileList streams; public readonly Dictionary sensors = new Dictionary(); - public readonly Dictionary> sensorOptions = new Dictionary>(); + public readonly Dictionary> sensorOptions = new Dictionary>(); void Awake() { @@ -20,12 +22,12 @@ void Awake() private IEnumerator WaitForDevice() { - yield return new WaitUntil(() => RsDevice.Instance != null); - RsDevice.Instance.OnStart += onStartStreaming; - RsDevice.Instance.OnStop += onStopStreaming; + yield return new WaitUntil(() => (rsdevice = GetComponent()) != null); + // rsdevice.OnStart += onStartStreaming; + rsdevice.OnStop += onStopStreaming; - if(RsDevice.Instance.Streaming) - onStartStreaming(RsDevice.Instance.ActiveProfile); + if(rsdevice.Streaming) + onStartStreaming(rsdevice.ActiveProfile); } private void onStopStreaming() diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs new file mode 100644 index 0000000000..7a0fdeaa85 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Intel.RealSense; +using UnityEngine; + +public abstract class RsFrameProvider : MonoBehaviour +{ + public bool Streaming { get; protected set; } + public PipelineProfile ActiveProfile { get; protected set; } + + public abstract event Action OnStart; + public abstract event Action OnStop; + public abstract event Action OnNewSample; +} + diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs.meta new file mode 100644 index 0000000000..ae6aeeff56 --- /dev/null +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsFrameProvider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6caf2ea652951d746a5a652951fda456 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPointCloudRenderer.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPointCloudRenderer.cs index ea0474686a..1cae0fe127 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPointCloudRenderer.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPointCloudRenderer.cs @@ -6,39 +6,42 @@ using System.Runtime.InteropServices; using System.Threading; using System.Collections.Generic; +using System.Linq; [RequireComponent(typeof(MeshFilter), typeof(MeshRenderer))] public class RsPointCloudRenderer : MonoBehaviour { + public RsFrameProvider Source; private Mesh mesh; private Texture2D uvmap; - private RsVideoStreamRequest _videoStreamFilter; - private RsVideoStreamRequest _currVideoStreamFilter; - + [NonSerialized] private Vector3[] vertices; private GCHandle handle; private IntPtr verticesPtr; - private int frameSize; - private IntPtr frameData; + // private int frameSize; + // private IntPtr frameData; - private readonly AutoResetEvent e = new AutoResetEvent(false); + FrameQueue q; void Start() { - _videoStreamFilter = new RsVideoStreamRequest(); - _currVideoStreamFilter = _videoStreamFilter.Clone(); - RsDevice.Instance.OnNewSampleSet += OnFrames; - RsDevice.Instance.OnStop += Dispose; + Source.OnStart += OnStartStreaming; + Source.OnStop += Dispose; + } + + private void OnStartStreaming(PipelineProfile obj) + { + q = new FrameQueue(1); + + using (var depth = obj.Streams.FirstOrDefault(s => s.Stream == Stream.Depth) as VideoStreamProfile) + ResetMesh(depth.Width, depth.Height); + + Source.OnNewSample += OnNewSample; } - private void ResetMesh(RsVideoStreamRequest vsr) + private void ResetMesh(int width, int height) { - int width = vsr.Width; - int height = vsr.Height; - if (width == 0 || height == 0) - return; - Dispose(); Assert.IsTrue(SystemInfo.SupportsTextureFormat(TextureFormat.RGFloat)); uvmap = new Texture2D(width, height, TextureFormat.RGFloat, false, true) { @@ -56,6 +59,8 @@ private void ResetMesh(RsVideoStreamRequest vsr) }; vertices = new Vector3[width * height]; + if (handle.IsAllocated) + handle.Free(); handle = GCHandle.Alloc(vertices, GCHandleType.Pinned); verticesPtr = handle.AddrOfPinnedObject(); @@ -83,29 +88,35 @@ private void ResetMesh(RsVideoStreamRequest vsr) mesh.bounds = new Bounds(Vector3.zero, Vector3.one * 10f); GetComponent().sharedMesh = mesh; - _currVideoStreamFilter = vsr.Clone(); } void OnDestroy() { - Dispose(); + if (q != null) + { + q.Dispose(); + q = null; + } - if(mesh != null) + if (handle.IsAllocated) + handle.Free(); + + if (mesh != null) Destroy(null); } private void Dispose() { - e.Reset(); - - if (handle.IsAllocated) - handle.Free(); + Source.OnNewSample -= OnNewSample; - if (frameData != IntPtr.Zero) + if (q != null) { - Marshal.FreeHGlobal(frameData); - frameData = IntPtr.Zero; + q.Dispose(); + q = null; } + + if (handle.IsAllocated) + handle.Free(); } private Points TryGetPoints(FrameSet frameset) @@ -119,49 +130,70 @@ private Points TryGetPoints(FrameSet frameset) return null; } - private void OnFrames(FrameSet frames) + private void OnNewSample(Frame frame) { - using (var points = TryGetPoints(frames)) + try { - if (points == null) - return; - - using (var depth = frames.DepthFrame) + if (frame.IsComposite) { - if (_currVideoStreamFilter.Width != depth.Width || _currVideoStreamFilter.Height != depth.Height) + using (var fs = FrameSet.FromFrame(frame)) + using (var points = TryGetPoints(fs)) { - _videoStreamFilter.Width = depth.Width; - _videoStreamFilter.Height = depth.Height; - return; + if (points != null) + { + q.Enqueue(points); + } } + return; } - memcpy(verticesPtr, points.VertexData, points.Count * 3 * sizeof(float)); - - frameSize = points.Count * 2 * sizeof(float); - if (frameData == IntPtr.Zero) - frameData = Marshal.AllocHGlobal(frameSize); - memcpy(frameData, points.TextureData, frameSize); - - e.Set(); + if (frame is Points) + { + q.Enqueue(frame); + } + } + catch (Exception e) + { + Debug.LogException(e); } } + protected void Update() { - if (!_videoStreamFilter.Equals(_currVideoStreamFilter)) - ResetMesh(_videoStreamFilter); - - if (e.WaitOne(0)) + if (q != null) { - uvmap.LoadRawTextureData(frameData, frameSize); - uvmap.Apply(); + Frame f; + if (!q.PollForFrame(out f)) + return; + + using (var points = f as Points) + { + if (points.Count != mesh.vertexCount) + { + using (var p = f.Profile as VideoStreamProfile) + ResetMesh(p.Width, p.Height); + } + + int s = points.Count * sizeof(float); + + if (points.TextureData != IntPtr.Zero) + { + uvmap.LoadRawTextureData(points.TextureData, s * 2); + uvmap.Apply(); + } - mesh.vertices = vertices; - mesh.UploadMeshData(false); + if (points.VertexData != IntPtr.Zero) + { + memcpy(verticesPtr, points.VertexData, s * 3); + + mesh.vertices = vertices; + mesh.UploadMeshData(false); + } + } } } - + [DllImport("msvcrt.dll", EntryPoint = "memcpy", CallingConvention = CallingConvention.Cdecl, SetLastError = false)] internal static extern IntPtr memcpy(IntPtr dest, IntPtr src, int count); } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs index 9236f79c2a..918bfb02c1 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs @@ -2,85 +2,44 @@ using System.Collections.Generic; using UnityEngine; using Intel.RealSense; +using System.Linq; -[Serializable] -public enum ProcessingBlockType +public interface IProcessingBlock { - Single, - Multi + Frame Process(Frame frame, FrameSource frameSource); } [Serializable] -public abstract class RsProcessingBlock : MonoBehaviour +public abstract class RsProcessingBlock : ScriptableObject, IProcessingBlock { - private RsProcessingPipe _processingPipe; - - protected bool _enabled = false; - public int _order = 0; - public bool _fork = false; - - public bool Enabled { get { return _enabled; } } - public int Order { get { return _order; } } - - public abstract ProcessingBlockType ProcessingType { get; } - - public abstract Frame Process(Frame frame, FrameSource frameSource, FramesReleaser releaser); - public abstract List Requirments(); - - public bool Fork() { return _fork; } - - public void Start() - { - ChangeState(true); - } - - public void OnEnable() - { - ChangeState(true); - } - - public void OnDisable() - { - ChangeState(false); - } + public bool enabled = true; - private void ChangeState(bool state) + public bool Enabled { - _enabled = state; - if(_processingPipe == null) - _processingPipe = GetComponent(); - if (_processingPipe == null) + get { - Debug.LogWarning(this.name + " is not binded to a processing pipe"); - return; + return enabled; } - if (state) - _processingPipe.AddProcessingBlock(this); - else - _processingPipe.RemoveProcessingBlock(this); - } - public bool CanProcess(Frame frame) - { - if(ProcessingType == ProcessingBlockType.Single) - return Requirments().Contains(frame.Profile.Stream); - - using (var frameset = FrameSet.FromFrame(frame)) + set { - List streams = new List(); + enabled = value; + } + } - foreach (var f in frameset) - { - using (f) - streams.Add(f.Profile.Stream); - } + public abstract Frame Process(Frame frame, FrameSource frameSource); - foreach (var s in Requirments()) - { - if (!streams.Contains(s)) - return false; - } - return true; - } + public virtual void Reset() + { + this.name = GetType().Name; + +#if UNITY_EDITOR + var p = UnityEditor.AssetDatabase.GetAssetPath(this); + Debug.Log(p); + var names = UnityEditor.AssetDatabase.LoadAllAssetsAtPath(p).Where(a => a).Select(a => a.name).ToList(); + names.Remove(GetType().Name); + this.name = UnityEditor.ObjectNames.GetUniqueName(names.ToArray(), GetType().Name); + UnityEditor.AssetDatabase.SaveAssets(); +#endif } } \ No newline at end of file diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs.meta b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs.meta index 32a3d18194..26db45d2d8 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs.meta +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12f4d4f79cd84404488df5a6149daef8 +guid: b9dc4a1f64f1a634aa8eb936c625da84 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingPipe.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingPipe.cs index e9529204bb..17e4c8a193 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingPipe.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingPipe.cs @@ -1,114 +1,113 @@ using Intel.RealSense; using System; +using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Threading; using UnityEngine; -[Serializable] -public class RsProcessingPipe : MonoBehaviour { - - public HashSet _processingBlocks = new HashSet(); +[System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)] +public sealed class ProcessingBlockDataAttribute : System.Attribute +{ + // See the attribute guidelines at + // http://go.microsoft.com/fwlink/?LinkId=85236 + public readonly Type blockClass; - public void AddProcessingBlock(RsProcessingBlock processingBlock) - { - _processingBlocks.Add(processingBlock); - } - public void RemoveProcessingBlock(RsProcessingBlock processingBlock) + public ProcessingBlockDataAttribute(Type blockClass) { - _processingBlocks.Remove(processingBlock); + this.blockClass = blockClass; } - internal void ProcessFrames(FrameSet frames, FrameSource src, FramesReleaser releaser, Action handleFrame, Action handleFrameSet) - { - var pbs = _processingBlocks.OrderBy(i => i.Order).Where(i => i.Enabled).ToList(); - foreach (var vpb in pbs) - { - FrameSet processedFrames = frames; - switch (vpb.ProcessingType) - { - case ProcessingBlockType.Single: - processedFrames = HandleSingleFrameProcessingBlocks(frames, src, releaser, vpb, handleFrame); - break; - case ProcessingBlockType.Multi: - processedFrames = HandleMultiFramesProcessingBlocks(frames, src, releaser, vpb, handleFrameSet); - break; - } - frames = processedFrames; - } +} - handleFrameSet(frames); - foreach (var fr in frames) - { - using (fr) - handleFrame(fr); - } - } - private Frame ApplyFilter(Frame frame, FrameSource frameSource, FramesReleaser framesReleaser, RsProcessingBlock vpb, Action handleFrame) +[Serializable] +public class RsProcessingPipe : RsFrameProvider +{ + public RsFrameProvider Source; + public RsProcessingProfile profile; + public override event Action OnStart; + public override event Action OnStop; + public override event Action OnNewSample; + private CustomProcessingBlock _block; + + void Awake() { - if (!vpb.CanProcess(frame)) - return frame; + Source.OnStart += OnSourceStart; + Source.OnStop += OnSourceStop; - // run the processing block. - var processedFrame = vpb.Process(frame, frameSource, framesReleaser); + _block = new CustomProcessingBlock(ProcessFrame); + _block.Start(OnFrame); + } - // incase fork is requested, notify on new frame and use the original frame for the new frameset. - if (vpb.Fork()) - { - handleFrame(processedFrame); - processedFrame.Dispose(); - return frame; - } + private void OnSourceStart(PipelineProfile activeProfile) + { + Source.OnNewSample += _block.ProcessFrame; + ActiveProfile = activeProfile; + Streaming = true; + var h = OnStart; + if (h != null) + h.Invoke(activeProfile); + } - // avoid disposing the frame incase the filter returns the original frame. - if (processedFrame == frame) - return frame; + private void OnSourceStop() + { + if (_block != null) + Source.OnNewSample -= _block.ProcessFrame; + Streaming = false; + var h = OnStop; + if (h != null) + h(); + } - // replace the current frame with the processed one to be used as the input to the next iteration (next filter) - frame.Dispose(); - return processedFrame; + private void OnFrame(Frame f) + { + var onNewSample = OnNewSample; + if (onNewSample != null) + onNewSample.Invoke(f); } - private FrameSet HandleSingleFrameProcessingBlocks(FrameSet frameSet, FrameSource frameSource, FramesReleaser framesReleaser, RsProcessingBlock videoProcessingBlock, Action handleFrame) + private void OnDestroy() { - // single frame filters - List processedFrames = new List(); - foreach (var frame in frameSet) + if (_block != null) { - var currFrame = ApplyFilter(frame, frameSource, framesReleaser, videoProcessingBlock, handleFrame); - - // cache the pocessed frame - processedFrames.Add(currFrame); - if (frame != currFrame) - frame.Dispose(); + _block.Dispose(); + _block = null; } - - // Combine the frames into a single frameset - var newFrameSet = frameSource.AllocateCompositeFrame(framesReleaser, processedFrames.ToArray()); - - foreach (var f in processedFrames) - f.Dispose(); - - return newFrameSet; } - private FrameSet HandleMultiFramesProcessingBlocks(FrameSet frameSet, FrameSource frameSource, FramesReleaser framesReleaser, RsProcessingBlock videoProcessingBlock, Action handleFrameSet) + internal void ProcessFrame(Frame frame, FrameSource src) { - using (var frame = frameSet.AsFrame()) + try { - if (videoProcessingBlock.CanProcess(frame)) + Frame f = frame; + + if (profile != null) { - using (var f = videoProcessingBlock.Process(frame, frameSource, framesReleaser)) + var filters = profile.ToArray(); + // foreach (var pb in profile) + foreach (var pb in filters) { - if (videoProcessingBlock.Fork()) + if (pb == null || !pb.Enabled) + continue; + + var r = pb.Process(f, src); + if (r != f) { - handleFrameSet(FrameSet.FromFrame(f, framesReleaser)); + f.Dispose(); + f = r; } - else - return FrameSet.FromFrame(f, framesReleaser); } } + + src.FrameReady(f); + + if (f != frame) + f.Dispose(); + } + catch (Exception e) + { + Debug.LogException(e); } - return frameSet; } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsStreamTextureRenderer.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsStreamTextureRenderer.cs index 9c2ce3fff5..966ea35368 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsStreamTextureRenderer.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsStreamTextureRenderer.cs @@ -21,6 +21,7 @@ private static TextureFormat Convert(Format lrsFormat) case Format.Y16: return TextureFormat.R16; case Format.Raw16: return TextureFormat.R16; case Format.Raw8: return TextureFormat.Alpha8; + case Format.Disparity32: return TextureFormat.RFloat; case Format.Yuyv: case Format.Bgr8: case Format.Raw10: @@ -28,13 +29,15 @@ private static TextureFormat Convert(Format lrsFormat) case Format.Uyvy: case Format.MotionRaw: case Format.MotionXyz32f: - case Format.GpioRaw: - case Format.Any: + case Format.GpioRaw: + case Format.Any: default: - throw new Exception(string.Format("{0} librealsense format: " + lrsFormat + ", is not supported by Unity")); + throw new ArgumentException(string.Format("librealsense format: {0}, is not supported by Unity", lrsFormat)); } } + public RsFrameProvider Source; + [System.Serializable] public class TextureEvent : UnityEvent { } @@ -44,200 +47,156 @@ public class TextureEvent : UnityEvent { } public FilterMode filterMode = FilterMode.Point; - private RsVideoStreamRequest _videoStreamFilter; - private RsVideoStreamRequest _currVideoStreamFilter; - protected Texture2D texture; + [Space] public TextureEvent textureBinding; - [System.NonSerialized] - private byte[] data; - - readonly AutoResetEvent f = new AutoResetEvent(false); - protected int threadId; - protected bool bound; - - virtual protected void Awake() - { - threadId = Thread.CurrentThread.ManagedThreadId; - _videoStreamFilter = new RsVideoStreamRequest() { Stream = _stream, Format = _format, StreamIndex = _streamIndex }; - _currVideoStreamFilter = _videoStreamFilter.Clone(); - } + FrameQueue q; + Predicate matcher; void Start() { - RsDevice.Instance.OnStart += OnStartStreaming; - RsDevice.Instance.OnStop += OnStopStreaming; + Source.OnStart += OnStartStreaming; + Source.OnStop += OnStopStreaming; } void OnDestroy() { - if (texture != null) { + if (texture != null) + { Destroy(texture); texture = null; } - } - - protected virtual void OnStopStreaming() - { - RsDevice.Instance.OnNewSample -= OnNewSampleUnityThread; - RsDevice.Instance.OnNewSample -= OnNewSampleThreading; - - f.Reset(); - data = null; - } - protected virtual void OnStartStreaming(PipelineProfile activeProfile) - { - - if (RsDevice.Instance.processMode == RsDevice.ProcessMode.UnityThread) + if (q != null) { - UnityEngine.Assertions.Assert.AreEqual(threadId, Thread.CurrentThread.ManagedThreadId); - RsDevice.Instance.OnNewSample += OnNewSampleUnityThread; + q.Dispose(); } - else - RsDevice.Instance.OnNewSample += OnNewSampleThreading; } - public void OnFrame(Frame f) + protected void OnStopStreaming() { - if (RsDevice.Instance.processMode == RsDevice.ProcessMode.UnityThread) - { - UnityEngine.Assertions.Assert.AreEqual(threadId, Thread.CurrentThread.ManagedThreadId); - OnNewSampleUnityThread(f); - } - else + Source.OnNewSample -= OnNewSample; + // RsDevice.Instance.OnNewSampleSet -= OnNewSampleSet; + + // e.Set(); + + if (q != null) { - OnNewSampleThreading(f); + // foreach (var f in q) + // f.Dispose(); + + q.Dispose(); + q = null; } } - private void UpdateData(Frame frame) - { - var vidFrame = frame as VideoFrame; - data = data ?? new byte[vidFrame.Stride * vidFrame.Height]; - vidFrame.CopyTo(data); - if ((vidFrame as Frame) != frame) - vidFrame.Dispose(); - } - private void ResetTexture(RsVideoStreamRequest vsr) + + + public void OnStartStreaming(PipelineProfile activeProfile) { - if (texture != null) - { - Destroy(texture); - } + q = new FrameQueue(1); - texture = new Texture2D(vsr.Width, vsr.Height, Convert(vsr.Format), false, true) - { - wrapMode = TextureWrapMode.Clamp, - filterMode = filterMode - }; + matcher = new Predicate(Matches); - _currVideoStreamFilter = vsr.Clone(); + Source.OnNewSample += OnNewSample; + // e.Reset(); - texture.Apply(); - textureBinding.Invoke(texture); + // RsDevice.Instance.OnNewSampleSet += OnNewSampleSet; } - private bool HasTextureConflict(Frame frame) + private bool Matches(Frame f) { - var vidFrame = frame as VideoFrame; - if (_videoStreamFilter.Width == vidFrame.Width && _videoStreamFilter.Height == vidFrame.Height && _videoStreamFilter.Format == vidFrame.Profile.Format) - return false; - _videoStreamFilter.CopyProfile(vidFrame); - data = null; - return true; + using (var p = f.Profile) + return p.Stream == _stream && p.Format == _format && p.Index == _streamIndex; } - private bool HasRequestConflict(Frame frame) + void OnNewSample(Frame frame) { - if (!(frame is VideoFrame)) - return true; - VideoFrame vf = frame as VideoFrame; - if (_videoStreamFilter.Stream != vf.Profile.Stream || - _videoStreamFilter.Format != vf.Profile.Format || - (_videoStreamFilter.StreamIndex != vf.Profile.Index && _videoStreamFilter.StreamIndex != 0)) - return true; - return false; + try + { + if (frame.IsComposite) + { + using (var fs = FrameSet.FromFrame(frame)) + // using (var f = fs[_stream, _format, _streamIndex]) + using (var f = fs.FirstOrDefault(matcher)) + { + if (f != null) + q.Enqueue(f); + return; + } + } + + // using (var p = frame.Profile) + // { + // if (p.Stream != _stream || p.Format != _format || p.Index != _streamIndex) + // { + // return; + // } + // } + if (!matcher(frame)) + return; + + using (frame) + { + q.Enqueue(frame); + } + } + catch (Exception e) + { + Debug.LogException(e, this); + // throw; + } + } - private void OnNewSampleThreading(Frame frame) + bool HasTextureConflict(VideoFrame vf) { - if (HasRequestConflict(frame)) - return; - if (HasTextureConflict(frame)) - return; - UpdateData(frame); - f.Set(); + using (var p = vf.Profile) + { + return !texture || + texture.width != vf.Width || + texture.height != vf.Height || + Convert(p.Format) != texture.format; + } } - private void OnNewSampleUnityThread(Frame frame) + protected void Update() { - var vidFrame = frame as VideoFrame; - - if (HasRequestConflict(vidFrame)) - return; - if (HasTextureConflict(frame)) - return; - - UnityEngine.Assertions.Assert.AreEqual(threadId, Thread.CurrentThread.ManagedThreadId); - - texture.LoadRawTextureData(vidFrame.Data, vidFrame.Stride * vidFrame.Height); + // if (e.WaitOne(0, false)) + // return; - if ((vidFrame as Frame) != frame) - vidFrame.Dispose(); - - // Applied later (in Update) to sync all gpu uploads - // texture.Apply(); - f.Set(); + if (q != null) + { + Frame frame; + if (q.PollForFrame(out frame)) + using (frame) + ProcessFrame(frame as VideoFrame); + } } - protected void Update() + private void ProcessFrame(VideoFrame frame) { - if (!_currVideoStreamFilter.Equals(_videoStreamFilter)) - ResetTexture(_videoStreamFilter); - - if (f.WaitOne(0)) + if (HasTextureConflict(frame)) { - try + if (texture != null) { - if (data != null) - texture.LoadRawTextureData(data); + Destroy(texture); } - catch - { - OnStopStreaming(); - Debug.LogError("Error loading texture data, check texture and stream formats"); - throw; - } - texture.Apply(); - if (!bound) + texture = new Texture2D(frame.Width, frame.Height, Convert(frame.Profile.Format), false, true) { - textureBinding.Invoke(texture); - bound = true; - } - } - } -} - + wrapMode = TextureWrapMode.Clamp, + filterMode = filterMode + }; -public class DefaultStreamAttribute : Attribute -{ - public Stream stream; - public TextureFormat format; - - public DefaultStreamAttribute(Stream stream) - { - this.stream = stream; - } + textureBinding.Invoke(texture); + } - public DefaultStreamAttribute(Stream stream, TextureFormat format) - { - this.stream = stream; - this.format = format; + texture.LoadRawTextureData(frame.Data, frame.Stride * frame.Height); + texture.Apply(); } -} \ No newline at end of file +} diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsVideoStreamRequest.cs b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsVideoStreamRequest.cs index d83dc17d09..6aa59deac5 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsVideoStreamRequest.cs +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsVideoStreamRequest.cs @@ -2,7 +2,7 @@ using System; [Serializable] -public class RsVideoStreamRequest +public struct RsVideoStreamRequest : IEquatable { public Stream Stream; public Format Format; @@ -11,77 +11,77 @@ public class RsVideoStreamRequest public int Width; public int Height; - public RsVideoStreamRequest() + public RsVideoStreamRequest(Stream stream, Format format, int framerate, int streamIndex, int width, int height) { - + Stream = stream; + Format = format; + Framerate = framerate; + StreamIndex = streamIndex; + Width = width; + Height = height; } - public RsVideoStreamRequest(VideoFrame f) + public static RsVideoStreamRequest FromFrame(VideoFrame f) { - this.CopyProfile(f); + using (var p = f.Profile) + return new RsVideoStreamRequest( + p.Stream, + p.Format, + p.Framerate, + p.Index, + f.Width, + f.Height + ); } - public RsVideoStreamRequest Clone() + + public static RsVideoStreamRequest FromProfile(StreamProfile p) { - return new RsVideoStreamRequest() - { - Stream = this.Stream, - Format = this.Format, - Framerate = this.Framerate, - StreamIndex = this.StreamIndex, - Width = this.Width, - Height = this.Height - }; + return new RsVideoStreamRequest( + p.Stream, + p.Format, + p.Framerate, + p.Index, + p is VideoStreamProfile ? (p as VideoStreamProfile).Width : 0, + p is VideoStreamProfile ? (p as VideoStreamProfile).Height : 0 + ); } - public void CopyProfile(VideoFrame f) + public override bool Equals(object other) { - var vf = f as VideoFrame; - - Stream = vf.Profile.Stream; - Format = vf.Profile.Format; - Framerate = vf.Profile.Framerate; - StreamIndex = vf.Profile.Index; - Width = vf.Width; - Height = vf.Height; + return (other is RsVideoStreamRequest) && Equals((RsVideoStreamRequest)other); } - public override bool Equals(object other) + public bool Equals(RsVideoStreamRequest other) { - if (!(other is RsVideoStreamRequest)) - return false; - RsVideoStreamRequest vsr = other as RsVideoStreamRequest; - if (Stream != vsr.Stream) - return false; - if (Format != vsr.Format) - return false; - if (Width != vsr.Width) - return false; - if (Height != vsr.Height) - return false; - if (Framerate != vsr.Framerate) - return false; - if (StreamIndex != vsr.StreamIndex) - return false; - return true; + return + Stream == other.Stream && + Format == other.Format && + Framerate == other.Framerate && + StreamIndex == other.StreamIndex && + Width == other.Width && + Height == other.Height; } public bool HasConflict(VideoFrame f) { var vf = f as VideoFrame; - if (Stream != Stream.Any && Stream != vf.Profile.Stream) - return true; - if (Format != Format.Any && Format != vf.Profile.Format) - return true; - if (Width != 0 && Width != vf.Width) - return true; - if (Height != 0 && Height != vf.Height) - return true; - if (Framerate != 0 && Framerate != vf.Profile.Framerate) - return true; - if (StreamIndex != 0 && StreamIndex != vf.Profile.Index) - return true; - return false; + using (var p = vf.Profile) + { + if (Stream != Stream.Any && Stream != p.Stream) + return true; + if (Format != Format.Any && Format != p.Format) + return true; + if (Width != 0 && Width != vf.Width) + return true; + if (Height != 0 && Height != vf.Height) + return true; + if (Framerate != 0 && Framerate != p.Framerate) + return true; + if (StreamIndex != 0 && StreamIndex != p.Index) + return true; + return false; + } } public bool HasConflict(RsVideoStreamRequest other) @@ -100,4 +100,10 @@ public bool HasConflict(RsVideoStreamRequest other) return true; return false; } + + public override int GetHashCode() + { + // https://stackoverflow.com/questions/263400/what-is-the-best-algorithm-for-an-overridden-system-object-gethashcode + return new { Stream, Format, Framerate, StreamIndex, Width, Height }.GetHashCode(); + } } diff --git a/wrappers/unity/Assets/RealSenseSDK2.0/Shaders/PointCloudGeom.shader b/wrappers/unity/Assets/RealSenseSDK2.0/Shaders/PointCloudGeom.shader index 7af9ddd083..40d0c73b16 100644 --- a/wrappers/unity/Assets/RealSenseSDK2.0/Shaders/PointCloudGeom.shader +++ b/wrappers/unity/Assets/RealSenseSDK2.0/Shaders/PointCloudGeom.shader @@ -107,9 +107,6 @@ fixed4 frag (g2f i) : SV_Target { - // return tex2D(_UVMap, i.uv + 0.5 * _MainTex_TexelSize.xy); - // return tex2D(_UVMap, i.uv); - // return tex2D(_UVMap, i.uv + 0.5 * _UVMap_TexelSize.xy); float2 uv = tex2D(_UVMap, i.uv); if(any(uv <= 0 || uv >= 1)) discard; diff --git a/wrappers/unity/Assets/StreamingAssets/StreamingAssets b/wrappers/unity/Assets/StreamingAssets/StreamingAssets index 6dc1122740..418d7e171a 100644 Binary files a/wrappers/unity/Assets/StreamingAssets/StreamingAssets and b/wrappers/unity/Assets/StreamingAssets/StreamingAssets differ diff --git a/wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest b/wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest index c0152e7326..b122d49ced 100644 --- a/wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest +++ b/wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 417277722 +CRC: 2103570069 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/wrappers/unity/Assets/StreamingAssets/sample_assets b/wrappers/unity/Assets/StreamingAssets/sample_assets index 3132a54810..676e0e48ae 100644 Binary files a/wrappers/unity/Assets/StreamingAssets/sample_assets and b/wrappers/unity/Assets/StreamingAssets/sample_assets differ diff --git a/wrappers/unity/Assets/StreamingAssets/sample_assets.manifest b/wrappers/unity/Assets/StreamingAssets/sample_assets.manifest index a6e3e40eff..c5cd3b8843 100644 --- a/wrappers/unity/Assets/StreamingAssets/sample_assets.manifest +++ b/wrappers/unity/Assets/StreamingAssets/sample_assets.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1314817934 +CRC: 827759043 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 77a220749addac025edb4442d9fb7015 + Hash: 2d1220d3d98957b62ca102abd8498a76 TypeTreeHash: serializedVersion: 2 - Hash: 43e94fdad20c75bc683bf1b3c56f8c7b + Hash: bb5a68657e9add7589f6b3991cc77701 HashAppended: 0 ClassTypes: - Class: 1 @@ -41,16 +41,34 @@ ClassTypes: Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - Class: 114 Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 70a93f62582029d4aab3757e6e2fcaf2, type: 3} - Class: 114 Script: {fileID: 11500000, guid: edcacd9285a1fb242a7a1797a63904c6, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: bec95ba2af23efd408d33138086f1c65, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 00041e24a8ebd6a498e0ce1832ce37c2, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 2e2ca705e068d8147ab873ad0b3bd0ce, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 949c0815228b7334a89a9b09ff0c7fdb, type: 3} - Class: 114 Script: {fileID: 11500000, guid: aa4183e682c996540be86aee2429b651, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 18bce048bd313fc40b6eb0a08d7f83ab, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 5e9de158269bbf84dbbfe3f295429133, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: a370b019fb25fbe4384bc45033197fcd, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ab8658da5fac1924385546d4cfccbea4, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 48f1a4dc738fa514aa5e5d4cc3665aae, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 2a81fc1e64edf3540a7f9ba78a879104, type: 3} - Class: 114 @@ -74,9 +92,13 @@ Assets: - Assets/RealSenseSDK2.0/Misc/Textures/realsense_4c_075_white.png - Assets/RealSenseSDK2.0/Misc/Textures/Icons/color.png - Assets/RealSenseSDK2.0/Misc/Prefabs/ColormapDropdown.prefab +- Assets/RealSenseSDK2.0/ProcessingPipe/AlignmentSample.asset - Assets/RealSenseSDK2.0/Misc/Textures/Icons/087-on-off.png +- Assets/RealSenseSDK2.0/ProcessingPipe/BackgroundSegmentation.asset - Assets/RealSenseSDK2.0/Misc/Textures/Icons/pan.png +- Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset - Assets/RealSenseSDK2.0/Misc/Textures/Icons/254-pause.png +- Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepthAndColor.asset - Assets/RealSenseSDK2.0/Misc/Textures/Icons/look.png - Assets/RealSenseSDK2.0/Misc/Textures/Icons/GitHub-Mark-Light-32px.png - Assets/RealSenseSDK2.0/Misc/Textures/Icons/081-arrow-back-left.png @@ -85,6 +107,7 @@ Assets: - Assets/RealSenseSDK2.0/Misc/Textures/shadow.png - Assets/RealSenseSDK2.0/Misc/Textures/Icons/253-play.png - Assets/RealSenseSDK2.0/Misc/Textures/Icons/005b-help-outlined.png +- Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset - Assets/RealSenseSDK2.0/Misc/Prefabs/MinMaxSlider.prefab - Assets/RealSenseSDK2.0/Misc/Prefabs/SampleUI.prefab - Assets/RealSenseSDK2.0/Misc/Textures/Icons/grayscale.png @@ -93,3 +116,7 @@ Assets: - Assets/RealSenseSDK2.0/Misc/Textures/forkme_left_darkblue_121621.png - Assets/RealSenseSDK2.0/Misc/Textures/colormaps.png Dependencies: [] + +CRC: 827759043 + Hash: 2d1220d3d98957b62ca102abd8498a76 + Hash: bb5a68657e9add7589f6b3991cc77701 \ No newline at end of file diff --git a/wrappers/unity/Assets/StreamingAssets/sample_scenes b/wrappers/unity/Assets/StreamingAssets/sample_scenes index fd5805c394..aa65f5947b 100644 Binary files a/wrappers/unity/Assets/StreamingAssets/sample_scenes and b/wrappers/unity/Assets/StreamingAssets/sample_scenes differ diff --git a/wrappers/unity/Assets/StreamingAssets/sample_scenes.manifest b/wrappers/unity/Assets/StreamingAssets/sample_scenes.manifest index c0d866b088..c8bbf2c9f8 100644 --- a/wrappers/unity/Assets/StreamingAssets/sample_scenes.manifest +++ b/wrappers/unity/Assets/StreamingAssets/sample_scenes.manifest @@ -1,14 +1,150 @@ ManifestFileVersion: 0 -CRC: 4047948713 +CRC: 2375959138 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c8183b741746d961184fd12077cb718e + Hash: 2b423a9f8f61b38d4e21b729304081df TypeTreeHash: serializedVersion: 2 - Hash: 31d6cfe0d16ae931b73c59d7e0c089c0 + Hash: a5df9179ca411ca38dad04483d69b752 HashAppended: 0 -ClassTypes: [] +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 20 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 23 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 33 + Script: {instanceID: 0} +- Class: 43 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 81 + Script: {instanceID: 0} +- Class: 89 + Script: {instanceID: 0} +- Class: 92 + Script: {instanceID: 0} +- Class: 104 + Script: {instanceID: 0} +- Class: 108 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: c75ac69040782d246b1a8fb20762ec8c, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: a1efe8d13569ef747ae9556b47f8ac80, type: 3} +- Class: 114 + Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 853051423, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: -1184210157, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 70a93f62582029d4aab3757e6e2fcaf2, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: edcacd9285a1fb242a7a1797a63904c6, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: bec95ba2af23efd408d33138086f1c65, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 3f321dd38a2028949a3ecd8e2905bb5f, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 00041e24a8ebd6a498e0ce1832ce37c2, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: dfd79a846b48a6b42af02cc534238d2a, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 039e78b41f0eb704990fe2db1b3df336, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 2e2ca705e068d8147ab873ad0b3bd0ce, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 949c0815228b7334a89a9b09ff0c7fdb, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 297e2b35ab9a7c140ac84cbd3abd69e8, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: aa4183e682c996540be86aee2429b651, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 18bce048bd313fc40b6eb0a08d7f83ab, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 5e9de158269bbf84dbbfe3f295429133, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: a370b019fb25fbe4384bc45033197fcd, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 89232479b8ac84145a0f2949ae7c1ac8, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 475d71c97716db644863efe7bddfbd70, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ab8658da5fac1924385546d4cfccbea4, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 701924db2ae3d894aafb2d751551e249, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: e9763d7c2fa0f984f8a2ead51db059c9, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 48f1a4dc738fa514aa5e5d4cc3665aae, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: f59de22db6bfdfe46937570a9af2882b, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 737ed57de85af3a41b72a39dd287955e, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ab85129d6ab9eae4aa6773f7276abff1, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 2a81fc1e64edf3540a7f9ba78a879104, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 46ef920fe825d5c4996039f57cad2ffa, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 124 + Script: {instanceID: 0} +- Class: 128 + Script: {instanceID: 0} +- Class: 135 + Script: {instanceID: 0} +- Class: 157 + Script: {instanceID: 0} +- Class: 213 + Script: {instanceID: 0} +- Class: 222 + Script: {instanceID: 0} +- Class: 223 + Script: {instanceID: 0} +- Class: 224 + Script: {instanceID: 0} +- Class: 225 + Script: {instanceID: 0} +- Class: 258 + Script: {instanceID: 0} Assets: - Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity - Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity diff --git a/wrappers/unity/ProjectSettings/ProjectSettings.asset b/wrappers/unity/ProjectSettings/ProjectSettings.asset index d3f74ced2a..aadce71fbe 100644 --- a/wrappers/unity/ProjectSettings/ProjectSettings.asset +++ b/wrappers/unity/ProjectSettings/ProjectSettings.asset @@ -3,11 +3,10 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 14 productGUID: 3f9f6409d1517124aa30a106720e93bc AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 - AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -56,7 +55,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 iosAllowHTTPDownload: 1 @@ -69,6 +67,7 @@ PlayerSettings: preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 androidBlitType: 0 + defaultIsFullScreen: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -95,7 +94,8 @@ PlayerSettings: visibleInBackground: 1 allowFullscreenSwitch: 1 graphicsJobMode: 0 - fullscreenMode: 1 + macFullscreenMode: 2 + d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -111,10 +111,18 @@ PlayerSettings: xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + wiiUTVResolution: 0 + wiiUGamePadMSAA: 1 + wiiUSupportsNunchuk: 0 + wiiUSupportsClassicController: 0 + wiiUSupportsBalanceBoard: 0 + wiiUSupportsMotionPlus: 0 + wiiUSupportsProController: 0 + wiiUAllowScreenCapture: 1 + wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -128,6 +136,7 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -142,10 +151,10 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 - enable360StereoCapture: 0 oculus: sharedDepthBuffer: 0 dashSupport: 0 + enable360StereoCapture: 0 protectGraphicsMemory: 0 useHDRDisplay: 0 m_ColorGamuts: 00000000 @@ -169,7 +178,9 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 + VertexChannelCompressionMask: + serializedVersion: 2 + m_Bits: 4294901998 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 8.0 tvOSSdkVersion: 0 @@ -198,7 +209,6 @@ PlayerSettings: tvOSSmallIconLayers: [] tvOSSmallIconLayers2x: [] tvOSLargeIconLayers: [] - tvOSLargeIconLayers2x: [] tvOSTopShelfImageLayers: [] tvOSTopShelfImageLayers2x: [] tvOSTopShelfImageWideLayers: [] @@ -232,19 +242,14 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: - iOSManualSigningProvisioningProfileType: 0 - tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 - iOSRequireARKit: 0 - appleEnableProMotion: 0 clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: - AndroidTargetArchitectures: 5 + AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 @@ -264,7 +269,6 @@ PlayerSettings: m_Width: 128 m_Height: 128 m_Kind: 0 - m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] @@ -282,8 +286,25 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + wiiUTitleID: 0005000011000000 + wiiUGroupID: 00010000 + wiiUCommonSaveSize: 4096 + wiiUAccountSaveSize: 2048 + wiiUOlvAccessKey: 0 + wiiUTinCode: 0 + wiiUJoinGameId: 0 + wiiUJoinGameModeMask: 0000000000000000 + wiiUCommonBossSize: 0 + wiiUAccountBossSize: 0 + wiiUAddOnUniqueIDs: [] + wiiUMainThreadStackSize: 3072 + wiiULoaderThreadStackSize: 1024 + wiiUSystemHeapSize: 128 + wiiUTVStartupScreen: {fileID: 0} + wiiUGamePadStartupScreen: {fileID: 0} + wiiUDrcBufferDisabled: 0 + wiiUProfilerLibPath: playModeTestRunnerEnabled: 1 - runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -403,8 +424,8 @@ PlayerSettings: switchAllowsVideoCapturing: 1 switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 switchSupportedNpadStyles: 3 - switchNativeFsCacheSize: 32 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -460,7 +481,6 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 - enableApplicationExit: 0 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -531,6 +551,7 @@ PlayerSettings: psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 psp2ScriptOptimizationLevel: 0 + psmSplashimage: {fileID: 0} splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: @@ -544,14 +565,12 @@ PlayerSettings: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 + webGLUseWasm: 0 webGLCompressionFormat: 1 - webGLLinkerTarget: 0 scriptingDefineSymbols: {} platformArchitecture: {} scriptingBackend: {} - il2cppCompilerConfiguration: {} incrementalIl2cppBuild: {} - allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 0 apiCompatibilityLevelPerPlatform: {} @@ -567,7 +586,6 @@ PlayerSettings: metroApplicationDescription: unity wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -583,14 +601,6 @@ PlayerSettings: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 @@ -611,6 +621,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: diff --git a/wrappers/unity/ProjectSettings/ProjectVersion.txt b/wrappers/unity/ProjectSettings/ProjectVersion.txt index 29eae9e066..fdd37c4908 100644 --- a/wrappers/unity/ProjectSettings/ProjectVersion.txt +++ b/wrappers/unity/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.6f1 +m_EditorVersion: 2017.4.13f1 diff --git a/wrappers/unity/ProjectSettings/QualitySettings.asset b/wrappers/unity/ProjectSettings/QualitySettings.asset index bead826413..79db700e1b 100644 --- a/wrappers/unity/ProjectSettings/QualitySettings.asset +++ b/wrappers/unity/ProjectSettings/QualitySettings.asset @@ -29,6 +29,12 @@ QualitySettings: vSyncCount: 0 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 @@ -57,6 +63,12 @@ QualitySettings: vSyncCount: 0 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 @@ -85,6 +97,12 @@ QualitySettings: vSyncCount: 1 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 @@ -113,6 +131,12 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 @@ -141,6 +165,12 @@ QualitySettings: vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 @@ -169,23 +199,15 @@ QualitySettings: vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSM: 5 - PSP2: 2 - Standalone: 5 - Tizen: 2 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + m_PerPlatformDefaultQuality: {} diff --git a/wrappers/unity/ProjectSettings/UnityConnectSettings.asset b/wrappers/unity/ProjectSettings/UnityConnectSettings.asset index 3da14d5baf..1be4600519 100644 --- a/wrappers/unity/ProjectSettings/UnityConnectSettings.asset +++ b/wrappers/unity/ProjectSettings/UnityConnectSettings.asset @@ -3,7 +3,7 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: diff --git a/wrappers/unity/readme.md b/wrappers/unity/readme.md index dae313cbd8..bdeb5221c8 100644 --- a/wrappers/unity/readme.md +++ b/wrappers/unity/readme.md @@ -54,7 +54,6 @@ The Unity wrapper provides several example scenes to help you get started with R The RealSenseDevice provides an encapsulation of a single device connected to the system. The following image displays the RealSenseDevice script: - ![image](https://user-images.githubusercontent.com/22654243/36370418-77bf062a-1567-11e8-98ee-c2489aeb1208.png) ##### Process Mode @@ -84,31 +83,39 @@ Once the device is streaming, Unity Inspector will show the device's sensors and ##### Texture Streams -Under the `RealSenseDeivce` object in Unity's Hierarchy view, you can find a number of textures that bind to the device's frame callback and allow user to bind a texture to be updated upon frame arrival. - +Under the `RsDeivce` object in Unity's Hierarchy view, you can find a number of textures that are binded to a 'RsFrameProvider' (RsDevice or RsProcessingPipe) frame callbacks and allow a texture to be updated upon frame arrival. -![realsensedevice](https://user-images.githubusercontent.com/18511514/43199439-9e95952e-901a-11e8-9d43-b90cedb5d5d1.PNG) +![rsdevice](https://user-images.githubusercontent.com/18511514/47161652-212cab80-d2fb-11e8-8c8b-d627ee8af2d5.PNG) Each texture stream is associated with the `RealSenseStreamTexture` script which allows user to bind their textures so that they will be updated with each new frame. The following screenshot displays the configurations available for users when using a texture stream: -![realsensestreamtexture](https://user-images.githubusercontent.com/18511514/43199495-d9f80160-901a-11e8-815c-f1de8c273e84.PNG) +![realsensestreamtexture](https://user-images.githubusercontent.com/18511514/47161651-20941500-d2fb-11e8-8293-18459c057c98.PNG) -* VideoStreamFilter - Filter out frames that doesn't match the requested profile. Stream and Format must be provided, the index field can be set to 0 to accept any value. +* Source - Select the requested RsFrameProvider +* Stream / Format / Index - Filter out frames that doesn't match the requested profile. Stream and Format must be provided, the index field can be set to 0 to accept any value. * Texture Binding - Allows the user to bind textures to the script. Multiple textures can be bound to a single script. -* Fetch Frames From Device - Toggle whether the script should fetch the frames from the device, or should wait for the user to pass frame to is using its `OnFrame` method. -##### Processing Blocks +##### Processing Pipe -Processing blocks are scripts that can be attached to the RealSense device in order to create a processing pipe. -There are two types of processing blocks: -1. VideoProcessingBlock - processing a single frame (i.e. `HoleFillingFilter.cs`) -2. MultiFrameVideoProcessingBlock - processing a frame set (i.e. `Aligment.cs`) - -The processing pipe first process all all the single frame blocks orders by the `Order` property, once all the single frame blocks are processed, the pipe creates a new frame set and push it to the multi frames blocks. +The 'RsProcessingPipe' prefab use the 'RsProcessingProfile' asset to attach a set of processing blocks to a 'RsFrameProvider' (RsDevice or RsProcessingPipe). Each processing block has its own properties that can be modified on run time. -An example for the usage of the processing blocks can be found in "PointCloudProcessingBlocks" scene (single frame) and "AlignmentSample" scense (multi frame) -![processingblocks](https://user-images.githubusercontent.com/18511514/43201391-0898b93c-9021-11e8-84e8-5801394136de.PNG) +A processing profile can be created as shown below: + +>Create a new processing profile +> +>![processingprofile](https://user-images.githubusercontent.com/18511514/47161646-1ffb7e80-d2fb-11e8-9793-4acf96191903.PNG) + +>Attach the processing profile to the RsProcessingPipe prefab +> +>![processingprofile2](https://user-images.githubusercontent.com/18511514/47161647-1ffb7e80-d2fb-11e8-948c-6ca57afe9375.PNG) + +>Add and configure processing blocks +> +>![processingprofile3](https://user-images.githubusercontent.com/18511514/47161650-20941500-d2fb-11e8-8994-f7b8452e254a.PNG) + +An example for the usage of the processing blocks can be found in "PointCloudProcessingBlocks" scene and "AlignmentSample" scense. +![processingblocks](https://user-images.githubusercontent.com/18511514/47161644-1ffb7e80-d2fb-11e8-9dc2-80c897aa2544.PNG) ##### Point Cloud @@ -117,8 +124,9 @@ Under the `RealSenseDeivce` object in each of the point cloud sample scenes, you The PointCloud object uses the `PointCloudGenerator.cs` script. A texture for the point cloud can be provided using `RealSenseStreamTexture.cs` by binding it to PointCloudMat. -![pointcloudtexture](https://user-images.githubusercontent.com/18511514/43202279-c26ff440-9023-11e8-8bee-349d0faced57.PNG) -![pointcloudprefab](https://user-images.githubusercontent.com/18511514/43202278-c0e53c5c-9023-11e8-8fb9-a8a23f52a105.PNG) +![pointcloudtexture](https://user-images.githubusercontent.com/18511514/47161642-1ffb7e80-d2fb-11e8-957f-7d34e3f88532.PNG) + +![pointcloudprefab](https://user-images.githubusercontent.com/18511514/47161641-1f62e800-d2fb-11e8-9318-b96b0e7cc020.PNG) ### Images @@ -127,5 +135,3 @@ The Unity wrapper comes with a set of Unity Materials alongside matching Shaders To get a texture, we provide several Image objects under the `Images` prefab: ![image](https://user-images.githubusercontent.com/22654243/35591778-cc043fce-0613-11e8-8138-3aa440e54513.png) - -> The above image shows the `ColorizedDepthImage`