+ cleanup

+ WIP: MarkChanged

Author: andreakarasho

src/Bevy.cs

@@ -1061,7 +1061,7 @@ bool IQueryIterator<Changed<T>>.MoveNext()
 
 			if (states.IsEmpty)
 			{
-				_stateRow.Value = Unsafe.NullRef<uint>();
+				_stateRow.Value = ref Unsafe.NullRef<uint>();
 				_size = 0;
 			}
 			else
@@ -1141,7 +1141,7 @@ bool IQueryIterator<Added<T>>.MoveNext()
 
 			if (states.IsEmpty)
 			{
-				_stateRow.Value = Unsafe.NullRef<uint>();
+				_stateRow.Value = ref Unsafe.NullRef<uint>();
 				_size = 0;
 			}
 			else
@@ -1165,6 +1165,88 @@ public void SetTicks(uint lastRun, uint thisRun)
 	}
 }
 
+
+public ref struct MarkChanged<T> : IFilter<MarkChanged<T>>
+	where T : struct
+{
+	private QueryIterator _iterator;
+	private Ptr<uint> _stateRow;
+	private int _row, _count;
+	private nint _size;
+	private uint _lastRun, _thisRun;
+
+	private MarkChanged(QueryIterator iterator)
+	{
+		_iterator = iterator;
+		_row = -1;
+		_count = -1;
+		_lastRun = 0;
+		_thisRun = 0;
+	}
+
+	[UnscopedRef]
+	ref MarkChanged<T> IQueryIterator<MarkChanged<T>>.Current => ref this;
+
+	public static void Build(QueryBuilder builder)
+	{
+		// builder.With<T>();
+	}
+
+	static MarkChanged<T> IFilter<MarkChanged<T>>.CreateIterator(QueryIterator iterator)
+	{
+		return new(iterator);
+	}
+
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	readonly MarkChanged<T> IQueryIterator<MarkChanged<T>>.GetEnumerator()
+	{
+		return this;
+	}
+
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	bool IQueryIterator<MarkChanged<T>>.MoveNext()
+	{
+		if (++_row >= _count)
+		{
+			if (!_iterator.Next())
+				return false;
+
+			_row = 0;
+			_count = _iterator.Count;
+			var index = _iterator.GetColumnIndexOf<T>();
+			var states = _iterator.GetChangedTicks(index);
+
+			if (states.IsEmpty)
+			{
+				_stateRow.Value = ref Unsafe.NullRef<uint>();
+				_size = 0;
+			}
+			else
+			{
+				_stateRow.Value = ref MemoryMarshal.GetReference(states);
+				_size = Unsafe.SizeOf<uint>();
+			}
+		}
+		else
+		{
+			_stateRow.Value = ref Unsafe.AddByteOffset(ref _stateRow.Value, _size);
+		}
+
+		if (_size > 0)
+		{
+			_stateRow.Value = _thisRun;
+		}
+
+		return true;
+	}
+
+	public void SetTicks(uint lastRun, uint thisRun)
+	{
+		_lastRun = lastRun;
+		_thisRun = thisRun;
+	}
+}
+
 public partial struct Parent { }
 public partial interface IChildrenComponent { }
 

src/Ptr.cs

@@ -3,30 +3,13 @@
 [SkipLocalsInit]
 public ref struct Ptr<T> where T : struct
 {
-	// internal ref ComponentState State;
 	internal ref T Value;
 
 	public readonly ref T Ref
 	{
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		get => ref Value;
 	}
-	// public readonly ref T Rw
-	// {
-	// 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	// 	get
-	// 	{
-	// 		if (State != ComponentState.Changed)
-	// 			State = ComponentState.Changed;
-	// 		return ref Value;
-	// 	}
-	// }
-
-	// public readonly bool IsChanged => State == ComponentState.Changed;
-	// public readonly bool IsAdded => State == ComponentState.Added;
-
-	// public void ClearState() => State = ComponentState.None;
-	// public void MarkChanged() => State = ComponentState.Changed;
 }
 
 [SkipLocalsInit]
@@ -42,12 +25,10 @@ public readonly ref T Ref
 {
 	public Ptr<T> Value;
 	public nint Size;
-	// public nint StateSize;
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public void Next()
 	{
 		Value.Value = ref Unsafe.AddByteOffset(ref Value.Ref, Size);
-		// Value.State = ref Unsafe.AddByteOffset(ref Value.State, StateSize);
 	}
 }