without

samples/MyBattleground/Program.cs

@@ -75,8 +75,11 @@
 
 e.Delete();
 
+	ecs.Entity()
+		 .Set<Position>(new Position())
+		 .Set<Velocity>(new Velocity());
 
-for (int i = 0; i < ENTITIES_COUNT; i++)
+for (int i = 0; i < ENTITIES_COUNT / 1000; i++)
 	ecs.Entity()
 		 .Set<Position>(new Position())
 		 .Set<Velocity>(new Velocity())
@@ -101,7 +104,7 @@
 		// 		pos.Y *= vel.Y;
 		// 	});
 
-		ecs.System((ref Position pos , ref Velocity vel) => {
+		ecs.System<Not<PlayerTag>, Position, Velocity>((ref Position pos , ref Velocity vel) => {
 			pos.X *= vel.X;
 			pos.Y *= vel.Y;
 		});

src/World.cs

@@ -364,10 +364,12 @@ public QueryIterator2 Query2<TFilter>() where TFilter : struct
 		return new QueryIterator2(list);
 	}
 
-	public void System<T0, T1>(QueryFilterDelegate<T0, T1> fn) where T0 : struct where T1 : struct
+	public void System<TFilter, T0, T1>(QueryFilterDelegate<T0, T1> fn) 
+		where TFilter : struct where T0 : struct where T1 : struct
 	{
-		var hash = Lookup.Query<(T0, T1)>.Hash;
-		var terms = Lookup.Query<(T0, T1)>.Terms.AsSpan();
+		var hash = Lookup.Query<(T0, T1), TFilter>.Hash;
+		var terms = Lookup.Query<(T0, T1), TFilter>.Terms.AsSpan();
+		var withouts = Lookup.Query<(T0, T1), TFilter>.Withouts;
 
 		if (!_typeIndex.TryGetValue(hash, out var arch))
 		{
@@ -377,9 +379,15 @@ public void System<T0, T1>(QueryFilterDelegate<T0, T1> fn) where T0 : struct whe
 		if (arch == null)
 			return;
 
-		InternalQuery(arch, fn, terms);
+		InternalQuery(arch, fn, terms, withouts);
 
-		static void InternalQuery(Archetype root, QueryFilterDelegate<T0, T1> fn, ReadOnlySpan<Term> terms)
+		static void InternalQuery
+		(
+			Archetype root, 
+			QueryFilterDelegate<T0, T1> fn, 
+			ReadOnlySpan<Term> terms,
+			ImmutableDictionary<ulong, Term> withouts
+		)
 		{
 			if (root.Count > 0)
 			{
@@ -408,7 +416,8 @@ static void InternalQuery(Archetype root, QueryFilterDelegate<T0, T1> fn, ReadOn
 
 			while (Unsafe.IsAddressLessThan(ref start, ref end))
 			{
-				InternalQuery(start.Archetype, fn, terms);
+				if (!withouts.ContainsKey(start.ComponentID))
+					InternalQuery(start.Archetype, fn, terms, withouts);
 
 				start = ref Unsafe.Add(ref start, 1);
 			}
@@ -779,6 +788,7 @@ internal static class Query<TQuery, TFilter> where TQuery : struct where TFilter
 	{
 		public static readonly ImmutableArray<Term> Terms;
 		public static readonly ImmutableArray<Term> Columns;
+		public static readonly ImmutableDictionary<ulong, Term> Withs, Withouts;
 		public static readonly ulong Hash;
 
 		static Query()
@@ -790,13 +800,17 @@ static Query()
 			ParseType<TFilter>(list);
 			Terms = list.ToImmutableArray();
 
-			Hash = GetHash(Terms.AsSpan());
+			Withs = list.Where(s => s.Op == TermOp.With).ToImmutableDictionary(s => s.ID, k => k);
+			Withouts = list.Where(s => s.Op == TermOp.Without).ToImmutableDictionary(s => s.ID, k => k);
+
+			Hash = GetHash(Withs.Values.ToArray());
 		}
 	}
 
 	internal static class Query<T> where T : struct
 	{
 		public static readonly ImmutableArray<Term> Terms;
+		public static readonly ImmutableDictionary<ulong, Term> Withs, Withouts;
 		public static readonly ulong Hash;
 
 		static Query()
@@ -805,7 +819,10 @@ static Query()
 			ParseType<T>(list);
 			Terms = list.ToImmutableArray();
 
-			Hash = GetHash(Terms.AsSpan());
+			Withs = list.Where(s => s.Op == TermOp.With).ToImmutableDictionary(s => s.ID, k => k);
+			Withouts = list.Where(s => s.Op == TermOp.Without).ToImmutableDictionary(s => s.ID, k => k);
+
+			Hash = GetHash(Withs.Values.ToArray());
 		}
 	}
 }