feat operations filter in system and observer

Author: elebras1

examples/src/main/java/com/github/elebras1/flecs/examples/ObserverExample.java

@@ -48,7 +48,7 @@ public static void main(String[] args) {
             e3.set(new Velocity(2.0f, 2.0f));
             e3.remove(Velocity.class);
 
-            world.observer().with(Position.class).with(Velocity.class).filter().event(EcsOnAdd).each((entityId) ->
+            world.observer().with(Position.class).with(Velocity.class).inOut().event(EcsOnAdd).each((entityId) ->
                     System.out.println("Position added to entity with Velocity: " + entityId)
             );
 

src/main/java/com/github/elebras1/flecs/Field.java

@@ -1,6 +1,5 @@
 package com.github.elebras1.flecs;
 
-import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 public class Field<T> {

src/main/java/com/github/elebras1/flecs/FlecsObserver.java

@@ -1,7 +1,7 @@
 package com.github.elebras1.flecs;
 
 public class FlecsObserver {
-    
+
     private final World world;
     private final long observerId;
 
@@ -14,10 +14,6 @@ public long id() {
         return this.observerId;
     }
 
-    public World world() {
-        return this.world;
-    }
-
     public void enable() {
         flecs_h.ecs_enable(this.world.nativeHandle(), this.observerId, true);
     }

src/main/java/com/github/elebras1/flecs/ObserverBuilder.java

@@ -1,5 +1,7 @@
 package com.github.elebras1.flecs;
 
+import com.github.elebras1.flecs.util.FlecsConstants;
+
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.ValueLayout;
@@ -101,47 +103,98 @@ public ObserverBuilder with(long relationId, long objectId) {
         return this;
     }
 
-    public ObserverBuilder without(long componentId) {
-        this.with(componentId);
-
+    public ObserverBuilder in() {
         if (this.termCount == 0) {
-            throw new IllegalStateException("No term to apply 'without' modifier to");
+            throw new IllegalStateException("No term to apply 'in' modifier to");
         }
 
-        MemorySegment queryDesc = ecs_observer_desc_t.query(this.desc);
+        MemorySegment queryDesc = ecs_system_desc_t.query(this.desc);
         long termsOffset = ecs_query_desc_t.terms$offset();
         long termOffset = termsOffset + ((this.termCount - 1) * TERM_SIZE);
 
         MemorySegment term = queryDesc.asSlice(termOffset, TERM_SIZE);
-        long operOffset = ecs_term_t.oper$offset();
+        long inoutOffset = ecs_term_t.inout$offset();
 
-        term.set(ValueLayout.JAVA_SHORT, operOffset, (short) EcsNot);
+        term.set(ValueLayout.JAVA_INT, inoutOffset, EcsIn);
 
         return this;
     }
 
-    public <T> ObserverBuilder without(Class<T> componentClass) {
-        long componentId = this.world.componentRegistry().getComponentId(componentClass);
-        return this.without(componentId);
+    public ObserverBuilder out() {
+        if (this.termCount == 0) {
+            throw new IllegalStateException("No term to apply 'out' modifier to");
+        }
+
+        MemorySegment queryDesc = ecs_system_desc_t.query(this.desc);
+        long termsOffset = ecs_query_desc_t.terms$offset();
+        long termOffset = termsOffset + ((this.termCount - 1) * TERM_SIZE);
+
+        MemorySegment term = queryDesc.asSlice(termOffset, TERM_SIZE);
+        long inoutOffset = ecs_term_t.inout$offset();
+
+        term.set(ValueLayout.JAVA_INT, inoutOffset, EcsOut);
+
+        return this;
     }
 
-    public ObserverBuilder filter() {
+    public ObserverBuilder inOut() {
         if (this.termCount == 0) {
-            throw new IllegalStateException("No term to apply 'filter' modifier to");
+            throw new IllegalStateException("No term to apply 'inout' modifier to");
         }
 
-        MemorySegment queryDesc = ecs_observer_desc_t.query(this.desc);
+        MemorySegment queryDesc = ecs_system_desc_t.query(this.desc);
         long termsOffset = ecs_query_desc_t.terms$offset();
         long termOffset = termsOffset + ((this.termCount - 1) * TERM_SIZE);
 
         MemorySegment term = queryDesc.asSlice(termOffset, TERM_SIZE);
         long inoutOffset = ecs_term_t.inout$offset();
 
-        term.set(ValueLayout.JAVA_SHORT, inoutOffset, (short) EcsIn);
+        term.set(ValueLayout.JAVA_INT, inoutOffset, EcsInOut);
+
+        return this;
+    }
+
+    public ObserverBuilder operator(int operator) {
+        if (this.termCount == 0) {
+            throw new IllegalStateException("No term to apply 'operator' modifier to");
+        }
+
+        long termsOffset = ecs_query_desc_t.terms$offset();
+        long termOffset = termsOffset + ((this.termCount - 1) * TERM_SIZE);
 
+        MemorySegment term = this.desc.asSlice(termOffset, TERM_SIZE);
+        ecs_term_t.oper(term, (short) operator);
         return this;
     }
 
+    public ObserverBuilder and() {
+        return this.operator(FlecsConstants.EcsAnd);
+    }
+
+    public ObserverBuilder or() {
+        return this.operator(FlecsConstants.EcsOr);
+    }
+
+    public ObserverBuilder not() {
+        return this.operator(FlecsConstants.EcsNot);
+    }
+
+    public ObserverBuilder optional() {
+        return this.operator(FlecsConstants.EcsOptional);
+    }
+
+    public ObserverBuilder andFrom() {
+        return this.operator(FlecsConstants.EcsAndFrom);
+    }
+
+    public ObserverBuilder orFrom() {
+        return this.operator(FlecsConstants.EcsOrFrom);
+    }
+
+    public ObserverBuilder notFrom() {
+        return this.operator(FlecsConstants.EcsNotFrom);
+    }
+
     public ObserverBuilder yieldExisting() {
         ecs_observer_desc_t.yield_existing(this.desc, true);
         return this;

src/main/java/com/github/elebras1/flecs/SystemBuilder.java

@@ -1,5 +1,7 @@
 package com.github.elebras1.flecs;
 
+import com.github.elebras1.flecs.util.FlecsConstants;
+
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.ValueLayout;
@@ -171,6 +173,47 @@ public SystemBuilder inOut() {
         return this;
     }
 
+    public SystemBuilder operator(int operator) {
+        if (this.termCount == 0) {
+            throw new IllegalStateException("No term to apply 'operator' modifier to");
+        }
+
+        long termsOffset = ecs_query_desc_t.terms$offset();
+        long termOffset = termsOffset + ((this.termCount - 1) * TERM_SIZE);
+
+        MemorySegment term = this.desc.asSlice(termOffset, TERM_SIZE);
+        ecs_term_t.oper(term, (short) operator);
+        return this;
+    }
+
+    public SystemBuilder and() {
+        return this.operator(FlecsConstants.EcsAnd);
+    }
+
+    public SystemBuilder or() {
+        return this.operator(FlecsConstants.EcsOr);
+    }
+
+    public SystemBuilder not() {
+        return this.operator(FlecsConstants.EcsNot);
+    }
+
+    public SystemBuilder optional() {
+        return this.operator(FlecsConstants.EcsOptional);
+    }
+
+    public SystemBuilder andFrom() {
+        return this.operator(FlecsConstants.EcsAndFrom);
+    }
+
+    public SystemBuilder orFrom() {
+        return this.operator(FlecsConstants.EcsOrFrom);
+    }
+
+    public SystemBuilder notFrom() {
+        return this.operator(FlecsConstants.EcsNotFrom);
+    }
+
     public <T> SystemBuilder write(Class<T> componentClass) {
         long componentId = this.world.componentRegistry().getComponentId(componentClass);
         return this.with(componentId).out();