From 1a81f83256db2836003a39c79ecf8334a994c7ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 23:10:53 -0400 Subject: [PATCH] Bump ext/flecs from `f006bdc` to `83d7468` (#159) * Bump ext/flecs from `f006bdc` to `83d7468` Bumps [ext/flecs](https://github.com/SanderMertens/flecs) from `f006bdc` to `83d7468`. - [Release notes](https://github.com/SanderMertens/flecs/releases) - [Commits](https://github.com/SanderMertens/flecs/compare/f006bdc31352fb9a513ac54d323e2c0c54089142...83d74680a3506802c3f9c3805d44493db37546a4) --- updated-dependencies: - dependency-name: ext/flecs dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update C# bindings --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: lithiumtoast --- ext/flecs | 2 +- src/cs/production/Flecs/flecs.cs | 203 +++++++++++++------------------ 2 files changed, 84 insertions(+), 121 deletions(-) diff --git a/ext/flecs b/ext/flecs index f006bdc..83d7468 160000 --- a/ext/flecs +++ b/ext/flecs @@ -1 +1 @@ -Subproject commit f006bdc31352fb9a513ac54d323e2c0c54089142 +Subproject commit 83d74680a3506802c3f9c3805d44493db37546a4 diff --git a/src/cs/production/Flecs/flecs.cs b/src/cs/production/Flecs/flecs.cs index 919f933..7ad55dd 100644 --- a/src/cs/production/Flecs/flecs.cs +++ b/src/cs/production/Flecs/flecs.cs @@ -1,6 +1,6 @@ // -// This code was generated by the following tool on 2023-05-03 23:17:03 GMT+00:00: -// https://github.com/bottlenoselabs/c2cs (v5.1.0.0) +// This code was generated by the following tool on 2023-05-08 02:17:44 GMT+00:00: +// https://github.com/bottlenoselabs/c2cs (v5.1.5.0) // // Changes to this file may cause incorrect behavior and will be lost if the code is // regenerated. To extend or add functionality use a partial class in a new file. @@ -563,6 +563,10 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern ecs_entity_t* ecs_get_lookup_path(ecs_world_t* world); + [CNode(Kind = "Function")] + [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] + public static extern ecs_entity_t ecs_get_max_id(ecs_world_t* world); + [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void* ecs_get_mut_id(ecs_world_t* world, ecs_entity_t entity, ecs_id_t id); @@ -2399,10 +2403,6 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void flecs_sparse_clear(ecs_sparse_t* sparse); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern void flecs_sparse_copy(ecs_sparse_t* dst, ecs_sparse_t* src); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern int flecs_sparse_count(ecs_sparse_t* sparse); @@ -2415,10 +2415,6 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void* flecs_sparse_ensure_fast(ecs_sparse_t* sparse, ecs_size_t elem_size, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern CBool flecs_sparse_exists(ecs_sparse_t* sparse, ulong id); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void flecs_sparse_fini(ecs_sparse_t* sparse); @@ -2431,10 +2427,6 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void* flecs_sparse_get_any(ecs_sparse_t* sparse, ecs_size_t elem_size, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern ulong flecs_sparse_get_current(ecs_sparse_t* sparse, ulong id); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void* flecs_sparse_get_dense(ecs_sparse_t* sparse, ecs_size_t elem_size, int index); @@ -2451,10 +2443,6 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern CBool flecs_sparse_is_alive(ecs_sparse_t* sparse, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern CBool flecs_sparse_is_valid(ecs_sparse_t* sparse, ulong index); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern ulong flecs_sparse_last_id(ecs_sparse_t* sparse); @@ -2463,46 +2451,18 @@ public static unsafe partial class flecs [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern ulong flecs_sparse_new_id(ecs_sparse_t* sparse); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern ulong* flecs_sparse_new_ids(ecs_sparse_t* sparse, int count); - - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern int flecs_sparse_not_alive_count(ecs_sparse_t* sparse); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void flecs_sparse_remove(ecs_sparse_t* sparse, ecs_size_t elem_size, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern void flecs_sparse_restore(ecs_sparse_t* dst, ecs_sparse_t* src); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void flecs_sparse_set_generation(ecs_sparse_t* sparse, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern void flecs_sparse_set_id_source(ecs_sparse_t* sparse, ulong* id_source); - - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern void flecs_sparse_set_size(ecs_sparse_t* sparse, int elem_count); - - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern int flecs_sparse_size(ecs_sparse_t* sparse); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern void* flecs_sparse_try(ecs_sparse_t* sparse, ecs_size_t elem_size, ulong id); - [CNode(Kind = "Function")] - [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] - public static extern void* flecs_sparse_try_ensure(ecs_sparse_t* sparse, ecs_size_t size, ulong index); - [CNode(Kind = "Function")] [DllImport(LibraryName, CallingConvention = CallingConvention.Cdecl)] public static extern CString flecs_strdup(ecs_allocator_t* a, CString str); @@ -3340,13 +3300,13 @@ public struct EcsWorldStats } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 136, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 128, Pack = 8)] public struct ecs_allocator_t { [FieldOffset(0)] // size = 48 public ecs_block_allocator_t chunks; - [FieldOffset(48)] // size = 88 + [FieldOffset(48)] // size = 80 public ecs_sparse_t sizes; } @@ -4661,7 +4621,7 @@ public struct ecs_metric_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 448, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 440, Pack = 8)] public struct ecs_observable_t { [FieldOffset(0)] // size = 72 @@ -4679,7 +4639,7 @@ public struct ecs_observable_t [FieldOffset(288)] // size = 72 public ecs_event_record_t on_wildcard; - [FieldOffset(360)] // size = 88 + [FieldOffset(360)] // size = 80 public ecs_sparse_t events; } @@ -5146,6 +5106,9 @@ public struct ecs_record_t [FieldOffset(16)] // size = 4 public uint row; + + [FieldOffset(20)] // size = 4 + public int dense; } [CNode(Kind = "Struct")] @@ -5267,7 +5230,7 @@ public struct ecs_snapshot_iter_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 80, Pack = 8)] public struct ecs_sparse_t { [FieldOffset(0)] // size = 24 @@ -5283,15 +5246,12 @@ public struct ecs_sparse_t public int count; [FieldOffset(56)] // size = 8 - public ulong max_id_local; + public ulong max_id; [FieldOffset(64)] // size = 8 - public ulong* max_id; - - [FieldOffset(72)] // size = 8 public ecs_allocator_t* allocator; - [FieldOffset(80)] // size = 8 + [FieldOffset(72)] // size = 8 public ecs_block_allocator_t* page_allocator; } @@ -5878,127 +5838,124 @@ public struct ecs_worker_iter_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 304, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 296, Pack = 8)] public struct ecs_world_info_t { [FieldOffset(0)] // size = 8 public ecs_entity_t last_component_id; [FieldOffset(8)] // size = 8 - public ecs_entity_t last_id; - - [FieldOffset(16)] // size = 8 public ecs_entity_t min_id; - [FieldOffset(24)] // size = 8 + [FieldOffset(16)] // size = 8 public ecs_entity_t max_id; - [FieldOffset(32)] // size = 4 + [FieldOffset(24)] // size = 4 public float delta_time_raw; - [FieldOffset(36)] // size = 4 + [FieldOffset(28)] // size = 4 public float delta_time; - [FieldOffset(40)] // size = 4 + [FieldOffset(32)] // size = 4 public float time_scale; - [FieldOffset(44)] // size = 4 + [FieldOffset(36)] // size = 4 public float target_fps; - [FieldOffset(48)] // size = 4 + [FieldOffset(40)] // size = 4 public float frame_time_total; - [FieldOffset(52)] // size = 4 + [FieldOffset(44)] // size = 4 public float system_time_total; - [FieldOffset(56)] // size = 4 + [FieldOffset(48)] // size = 4 public float emit_time_total; - [FieldOffset(60)] // size = 4 + [FieldOffset(52)] // size = 4 public float merge_time_total; - [FieldOffset(64)] // size = 4 + [FieldOffset(56)] // size = 4 public float world_time_total; - [FieldOffset(68)] // size = 4 + [FieldOffset(60)] // size = 4 public float world_time_total_raw; - [FieldOffset(72)] // size = 4 + [FieldOffset(64)] // size = 4 public float rematch_time_total; - [FieldOffset(80)] // size = 8 + [FieldOffset(72)] // size = 8 public long frame_count_total; - [FieldOffset(88)] // size = 8 + [FieldOffset(80)] // size = 8 public long merge_count_total; - [FieldOffset(96)] // size = 8 + [FieldOffset(88)] // size = 8 public long rematch_count_total; - [FieldOffset(104)] // size = 8 + [FieldOffset(96)] // size = 8 public long id_create_total; - [FieldOffset(112)] // size = 8 + [FieldOffset(104)] // size = 8 public long id_delete_total; - [FieldOffset(120)] // size = 8 + [FieldOffset(112)] // size = 8 public long table_create_total; - [FieldOffset(128)] // size = 8 + [FieldOffset(120)] // size = 8 public long table_delete_total; - [FieldOffset(136)] // size = 8 + [FieldOffset(128)] // size = 8 public long pipeline_build_count_total; - [FieldOffset(144)] // size = 8 + [FieldOffset(136)] // size = 8 public long systems_ran_frame; - [FieldOffset(152)] // size = 8 + [FieldOffset(144)] // size = 8 public long observers_ran_frame; - [FieldOffset(160)] // size = 4 + [FieldOffset(152)] // size = 4 public int id_count; - [FieldOffset(164)] // size = 4 + [FieldOffset(156)] // size = 4 public int tag_id_count; - [FieldOffset(168)] // size = 4 + [FieldOffset(160)] // size = 4 public int component_id_count; - [FieldOffset(172)] // size = 4 + [FieldOffset(164)] // size = 4 public int pair_id_count; - [FieldOffset(176)] // size = 4 + [FieldOffset(168)] // size = 4 public int wildcard_id_count; - [FieldOffset(180)] // size = 4 + [FieldOffset(172)] // size = 4 public int table_count; - [FieldOffset(184)] // size = 4 + [FieldOffset(176)] // size = 4 public int tag_table_count; - [FieldOffset(188)] // size = 4 + [FieldOffset(180)] // size = 4 public int trivial_table_count; - [FieldOffset(192)] // size = 4 + [FieldOffset(184)] // size = 4 public int empty_table_count; - [FieldOffset(196)] // size = 4 + [FieldOffset(188)] // size = 4 public int table_record_count; - [FieldOffset(200)] // size = 4 + [FieldOffset(192)] // size = 4 public int table_storage_count; - [FieldOffset(208)] // size = 88 - public ecs_world_info_t_ANONYMOUS_FIELD36 cmd; + [FieldOffset(200)] // size = 88 + public ecs_world_info_t_ANONYMOUS_FIELD35 cmd; - [FieldOffset(296)] // size = 8 + [FieldOffset(288)] // size = 8 public CString name_prefix; } [CNode(Kind = "Struct")] [StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)] - public struct ecs_world_info_t_ANONYMOUS_FIELD36 + public struct ecs_world_info_t_ANONYMOUS_FIELD35 { [FieldOffset(0)] // size = 8 public long add_count; @@ -7666,22 +7623,22 @@ public struct ecs_xtor_t public const uint EcsIdDontInherit = 128; [CNode(Kind = "MacroObject")] - public const uint EcsIdEventMask = 491520; + public const uint EcsIdEventMask = 983040; [CNode(Kind = "MacroObject")] public const uint EcsIdExclusive = 64; [CNode(Kind = "MacroObject")] - public const uint EcsIdHasOnAdd = 32768; + public const uint EcsIdHasOnAdd = 65536; [CNode(Kind = "MacroObject")] - public const uint EcsIdHasOnRemove = 65536; + public const uint EcsIdHasOnRemove = 131072; [CNode(Kind = "MacroObject")] - public const uint EcsIdHasOnSet = 131072; + public const uint EcsIdHasOnSet = 262144; [CNode(Kind = "MacroObject")] - public const uint EcsIdHasUnSet = 262144; + public const uint EcsIdHasUnSet = 524288; [CNode(Kind = "MacroObject")] public const uint EcsIdMarkedForDelete = 1073741824; @@ -7810,7 +7767,7 @@ public struct ecs_xtor_t public const uint EcsSelf = 2; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasAddActions = 168200; + public const uint EcsTableHasAddActions = 336392; [CNode(Kind = "MacroObject")] public const uint EcsTableHasBuiltins = 2; @@ -7819,64 +7776,67 @@ public struct ecs_xtor_t public const uint EcsTableHasChildOf = 16; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasCopy = 1024; + public const uint EcsTableHasCopy = 2048; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasCtors = 256; + public const uint EcsTableHasCtors = 512; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasDtors = 512; + public const uint EcsTableHasDtors = 1024; [CNode(Kind = "MacroObject")] public const uint EcsTableHasIsA = 8; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasLifecycle = 768; + public const uint EcsTableHasLifecycle = 1536; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasModule = 64; + public const uint EcsTableHasModule = 128; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasMove = 2048; + public const uint EcsTableHasMove = 4096; + + [CNode(Kind = "MacroObject")] + public const uint EcsTableHasName = 32; [CNode(Kind = "MacroObject")] public const uint EcsTableHasObserved = 1048576; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasOnAdd = 32768; + public const uint EcsTableHasOnAdd = 65536; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasOnRemove = 65536; + public const uint EcsTableHasOnRemove = 131072; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasOnSet = 131072; + public const uint EcsTableHasOnSet = 262144; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasOverrides = 16384; + public const uint EcsTableHasOverrides = 32768; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasPairs = 32; + public const uint EcsTableHasPairs = 64; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasRemoveActions = 328200; + public const uint EcsTableHasRemoveActions = 656392; [CNode(Kind = "MacroObject")] public const uint EcsTableHasTarget = 2097152; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasToggle = 8192; + public const uint EcsTableHasToggle = 16384; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasUnSet = 262144; + public const uint EcsTableHasUnSet = 524288; [CNode(Kind = "MacroObject")] - public const uint EcsTableHasUnion = 4096; + public const uint EcsTableHasUnion = 8192; [CNode(Kind = "MacroObject")] - public const uint EcsTableIsComplex = 13056; + public const uint EcsTableIsComplex = 26112; [CNode(Kind = "MacroObject")] - public const uint EcsTableIsDisabled = 128; + public const uint EcsTableIsDisabled = 256; [CNode(Kind = "MacroObject")] public const uint EcsTableIsPrefab = 4; @@ -7938,6 +7898,9 @@ public struct ecs_xtor_t [CNode(Kind = "MacroObject")] public const uint EcsWorldReadonly = 2; + [CNode(Kind = "MacroObject")] + public const int FLECS_ENTITY_PAGE_BITS = 12; + [CNode(Kind = "MacroObject")] public const int FLECS_HI_COMPONENT_ID = 256;