From d3e4ab89565fb57e64ba1c184dc647afe03192a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 00:36:54 +0000 Subject: [PATCH 1/2] Bump ext/flecs from `10e2de3` to `41fb856` Bumps [ext/flecs](https://github.com/SanderMertens/flecs) from `10e2de3` to `41fb856`. - [Release notes](https://github.com/SanderMertens/flecs/releases) - [Commits](https://github.com/SanderMertens/flecs/compare/10e2de3e9e2b4922dd68e018c90aa8182ffdc3c1...41fb856c4e1162f44b59d7881ef508d64d56bf10) --- updated-dependencies: - dependency-name: ext/flecs dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ext/flecs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/flecs b/ext/flecs index 10e2de3..41fb856 160000 --- a/ext/flecs +++ b/ext/flecs @@ -1 +1 @@ -Subproject commit 10e2de3e9e2b4922dd68e018c90aa8182ffdc3c1 +Subproject commit 41fb856c4e1162f44b59d7881ef508d64d56bf10 From b38fee91361d397dbfb5b7c2763a93697b1da1ac Mon Sep 17 00:00:00 2001 From: lithiumtoast <519592+lithiumtoast@users.noreply.github.com> Date: Fri, 25 Aug 2023 00:43:53 +0000 Subject: [PATCH 2/2] Update C# bindings --- .../Generated/AssemblyAttributes.gen.cs | 2 +- .../Generated/PInvoke.gen.cs | 73 +++++++++++++------ .../Generated/AssemblyAttributes.gen.cs | 2 +- .../Generated/PInvoke.gen.cs | 72 ++++++++++++------ 4 files changed, 105 insertions(+), 44 deletions(-) diff --git a/src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs b/src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs index 4642d00..3f1fdac 100644 --- a/src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs +++ b/src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs @@ -1,6 +1,6 @@ // To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code. // -// This code was generated by the following tool on 2023-08-24 00:20:45 GMT+00:00: +// This code was generated by the following tool on 2023-08-25 00:39:40 GMT+00:00: // https://github.com/bottlenoselabs/c2cs (v6.1.3.0) // // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs b/src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs index 07b7356..606203d 100644 --- a/src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs +++ b/src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs @@ -1,6 +1,6 @@ // -// This code was generated by the following tool on 2023-08-24 00:20:45 GMT+00:00: +// This code was generated by the following tool on 2023-08-25 00:39:40 GMT+00:00: // https://github.com/bottlenoselabs/c2cs (v6.1.3.0) // // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. @@ -2292,6 +2292,11 @@ public static unsafe partial class PInvoke [UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })] public static partial CBool ecs_strbuf_append(ecs_strbuf_t* buffer, CString fmt); + [CNode(Kind = "Function")] + [LibraryImport(LibraryName, EntryPoint = "ecs_strbuf_appendbool")] + [UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })] + public static partial CBool ecs_strbuf_appendbool(ecs_strbuf_t* buffer, CBool v); + [CNode(Kind = "Function")] [LibraryImport(LibraryName, EntryPoint = "ecs_strbuf_appendch")] [UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })] @@ -3892,13 +3897,13 @@ public struct EcsOpaque } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 96, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 120, Pack = 8)] public struct EcsPipelineStats { [FieldOffset(0)] // size = 8 public EcsStatsHeader hdr; - [FieldOffset(8)] // size = 88 + [FieldOffset(8)] // size = 112 public ecs_pipeline_stats_t stats; } @@ -5417,7 +5422,7 @@ public struct ecs_iter_private_t_ANONYMOUS_FIELD0 } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 600, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 608, Pack = 8)] public struct ecs_iter_t { [FieldOffset(0)] // size = 8 @@ -5535,9 +5540,12 @@ public struct ecs_iter_t public ecs_iter_action_t callback; [FieldOffset(584)] // size = 8 - public ecs_iter_fini_action_t fini; + public ecs_iter_action_t set_var; [FieldOffset(592)] // size = 8 + public ecs_iter_fini_action_t fini; + + [FieldOffset(600)] // size = 8 public ecs_iter_t* chain_it; } @@ -6260,7 +6268,7 @@ public struct ecs_pipeline_desc_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 112, Pack = 8)] public struct ecs_pipeline_stats_t { [FieldOffset(0)] // size = 1 @@ -6269,19 +6277,22 @@ public struct ecs_pipeline_stats_t [FieldOffset(8)] // size = 24 public ecs_vec_t systems; - [FieldOffset(32)] // size = 40 + [FieldOffset(32)] // size = 24 + public ecs_vec_t sync_points; + + [FieldOffset(56)] // size = 40 public ecs_map_t system_stats; - [FieldOffset(72)] // size = 4 + [FieldOffset(96)] // size = 4 public int t; - [FieldOffset(76)] // size = 4 + [FieldOffset(100)] // size = 4 public int system_count; - [FieldOffset(80)] // size = 4 + [FieldOffset(104)] // size = 4 public int active_system_count; - [FieldOffset(84)] // size = 4 + [FieldOffset(108)] // size = 4 public int rebuild_count; } @@ -6815,6 +6826,32 @@ public struct ecs_struct_desc_t } } + [CNode(Kind = "Struct")] + [StructLayout(LayoutKind.Explicit, Size = 2424, Pack = 8)] + public struct ecs_sync_stats_t + { + [FieldOffset(0)] // size = 8 + public long first_; + + [FieldOffset(8)] // size = 1200 + public ecs_metric_t time_spent; + + [FieldOffset(1208)] // size = 1200 + public ecs_metric_t commands_enqueued; + + [FieldOffset(2408)] // size = 8 + public long last_; + + [FieldOffset(2416)] // size = 4 + public int system_count; + + [FieldOffset(2420)] // size = 1 + public CBool multi_threaded; + + [FieldOffset(2421)] // size = 1 + public CBool no_readonly; + } + [CNode(Kind = "Struct")] [StructLayout(LayoutKind.Explicit, Size = 2696, Pack = 8)] public struct ecs_system_desc_t @@ -6863,7 +6900,7 @@ public struct ecs_system_desc_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 8448, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 6048, Pack = 8)] public struct ecs_system_stats_t { [FieldOffset(0)] // size = 8 @@ -6875,19 +6912,13 @@ public struct ecs_system_stats_t [FieldOffset(1208)] // size = 1200 public ecs_metric_t invoke_count; - [FieldOffset(2408)] // size = 1200 - public ecs_metric_t active; - - [FieldOffset(3608)] // size = 1200 - public ecs_metric_t enabled; - - [FieldOffset(4808)] // size = 8 + [FieldOffset(2408)] // size = 8 public long last_; - [FieldOffset(4816)] // size = 1 + [FieldOffset(2416)] // size = 1 public CBool task; - [FieldOffset(4824)] // size = 3624 + [FieldOffset(2424)] // size = 3624 public ecs_query_stats_t query; } diff --git a/src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs b/src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs index 4add610..dd15caa 100644 --- a/src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs +++ b/src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs @@ -1,6 +1,6 @@ // To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code. // -// This code was generated by the following tool on 2023-08-24 00:21:00 GMT+00:00: +// This code was generated by the following tool on 2023-08-25 00:39:56 GMT+00:00: // https://github.com/bottlenoselabs/c2cs (v6.1.3.0) // // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/src/cs/production/Interop.Flecs.Unity/Generated/PInvoke.gen.cs b/src/cs/production/Interop.Flecs.Unity/Generated/PInvoke.gen.cs index a59c7a9..a9ce785 100644 --- a/src/cs/production/Interop.Flecs.Unity/Generated/PInvoke.gen.cs +++ b/src/cs/production/Interop.Flecs.Unity/Generated/PInvoke.gen.cs @@ -1,6 +1,6 @@ // -// This code was generated by the following tool on 2023-08-24 00:21:00 GMT+00:00: +// This code was generated by the following tool on 2023-08-25 00:39:56 GMT+00:00: // https://github.com/bottlenoselabs/c2cs (v6.1.3.0) // // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. @@ -1840,6 +1840,10 @@ public static unsafe partial class PInvoke [DllImport(LibraryName, EntryPoint = "ecs_strbuf_append", CallingConvention = CallingConvention.Cdecl)] public static extern CBool ecs_strbuf_append(ecs_strbuf_t* buffer, CString fmt); + [CNode(Kind = "Function")] + [DllImport(LibraryName, EntryPoint = "ecs_strbuf_appendbool", CallingConvention = CallingConvention.Cdecl)] + public static extern CBool ecs_strbuf_appendbool(ecs_strbuf_t* buffer, CBool v); + [CNode(Kind = "Function")] [DllImport(LibraryName, EntryPoint = "ecs_strbuf_appendch", CallingConvention = CallingConvention.Cdecl)] public static extern CBool ecs_strbuf_appendch(ecs_strbuf_t* buffer, CChar ch); @@ -3676,13 +3680,13 @@ public struct EcsOpaque } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 96, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 120, Pack = 8)] public struct EcsPipelineStats { [FieldOffset(0)] // size = 8 public EcsStatsHeader hdr; - [FieldOffset(8)] // size = 88 + [FieldOffset(8)] // size = 112 public ecs_pipeline_stats_t stats; } @@ -5201,7 +5205,7 @@ public struct ecs_iter_private_t_ANONYMOUS_FIELD0 } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 600, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 608, Pack = 8)] public struct ecs_iter_t { [FieldOffset(0)] // size = 8 @@ -5319,9 +5323,12 @@ public struct ecs_iter_t public ecs_iter_action_t callback; [FieldOffset(584)] // size = 8 - public ecs_iter_fini_action_t fini; + public ecs_iter_action_t set_var; [FieldOffset(592)] // size = 8 + public ecs_iter_fini_action_t fini; + + [FieldOffset(600)] // size = 8 public ecs_iter_t* chain_it; } @@ -6044,7 +6051,7 @@ public struct ecs_pipeline_desc_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 112, Pack = 8)] public struct ecs_pipeline_stats_t { [FieldOffset(0)] // size = 1 @@ -6053,19 +6060,22 @@ public struct ecs_pipeline_stats_t [FieldOffset(8)] // size = 24 public ecs_vec_t systems; - [FieldOffset(32)] // size = 40 + [FieldOffset(32)] // size = 24 + public ecs_vec_t sync_points; + + [FieldOffset(56)] // size = 40 public ecs_map_t system_stats; - [FieldOffset(72)] // size = 4 + [FieldOffset(96)] // size = 4 public int t; - [FieldOffset(76)] // size = 4 + [FieldOffset(100)] // size = 4 public int system_count; - [FieldOffset(80)] // size = 4 + [FieldOffset(104)] // size = 4 public int active_system_count; - [FieldOffset(84)] // size = 4 + [FieldOffset(108)] // size = 4 public int rebuild_count; } @@ -6599,6 +6609,32 @@ public struct ecs_struct_desc_t } } + [CNode(Kind = "Struct")] + [StructLayout(LayoutKind.Explicit, Size = 2424, Pack = 8)] + public struct ecs_sync_stats_t + { + [FieldOffset(0)] // size = 8 + public long first_; + + [FieldOffset(8)] // size = 1200 + public ecs_metric_t time_spent; + + [FieldOffset(1208)] // size = 1200 + public ecs_metric_t commands_enqueued; + + [FieldOffset(2408)] // size = 8 + public long last_; + + [FieldOffset(2416)] // size = 4 + public int system_count; + + [FieldOffset(2420)] // size = 1 + public CBool multi_threaded; + + [FieldOffset(2421)] // size = 1 + public CBool no_readonly; + } + [CNode(Kind = "Struct")] [StructLayout(LayoutKind.Explicit, Size = 2696, Pack = 8)] public struct ecs_system_desc_t @@ -6647,7 +6683,7 @@ public struct ecs_system_desc_t } [CNode(Kind = "Struct")] - [StructLayout(LayoutKind.Explicit, Size = 8448, Pack = 8)] + [StructLayout(LayoutKind.Explicit, Size = 6048, Pack = 8)] public struct ecs_system_stats_t { [FieldOffset(0)] // size = 8 @@ -6659,19 +6695,13 @@ public struct ecs_system_stats_t [FieldOffset(1208)] // size = 1200 public ecs_metric_t invoke_count; - [FieldOffset(2408)] // size = 1200 - public ecs_metric_t active; - - [FieldOffset(3608)] // size = 1200 - public ecs_metric_t enabled; - - [FieldOffset(4808)] // size = 8 + [FieldOffset(2408)] // size = 8 public long last_; - [FieldOffset(4816)] // size = 1 + [FieldOffset(2416)] // size = 1 public CBool task; - [FieldOffset(4824)] // size = 3624 + [FieldOffset(2424)] // size = 3624 public ecs_query_stats_t query; }