Compile fixes and V3 update adjustments

src/cs/examples/Flecs.Examples.HelloWorld/Program.cs

@@ -34,8 +34,8 @@ internal static class Program
     // components they have, and each group has its own set of component arrays.
     private static void Move(Iterator iterator)
     {
-        var p = iterator.Term<Position>(1);
-        var v = iterator.Term<Velocity>(2);
+        var p = iterator.Field<Position>(1);
+        var v = iterator.Field<Velocity>(2);
 
         // Print the set of components for the iterated over entities
         var tableString = iterator.Table().String();

src/cs/examples/entities/Flecs.Examples.Entities.Basics/Program.cs

@@ -50,7 +50,7 @@ static int Main(string[] args)
         var it = world.EntityIterator<Position>();
         while (it.HasNext()) 
         {
-            var p = it.Term<Position>(1);
+            var p = it.Field<Position>(1);
             for (var i = 0; i < it.Count; i ++)
             {
                 var entity = it.Entity(i);

src/cs/examples/entities/Flecs.Examples.Entities.IterateComponents/Program.cs

@@ -103,7 +103,7 @@ private static void IterateComponents(Entity entity)
                 var pair = identifier.AsPair();
                 var relationName = pair.First.Name();
                 var objectName = pair.Second.Name();
-                Console.Write("Relation: " + relationName + ", Object: " + objectName);
+                Console.Write("First: " + relationName + ", Second: " + objectName);
             }
             else
             {

src/cs/production/Flecs/EntityIterator.cs

@@ -33,13 +33,13 @@ public bool HasNext()
         }
     }
 
-    public Span<T> Term<T>(int index)
+    public Span<T> Field<T>(int index)
     {
         fixed (EntityIterator* @this = &this)
         {
             var handlePointer = &@this->Handle;
             var structSize = Marshal.SizeOf<T>();
-            var pointer = ecs_term_w_size(handlePointer, (ulong) structSize, index);
+            var pointer = ecs_field_w_size(handlePointer, (ulong) structSize, index);
             return new Span<T>(pointer, Handle.count);
         }
     }

src/cs/production/Flecs/Flecs.csproj

@@ -21,6 +21,9 @@
         <EnableAnalyzersStyleCop>true</EnableAnalyzersStyleCop>
         <StyleCopSettingsFilePath>$(MSBuildThisFileDirectory)/Properties/StyleCop.json</StyleCopSettingsFilePath>
     </PropertyGroup>
+    <ItemGroup>
+      <Content Remove="flecs.cs" />
+    </ItemGroup>
 
     <!-- NuGet package references -->
     <ItemGroup>

src/cs/production/Flecs/Iterator.cs

@@ -22,10 +22,10 @@ internal Iterator(World world, ecs_iter_t* it)
         Handle = it;
     }
 
-    public Span<T> Term<T>(int index)
+    public Span<T> Field<T>(int index)
     {
         var structSize = Marshal.SizeOf<T>();
-        var pointer = ecs_term_w_size(Handle, (ulong) structSize, index);
+        var pointer = ecs_field_w_size(Handle, (ulong) structSize, index);
         return new Span<T>(pointer, Handle->count);
     }
 

src/cs/production/Flecs/World.cs

@@ -48,16 +48,13 @@ public void RegisterComponent<TComponent>(ComponentHooks? hooks = null)
         var structSize = Unsafe.SizeOf<TComponent>();
         var structAlignment = structLayoutAttribute!.Pack;
 
-        var id = default(ecs_entity_t);
+        var id = CreateEntityRaw(componentName);
         ecs_component_desc_t desc;
-        desc.entity.entity = id;
-        desc.entity.name = componentNameC;
-        desc.entity.symbol = componentNameC;
+        desc.entity = id;
         desc.type.size = structSize;
         desc.type.alignment = structAlignment;
         id = ecs_component_init(Handle, &desc);
         _componentIdentifiersByType[typeof(TComponent)] = id.Data.Data;
-
         SetHooks(hooks, id);
     }
 
@@ -97,26 +94,24 @@ public void RegisterSystem<TComponent1, TComponent2>(
         CallbackIterator callback, string? name = null)
     {
         ecs_system_desc_t desc = default;
-        desc.entity.name = name ?? callback.Method.Name;
+        desc.query.filter.name = name ?? callback.Method.Name;
         var phase = EcsOnUpdate;
-        desc.entity.add[0] = phase.Data != 0 ? ecs_pair(EcsDependsOn, phase) : default;
-        desc.entity.add[1] = phase;
-        desc.callback.Data.Pointer = &SystemCallback;
-        desc.binding_ctx = (void*)CallbacksHelper.CreateSystemCallbackContext(this, callback);
+        FillSystemDescriptorCommon(ref desc, callback, phase, name);
 
         var componentName1 = GetFlecsTypeName<TComponent1>();
         var componentName2 = GetFlecsTypeName<TComponent2>();
         desc.query.filter.expr = componentName1 + ", " + componentName2;
-
         ecs_system_init(Handle, &desc);
     }
 
     private void FillSystemDescriptorCommon(
         ref ecs_system_desc_t desc, CallbackIterator callback, ecs_entity_t phase, string? name)
     {
-        desc.entity.name = name ?? callback.Method.Name;
-        desc.entity.add[0] = phase.Data != 0 ? ecs_pair(EcsDependsOn, phase) : default;
-        desc.entity.add[1] = phase;
+        ecs_entity_desc_t edesc = default;
+        edesc.name = name ?? callback.Method.Name;
+        edesc.add[0] = phase.Data != 0 ? ecs_pair(EcsDependsOn, phase) : default;
+        edesc.add[1] = phase;
+        desc.entity = ecs_entity_init(Handle, &edesc);
         desc.callback.Data.Pointer = &SystemCallback;
         desc.binding_ctx = (void*)CallbacksHelper.CreateSystemCallbackContext(this, callback);
     }
@@ -130,12 +125,18 @@ private static void SystemCallback(ecs_iter_t* it)
         data.Callback(iterator);
     }
 
-    public Entity CreateEntity(string name)
+    private ecs_entity_t CreateEntityRaw(string name)
     {
         var desc = default(ecs_entity_desc_t);
         desc.name = name;
 
         var entity = ecs_entity_init(Handle, &desc);
+        return entity;
+    }
+
+    public Entity CreateEntity(string name)
+    {
+        var entity = CreateEntityRaw(name);
         var result = new Entity(this, entity);
         return result;
     }