Feature/VL.ImGui.Stride

VL.ImGui.Skia/src/SkiaContext.cs

@@ -1,47 +1,48 @@
-using ImGuiNET;
-using Stride.Core.Mathematics;
-using System.Runtime.CompilerServices;
-using VL.Lib.IO.Notifications;
-using VL.Skia;
+using VL.ImGui.Widgets;
+
 
 namespace VL.ImGui
 {
-    using ImGui = ImGuiNET.ImGui;
-
-    class EmptyLayer : ILayer
+    public interface IContextWithSkia
     {
-        public static EmptyLayer Instance = new EmptyLayer();
+        public IntPtr AddLayer(SkiaWidget layer, System.Numerics.Vector2 pos, System.Numerics.Vector2 size);
 
-        public RectangleF? Bounds => default;
+        public void RemoveLayer(SkiaWidget layer);
+    }
 
-        public bool Notify(INotification notification, CallerInfo caller)
-        {
-            return false;
-        }
+    public sealed class SkiaContext : Context, IContextWithSkia
+    {
+        public readonly List<SkiaWidget> Layers = new List<SkiaWidget>();
 
-        public void Render(CallerInfo caller)
+        public IntPtr AddLayer(SkiaWidget layer, System.Numerics.Vector2 pos, System.Numerics.Vector2 size)
         {
+            if (Layers.Contains(layer))
+            {
+                return Layers.IndexOf(layer) + 1;
+            }
+            else
+            {
+                Layers.Add(layer);
+                return Layers.Count;
+            }
         }
-    }
 
-    internal sealed class SkiaContext : Context
-    {
-        public readonly List<ILayer> Layers = new List<ILayer>();
-
-        public override void NewFrame()
+        public void RemoveLayer(SkiaWidget layer)
         {
-            Layers.Clear();
-            Layers.Add(EmptyLayer.Instance);
-            base.NewFrame();
+            if (Layers.Contains(layer))
+            {
+                Layers.Remove(layer);
+            }
         }
 
-        internal void AddLayer(Vector2 size, ILayer layer)
+        public SkiaWidget? GetLayer(IntPtr index) 
         {
-            var id = Layers.Count;
-            Layers.Add(layer);
-            DrawListPtr.AddImage(new IntPtr(id), default, Unsafe.As<Vector2, System.Numerics.Vector2>(ref size));
-            if (DrawList == DrawList.AtCursor)
-                ImGui.Image(new IntPtr(0), Unsafe.As<Vector2, System.Numerics.Vector2>(ref size));
+            if (Layers.Count >= index)
+                return Layers.ElementAt((int)index - 1);
+            else
+                return null;
         }
+
+
     }
 }

VL.ImGui.Skia/src/SkiaWidget.cs

@@ -15,6 +15,7 @@ public sealed partial class SkiaWidget : PrimitiveWidget, IDisposable, ILayer
         private bool _disposed;
         private bool _itemHasFocus;
         private bool _windowHasFocus;
+        private IContextWithSkia? _skiaContext;
 
         public ILayer? Layer { private get; set; }
 
@@ -27,29 +28,38 @@ public sealed partial class SkiaWidget : PrimitiveWidget, IDisposable, ILayer
 
         protected override void Draw(Context context, in ImDrawListPtr drawList, in System.Numerics.Vector2 offset)
         {
-            if (Layer is null)
-                return;
-
-            if (context is SkiaContext skiaContext)
+            if (context is IContextWithSkia skiaContext)
             {
-                var _ = Size.FromHectoToImGui();
-                var position = ImGui.GetCursorPos();
-                ImGui.InvisibleButton($"{GetHashCode()}", _, ImGuiButtonFlags.None);
+                this._skiaContext = skiaContext;
+
+                if (Layer is null)
+                {
+                    skiaContext.RemoveLayer(this);
+                    return;
+                }
+
+                var pos = ImGui.GetCursorPos();
+                var size = Size.FromHectoToImGui();
+                ImGui.InvisibleButton($"{GetHashCode()}", size, ImGuiButtonFlags.None);
                 _itemHasFocus = ImGui.IsItemFocused();
                 _windowHasFocus = ImGui.IsWindowFocused();
-                ImGui.SetCursorPos(position);
-                skiaContext.AddLayer(new Vector2(_.X, _.Y), this);
+                ImGui.SetCursorPos(pos);
+
+                // Use Callback instead of Texture to pass Layer ID ... first Layer has ID 1
+                drawList.AddCallback(skiaContext.AddLayer(this, pos, size), IntPtr.Zero);
             }
         }
 
         [Pin(Ignore = true)]
         public RectangleF? Bounds => !_disposed ? Layer?.Bounds : default;
 
+        SKMatrix? trans;
+
         public void Render(CallerInfo caller)
         {
             if (_disposed || Layer is null)
                 return;
-
+            trans = caller.Transformation;
             Layer.Render(caller);
         }
 
@@ -65,11 +75,16 @@ public bool Notify(INotification notification, CallerInfo caller)
             if (EventFilter == EventFilter.WindowHasFocus && !_windowHasFocus)
                 return false;
 
-            return Layer.Notify(notification, caller);
+
+            if (trans != null)
+                return Layer.Notify(notification, caller.WithTransformation((SKMatrix)trans));
+            else
+                return Layer.Notify(notification, caller); ;
         }
 
         public void Dispose()
         {
+            _skiaContext?.RemoveLayer(this);
             _disposed = true;
         }
     }