Skip to content
This repository has been archived by the owner on Oct 8, 2023. It is now read-only.

Commit

Permalink
Bump ext/flecs from c32c426 to b7bef98 (#206)
Browse files Browse the repository at this point in the history 
* Bump ext/flecs from `c32c426` to `b7bef98`

Bumps [ext/flecs](https://github.com/SanderMertens/flecs) from `c32c426` to `b7bef98`.
- [Release notes](https://github.com/SanderMertens/flecs/releases)
- [Commits](SanderMertens/flecs@c32c426...b7bef98)

---
updated-dependencies:
- dependency-name: ext/flecs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update C# bindings

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: lithiumtoast <519592+lithiumtoast@users.noreply.github.com>
  • Loading branch information
@dependabot @lithiumtoast
dependabot[bot] and lithiumtoast committed Aug 23, 2023
1 parent 3ba21d5 commit 2cdef50
Show file tree
Hide file tree
Showing 5 changed files with 201 additions and 123 deletions.
2 changes: 1 addition & 1 deletion ext/flecs
Submodule flecs updated 58 files
+25 −26 docs/FlecsScriptTutorial.md
+0 −2 docs/Manual.md
+9 −5 docs/Queries.md
+10 −0 docs/RestApi.md
+184 −50 flecs.c
+113 −17 flecs.h
+79 −6 include/flecs.h
+1 −1 include/flecs/addons/cpp/mixins/observer/impl.hpp
+1 −1 include/flecs/addons/cpp/mixins/system/impl.hpp
+22 −4 include/flecs/addons/cpp/world.hpp
+7 −2 include/flecs/addons/json.h
+2 −2 include/flecs/addons/system.h
+1 −1 include/flecs/os_api.h
+99 −30 src/addons/json/serialize.c
+3 −0 src/addons/rest.c
+2 −2 src/addons/system/system.c
+2 −2 src/observer.c
+13 −1 src/private_types.h
+24 −0 src/query.c
+3 −8 src/storage/table.c
+38 −7 src/world.c
+7 −7 test/addons/src/MultiTaskThreadStaging.c
+7 −7 test/addons/src/MultiThreadStaging.c
+17 −17 test/addons/src/Run.c
+9 −9 test/addons/src/SystemCascade.c
+1 −1 test/addons/src/SystemManual.c
+13 −13 test/addons/src/SystemMisc.c
+38 −38 test/addons/src/SystemPeriodic.c
+3 −3 test/addons/src/System_w_Empty.c
+1 −1 test/addons/src/System_w_FromEntity.c
+19 −19 test/addons/src/System_w_FromParent.c
+2 −2 test/addons/src/System_w_FromSystem.c
+3 −3 test/addons/src/Tasks.c
+1 −1 test/addons/src/util.c
+10 −2 test/api/project.json
+14 −14 test/api/src/Monitor.c
+24 −24 test/api/src/Observer.c
+22 −22 test/api/src/ObserverOnSet.c
+12 −12 test/api/src/Pairs.c
+15 −15 test/api/src/Prefab.c
+100 −0 test/api/src/Query.c
+78 −78 test/api/src/SingleThreadStaging.c
+4 −4 test/api/src/Stresstests.c
+8 −5 test/api/src/Table.c
+6 −6 test/api/src/Trigger.c
+29 −29 test/api/src/TriggerOnAdd.c
+6 −6 test/api/src/TriggerOnRemove.c
+11 −11 test/api/src/TriggerOnSet.c
+56 −2 test/api/src/World.c
+42 −2 test/api/src/main.c
+1 −1 test/api/src/util.c
+5 −1 test/cpp_api/project.json
+52 −0 test/cpp_api/src/World.cpp
+21 −1 test/cpp_api/src/main.cpp
+5 −2 test/meta/project.json
+18 −0 test/meta/src/SerializeEntityToJson.c
+61 −0 test/meta/src/SerializeIterToJson.c
+17 −2 test/meta/src/main.c
2 changes: 1 addition & 1 deletion src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-08-21 00:45:40 GMT+00:00:
// This code was generated by the following tool on 2023-08-23 00:42:52 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.
Expand Down
165 changes: 103 additions & 62 deletions src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// <auto-generated>
// This code was generated by the following tool on 2023-08-21 00:45:40 GMT+00:00:
// This code was generated by the following tool on 2023-08-23 00:42:52 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.
Expand Down Expand Up @@ -603,9 +603,14 @@ public static unsafe partial class PInvoke
public static partial ecs_entity_t ecs_get_alive(ecs_world_t* world, ecs_entity_t e);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_context")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_context(ecs_world_t* world);
public static partial void* ecs_get_binding_ctx(ecs_world_t* world);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_ctx(ecs_world_t* world);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_depth")]
Expand Down Expand Up @@ -652,16 +657,6 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial CString ecs_get_name(ecs_world_t* world, ecs_entity_t entity);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_observer_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_observer_binding_ctx(ecs_world_t* world, ecs_entity_t observer);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_observer_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_observer_ctx(ecs_world_t* world, ecs_entity_t observer);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_parent")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -707,16 +702,6 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial CString ecs_get_symbol(ecs_world_t* world, ecs_entity_t entity);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_system_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_system_binding_ctx(ecs_world_t* world, ecs_entity_t system);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_system_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_get_system_ctx(ecs_world_t* world, ecs_entity_t system);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_get_table")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -1432,6 +1417,16 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial CBool ecs_observer_default_run_action(ecs_iter_t* it);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_observer_get_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_observer_get_binding_ctx(ecs_world_t* world, ecs_entity_t observer);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_observer_get_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_observer_get_ctx(ecs_world_t* world, ecs_entity_t observer);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_observer_init")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -1747,6 +1742,16 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void ecs_query_fini(ecs_query_t* query);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_query_get_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_query_get_binding_ctx(ecs_query_t* query);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_query_get_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_query_get_ctx(ecs_query_t* query);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_query_get_filter")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -2073,9 +2078,14 @@ public static unsafe partial class PInvoke
public static partial void ecs_set_automerge(ecs_world_t* world, CBool automerge);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_set_context")]
[LibraryImport(LibraryName, EntryPoint = "ecs_set_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void ecs_set_context(ecs_world_t* world, void* ctx);
public static partial void ecs_set_binding_ctx(ecs_world_t* world, void* ctx, ecs_ctx_free_t ctx_free);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_set_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void ecs_set_ctx(ecs_world_t* world, void* ctx, ecs_ctx_free_t ctx_free);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_set_entity_generation")]
Expand Down Expand Up @@ -2412,6 +2422,16 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial ecs_entity_t ecs_struct_init(ecs_world_t* world, ecs_struct_desc_t* desc);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_system_get_binding_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_system_get_binding_ctx(ecs_world_t* world, ecs_entity_t system);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_system_get_ctx")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial void* ecs_system_get_ctx(ecs_world_t* world, ecs_entity_t system);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_system_get_query")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -4644,24 +4664,27 @@ public struct ecs_entity_to_json_desc_t
public CBool serialize_color;

[FieldOffset(6)] // size = 1
public CBool serialize_id_labels;
public CBool serialize_ids;

[FieldOffset(7)] // size = 1
public CBool serialize_base;
public CBool serialize_id_labels;

[FieldOffset(8)] // size = 1
public CBool serialize_private;
public CBool serialize_base;

[FieldOffset(9)] // size = 1
public CBool serialize_hidden;
public CBool serialize_private;

[FieldOffset(10)] // size = 1
public CBool serialize_values;
public CBool serialize_hidden;

[FieldOffset(11)] // size = 1
public CBool serialize_type_info;
public CBool serialize_values;

[FieldOffset(12)] // size = 1
public CBool serialize_type_info;

[FieldOffset(13)] // size = 1
public CBool serialize_alerts;

[FieldOffset(16)] // size = 8
Expand Down Expand Up @@ -5519,55 +5542,61 @@ public struct ecs_iter_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 16, Pack = 1)]
[StructLayout(LayoutKind.Explicit, Size = 18, Pack = 1)]
public struct ecs_iter_to_json_desc_t
{
[FieldOffset(0)] // size = 1
public CBool serialize_term_ids;

[FieldOffset(1)] // size = 1
public CBool serialize_ids;
public CBool serialize_term_labels;

[FieldOffset(2)] // size = 1
public CBool serialize_sources;
public CBool serialize_ids;

[FieldOffset(3)] // size = 1
public CBool serialize_variables;
public CBool serialize_id_labels;

[FieldOffset(4)] // size = 1
public CBool serialize_is_set;
public CBool serialize_sources;

[FieldOffset(5)] // size = 1
public CBool serialize_values;
public CBool serialize_variables;

[FieldOffset(6)] // size = 1
public CBool serialize_entities;
public CBool serialize_is_set;

[FieldOffset(7)] // size = 1
public CBool serialize_entity_labels;
public CBool serialize_values;

[FieldOffset(8)] // size = 1
public CBool serialize_entity_ids;
public CBool serialize_entities;

[FieldOffset(9)] // size = 1
public CBool serialize_entity_names;
public CBool serialize_entity_labels;

[FieldOffset(10)] // size = 1
public CBool serialize_variable_labels;
public CBool serialize_entity_ids;

[FieldOffset(11)] // size = 1
public CBool serialize_variable_ids;
public CBool serialize_entity_names;

[FieldOffset(12)] // size = 1
public CBool serialize_colors;
public CBool serialize_variable_labels;

[FieldOffset(13)] // size = 1
public CBool measure_eval_duration;
public CBool serialize_variable_ids;

[FieldOffset(14)] // size = 1
public CBool serialize_type_info;
public CBool serialize_colors;

[FieldOffset(15)] // size = 1
public CBool measure_eval_duration;

[FieldOffset(16)] // size = 1
public CBool serialize_type_info;

[FieldOffset(17)] // size = 1
public CBool serialize_table;
}

Expand Down Expand Up @@ -6220,13 +6249,13 @@ public string expr
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2584, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 2616, Pack = 8)]
public struct ecs_pipeline_desc_t
{
[FieldOffset(0)] // size = 8
public ecs_entity_t entity;

[FieldOffset(8)] // size = 2576
[FieldOffset(8)] // size = 2608
public ecs_query_desc_t query;
}

Expand Down Expand Up @@ -6268,7 +6297,7 @@ public struct ecs_primitive_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2576, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 2608, Pack = 8)]
public struct ecs_query_desc_t
{
[FieldOffset(0)] // size = 4
Expand Down Expand Up @@ -6306,6 +6335,18 @@ public struct ecs_query_desc_t

[FieldOffset(2568)] // size = 8
public ecs_query_t* parent;

[FieldOffset(2576)] // size = 8
public void* ctx;

[FieldOffset(2584)] // size = 8
public void* binding_ctx;

[FieldOffset(2592)] // size = 8
public ecs_ctx_free_t ctx_free;

[FieldOffset(2600)] // size = 8
public ecs_ctx_free_t binding_ctx_free;
}

[CNode(Kind = "Struct")]
Expand Down Expand Up @@ -6775,7 +6816,7 @@ public struct ecs_struct_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2664, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 2696, Pack = 8)]
public struct ecs_system_desc_t
{
[FieldOffset(0)] // size = 4
Expand All @@ -6784,40 +6825,40 @@ public struct ecs_system_desc_t
[FieldOffset(8)] // size = 8
public ecs_entity_t entity;

[FieldOffset(16)] // size = 2576
[FieldOffset(16)] // size = 2608
public ecs_query_desc_t query;

[FieldOffset(2592)] // size = 8
[FieldOffset(2624)] // size = 8
public ecs_run_action_t run;

[FieldOffset(2600)] // size = 8
[FieldOffset(2632)] // size = 8
public ecs_iter_action_t callback;

[FieldOffset(2608)] // size = 8
[FieldOffset(2640)] // size = 8
public void* ctx;

[FieldOffset(2616)] // size = 8
[FieldOffset(2648)] // size = 8
public void* binding_ctx;

[FieldOffset(2624)] // size = 8
[FieldOffset(2656)] // size = 8
public ecs_ctx_free_t ctx_free;

[FieldOffset(2632)] // size = 8
[FieldOffset(2664)] // size = 8
public ecs_ctx_free_t binding_ctx_free;

[FieldOffset(2640)] // size = 4
[FieldOffset(2672)] // size = 4
public float interval;

[FieldOffset(2644)] // size = 4
[FieldOffset(2676)] // size = 4
public int rate;

[FieldOffset(2648)] // size = 8
[FieldOffset(2680)] // size = 8
public ecs_entity_t tick_source;

[FieldOffset(2656)] // size = 1
[FieldOffset(2688)] // size = 1
public CBool multi_threaded;

[FieldOffset(2657)] // size = 1
[FieldOffset(2689)] // size = 1
public CBool no_readonly;
}

Expand Down
2 changes: 1 addition & 1 deletion src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-08-21 00:46:08 GMT+00:00:
// This code was generated by the following tool on 2023-08-23 00:43:14 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.
Expand Down
Loading

0 comments on commit 2cdef50

Please sign in to comment.