basic svg working

Author: FlurinBruehwiler

Flamui.Components/Ui.Input.cs

@@ -1,6 +1,5 @@
 using System.Runtime.CompilerServices;
 using Flamui.UiElements;
-using Silk.NET.Input;
 
 namespace Flamui.Components;
 
@@ -37,7 +36,7 @@ public static UiText Input(this Ui ui, ref string text, bool hasFocus = false, I
                 {
                     var offsets = l.CharOffsets;
 
-                    for (int i = 0; i < offsets.Count; i++)
+                    for (int i = 0; i < offsets.Length; i++)
                     {
                         if (offsets[i] > pos.X)
                         {

Flamui.sln

@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flamui.Tests", "Flamui.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.LayoutTest", "Sample.LayoutTest\Sample.LayoutTest.csproj", "{6D448843-4468-4B7E-9E65-D075861C3AA7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "Playground\Playground.csproj", "{A0FB0B21-F3A3-4D96-A5E4-96DCF4EEF151}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,6 +60,10 @@ Global
 		{6D448843-4468-4B7E-9E65-D075861C3AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D448843-4468-4B7E-9E65-D075861C3AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D448843-4468-4B7E-9E65-D075861C3AA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0FB0B21-F3A3-4D96-A5E4-96DCF4EEF151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0FB0B21-F3A3-4D96-A5E4-96DCF4EEF151}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0FB0B21-F3A3-4D96-A5E4-96DCF4EEF151}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0FB0B21-F3A3-4D96-A5E4-96DCF4EEF151}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6D448843-4468-4B7E-9E65-D075861C3AA7} = {9C94658C-B59B-4FC7-AAC4-837C0D481C45}

Flamui/Arena.cs

@@ -3,7 +3,28 @@
 
 namespace Flamui;
 
-public class Arena : IDisposable
+
+public interface IAllocator
+{
+    public unsafe T* Allocate<T>(T value) where T : unmanaged;
+
+    public Slice<T> AllocateSlice<T>(int count) where T : unmanaged;
+}
+
+// public class GCAllocator : IAllocator
+// {
+//     public unsafe T* Allocate<T>(T value) where T : unmanaged
+//     {
+//
+//     }
+//
+//     public Slice<T> AllocateSlice<T>(int count) where T : unmanaged
+//     {
+//         throw new NotImplementedException();
+//     }
+// }
+
+public class Arena : IAllocator, IDisposable
 {
     public VirtualBuffer VirtualBuffer;
 
@@ -75,7 +96,7 @@ public unsafe Slice<T> AllocateSlice<T>(int count) where T : unmanaged
             return new Slice<T>
             {
                 Items = a,
-                Count = count
+                Length = count
             };
         }
     }

Flamui/ArenaChunkedList.cs

@@ -185,7 +185,7 @@ struct Chunk
 
         public bool IsFull()
         {
-            return Count >= Items.Count;
+            return Count >= Items.Length;
         }
     }
 

Flamui/ArenaList.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Collections;
+using System.Diagnostics;
 
 namespace Flamui;
 
@@ -8,32 +9,39 @@ namespace Flamui;
 /// Basic dynamic array on the arena
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public struct ArenaList<T> where T : unmanaged
+public struct ArenaList<T> : IEnumerable<T> where T : unmanaged
 {
-    private Arena? _arena;
     private Slice<T> _backingSlice;
     private int _backingSliceAllocateNum;
+    private int _arenaHash;
 
     public int Count;
-    public int Capacity => _backingSlice.Count;
+    public int Capacity => _backingSlice.Length;
 
-    public ArenaList(Arena arena, int initialCapacity)
+    public ArenaList(Arena arena, int initialCapacity = 1)
     {
+        _arenaHash = arena.GetHashCode();
+
         ArgumentNullException.ThrowIfNull(arena);
         ArgumentOutOfRangeException.ThrowIfNegativeOrZero(initialCapacity);
 
-        _arena = arena;
-        _backingSlice = _arena.AllocateSlice<T>(initialCapacity);
-        _backingSliceAllocateNum = _arena.AllocNum;
+        _backingSlice = arena.AllocateSlice<T>(initialCapacity);
+        _backingSliceAllocateNum = arena.AllocNum;
     }
 
     public unsafe void Add(T value)
     {
-        _arena ??= Ui.Arena;
+        var arena = Ui.Arena;
+
+        if (_arenaHash == 0)
+            _arenaHash = arena.GetHashCode();
+
+        Debug.Assert(arena.GetHashCode() == _arenaHash);
+
         if (Capacity == 0) //in case the ArenaList isn't initialized via the constructor
         {
-            _backingSlice = _arena.AllocateSlice<T>(1);
-            _backingSliceAllocateNum = _arena.AllocNum;
+            _backingSlice = arena.AllocateSlice<T>(1);
+            _backingSliceAllocateNum = arena.AllocNum;
         }
 
         Debug.Assert(Count <= Capacity);
@@ -44,16 +52,16 @@ public unsafe void Add(T value)
 
             //todo, this isn't really elegant or easy to understand, would be better to have a method directly on the
             //arena, that can tell you if a slice is at the end of the arena, and therefore allows *zero* cost resize
-            if (_backingSliceAllocateNum == _arena.AllocNum)
+            if (_backingSliceAllocateNum == arena.AllocNum)
             {
-                _arena.AllocateSlice<T>(_backingSlice.Count);
-                _backingSlice = new Slice<T>(_backingSlice.Items, _backingSlice.Count * 2);
-                _backingSliceAllocateNum = _arena.AllocNum;
+                arena.AllocateSlice<T>(_backingSlice.Length);
+                _backingSlice = new Slice<T>(_backingSlice.Items, _backingSlice.Length * 2);
+                _backingSliceAllocateNum = arena.AllocNum;
             }
             else
             {
-                var newSlice = _arena.AllocateSlice<T>(Capacity * 2);
-                _backingSliceAllocateNum = _arena.AllocNum;
+                var newSlice = arena.AllocateSlice<T>(Capacity * 2);
+                _backingSliceAllocateNum = arena.AllocNum;
 
                 _backingSlice.Span.CopyTo(newSlice.Span);
                 _backingSlice = newSlice;
@@ -64,26 +72,81 @@ public unsafe void Add(T value)
         Count++;
     }
 
-    public T this[int index]
+    public ref T this[int index]
     {
         get
         {
             if (index >= Count)
                 throw new IndexOutOfRangeException($"Index {index} isn't inside Count {Count}");
 
-            return _backingSlice[index];
+            return ref _backingSlice[index];
         }
-        set
-        {
-            if (index >= Count)
-                throw new IndexOutOfRangeException();
+    }
 
-            _backingSlice[index] = value;
+    public ref T Last()
+    {
+        if (Count == 0)
+        {
+            throw new Exception("Cannot get last element of empty ArenaList");
         }
+
+        return ref this[Count - 1];
     }
 
     public Slice<T> AsSlice()
     {
         return _backingSlice.SubSlice(0, Count);
     }
+
+    public Enumerator GetEnumerator()
+    {
+        return new Enumerator(this);
+    }
+
+    IEnumerator<T> IEnumerable<T>.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    public struct Enumerator : IEnumerator<T>
+    {
+        private readonly ArenaList<T> _arenaList;
+        private T _current;
+        private int _currentIndex;
+
+        public T Current => _current;
+
+        object IEnumerator.Current => _current;
+
+        public Enumerator(ArenaList<T> arenaList)
+        {
+            _arenaList = arenaList;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public bool MoveNext()
+        {
+            if (_currentIndex == _arenaList.Count - 1)
+                return false;
+
+            _currentIndex++;
+            _current = _arenaList[_currentIndex];
+
+            return true;
+        }
+
+        public void Reset()
+        {
+            _current = default;
+            _currentIndex = 0;
+        }
+    }
 }

Flamui/ArenaString.cs

@@ -88,7 +88,7 @@ public struct ArenaString : IEquatable<ArenaString> //todo implement IEnumerable
     // private ArenaStringBuilder _arenaStringBuilder;
     private Slice<char> _slice;
 
-    public int Length => _slice.Count;
+    public int Length => _slice.Length;
 
     public ArenaString(Slice<char> slice)
     {

Flamui/Drawing/FontLoader.cs

@@ -111,8 +111,8 @@ public record struct GlyphCacheHash
 public class FontAtlas
 {
     public required ScaledFont Font;
-    public required int AtlasWidth;
-    public required int AtlasHeight;
+    public required uint AtlasWidth;
+    public required uint AtlasHeight;
 
     public GpuTexture GpuTexture;