diff --git a/src/gaemstone/ECS/Entity.cs b/src/gaemstone/ECS/Entity.cs index 9b04c0e..b64df7d 100644 --- a/src/gaemstone/ECS/Entity.cs +++ b/src/gaemstone/ECS/Entity.cs @@ -42,8 +42,6 @@ public readonly struct Entity public static bool operator ==(Entity left, Entity right) => left.Equals(right); public static bool operator !=(Entity left, Entity right) => !left.Equals(right); - public static Identifier operator &(Entity relation, Entity target) => Identifier.Pair(relation, target); - public static implicit operator ecs_entity_t(Entity e) => e.Value; public static implicit operator Identifier(Entity e) => new(e.Value.Data); public static implicit operator ecs_id_t(Entity e) => e.Value.Data; diff --git a/src/gaemstone/ECS/EntityBase.cs b/src/gaemstone/ECS/EntityBase.cs index 8e44624..a494627 100644 --- a/src/gaemstone/ECS/EntityBase.cs +++ b/src/gaemstone/ECS/EntityBase.cs @@ -23,19 +23,19 @@ public abstract class EntityBase public TReturn Add(string symbol) => Add(Universe.LookupSymbolOrThrow(symbol)); public TReturn Add() => Add(Universe.LookupOrThrow(typeof(T))); - public TReturn Add(Entity relation, Entity target) => Add(relation & target); + public TReturn Add(Entity relation, Entity target) => Add(Identifier.Pair(relation, target)); public TReturn Add(Entity target) => Add(Universe.LookupOrThrow(), target); public TReturn Add() => Add(Universe.LookupOrThrow(), Universe.LookupOrThrow()); public TReturn Remove(string symbol) => Remove(Universe.LookupSymbolOrThrow(symbol)); public TReturn Remove() => Remove(Universe.LookupOrThrow(typeof(T))); - public TReturn Remove(Entity relation, Entity target) => Remove(relation & target); + public TReturn Remove(Entity relation, Entity target) => Remove(Identifier.Pair(relation, target)); public TReturn Remove(Entity target) => Remove(Universe.LookupOrThrow(), target); public TReturn Remove() => Remove(Universe.LookupOrThrow(), Universe.LookupOrThrow()); public bool Has(string symbol) => Has(Universe.LookupSymbolOrThrow(symbol)); public bool Has() => Has(Universe.LookupOrThrow(typeof(T))); - public bool Has(Entity relation, Entity target) => Has(relation & target); + public bool Has(Entity relation, Entity target) => Has(Identifier.Pair(relation, target)); public bool Has(Entity target) => Has(Universe.LookupOrThrow(), target); public bool Has() => Has(Universe.LookupOrThrow(), Universe.LookupOrThrow()); diff --git a/src/gaemstone/ECS/EntityRef.cs b/src/gaemstone/ECS/EntityRef.cs index 9fb41bd..f660077 100644 --- a/src/gaemstone/ECS/EntityRef.cs +++ b/src/gaemstone/ECS/EntityRef.cs @@ -161,9 +161,6 @@ public unsafe sealed class EntityRef public static bool operator ==(EntityRef? left, EntityRef? right) => ReferenceEquals(left, right) || (left?.Equals(right) ?? false); public static bool operator !=(EntityRef? left, EntityRef? right) => !(left == right); - public static IdentifierRef operator &(EntityRef relation, Entity target) => IdentifierRef.Pair(relation, target); - public static IdentifierRef operator &(Entity relation, EntityRef target) => IdentifierRef.Pair(relation, target); - public static implicit operator Entity(EntityRef? e) => e?.Entity ?? default; public static implicit operator ecs_entity_t(EntityRef? e) => e?.Entity.Value ?? default;