Skip to content

Commit f19af60

Browse files
committed
Bump to flecs 4.1.5
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
1 parent 9e9c05b commit f19af60

119 files changed

Lines changed: 6994 additions & 5007 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

native/flecs

Submodule flecs updated 630 files

native/flecs_helpers.c

Lines changed: 80 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extern void* ECS_PAIR;
2424
extern void* ecs_stack_allocator_alloc_count;
2525
extern void* ecs_stack_allocator_free_count;
2626
extern void* ECS_TOGGLE;
27+
extern void* ECS_VALUE_PAIR;
2728
extern void* EcsAcceleration;
2829
extern void* EcsAcyclic;
2930
extern void* EcsAlertCritical;
@@ -72,6 +73,7 @@ extern void* EcsDocColor;
7273
extern void* EcsDocDetail;
7374
extern void* EcsDocLink;
7475
extern void* EcsDocUuid;
76+
extern void* EcsDontFragment;
7577
extern void* EcsDontInherit;
7678
extern void* EcsDuration;
7779
extern void* EcsElectricCurrent;
@@ -163,9 +165,11 @@ extern void* EcsOnTableCreate;
163165
extern void* EcsOnTableDelete;
164166
extern void* EcsOnUpdate;
165167
extern void* EcsOnValidate;
168+
extern void* EcsOrderedChildren;
166169
extern void* EcsOverride;
167170
extern void* EcsPairIsTag;
168171
extern void* EcsPanic;
172+
extern void* EcsParentDepth;
169173
extern void* EcsPascal;
170174
extern void* EcsPebi;
171175
extern void* EcsPercentage;
@@ -191,7 +195,6 @@ extern void* EcsPreFrame;
191195
extern void* EcsPressure;
192196
extern void* EcsPreStore;
193197
extern void* EcsPreUpdate;
194-
extern void* EcsPrivate;
195198
extern void* EcsQuantity;
196199
extern void* EcsQuery;
197200
extern void* EcsRadians;
@@ -201,7 +204,9 @@ extern void* EcsRemove;
201204
extern void* EcsScopeClose;
202205
extern void* EcsScopeOpen;
203206
extern void* EcsScriptTemplate;
207+
extern void* EcsScriptVectorType;
204208
extern void* EcsSeconds;
209+
extern void* EcsSingleton;
205210
extern void* EcsSlotOf;
206211
extern void* EcsSparse;
207212
extern void* EcsSpeed;
@@ -217,7 +222,6 @@ extern void* EcsTime;
217222
extern void* EcsTrait;
218223
extern void* EcsTransitive;
219224
extern void* EcsTraversable;
220-
extern void* EcsUnion;
221225
extern void* EcsUnitPrefixes;
222226
extern void* EcsUri;
223227
extern void* EcsUriFile;
@@ -233,9 +237,13 @@ extern void* EcsYotta;
233237
extern void* EcsZebi;
234238
extern void* EcsZepto;
235239
extern void* EcsZetta;
240+
extern void* FLECS_IDecs_allocator_memory_tID_;
236241
extern void* FLECS_IDecs_bool_tID_;
237242
extern void* FLECS_IDecs_byte_tID_;
238243
extern void* FLECS_IDecs_char_tID_;
244+
extern void* FLECS_IDecs_component_index_memory_tID_;
245+
extern void* FLECS_IDecs_component_memory_tID_;
246+
extern void* FLECS_IDecs_entities_memory_tID_;
239247
extern void* FLECS_IDecs_entity_tID_;
240248
extern void* FLECS_IDecs_f32_tID_;
241249
extern void* FLECS_IDecs_f64_tID_;
@@ -245,7 +253,11 @@ extern void* FLECS_IDecs_i64_tID_;
245253
extern void* FLECS_IDecs_i8_tID_;
246254
extern void* FLECS_IDecs_id_tID_;
247255
extern void* FLECS_IDecs_iptr_tID_;
256+
extern void* FLECS_IDecs_misc_memory_tID_;
257+
extern void* FLECS_IDecs_query_memory_tID_;
248258
extern void* FLECS_IDecs_string_tID_;
259+
extern void* FLECS_IDecs_table_histogram_tID_;
260+
extern void* FLECS_IDecs_table_memory_tID_;
249261
extern void* FLECS_IDecs_u16_tID_;
250262
extern void* FLECS_IDecs_u32_tID_;
251263
extern void* FLECS_IDecs_u64_tID_;
@@ -262,6 +274,7 @@ extern void* FLECS_IDEcsAlertWarningID_;
262274
extern void* FLECS_IDEcsArrayID_;
263275
extern void* FLECS_IDEcsBitmaskID_;
264276
extern void* FLECS_IDEcsComponentID_;
277+
extern void* FLECS_IDEcsConstantsID_;
265278
extern void* FLECS_IDEcsCounterID_;
266279
extern void* FLECS_IDEcsCounterIdID_;
267280
extern void* FLECS_IDEcsCounterIncrementID_;
@@ -277,6 +290,7 @@ extern void* FLECS_IDEcsMetricInstanceID_;
277290
extern void* FLECS_IDEcsMetricSourceID_;
278291
extern void* FLECS_IDEcsMetricValueID_;
279292
extern void* FLECS_IDEcsOpaqueID_;
293+
extern void* FLECS_IDEcsParentID_;
280294
extern void* FLECS_IDEcsPipelineID_;
281295
extern void* FLECS_IDEcsPipelineStatsID_;
282296
extern void* FLECS_IDEcsPolyID_;
@@ -287,16 +301,20 @@ extern void* FLECS_IDEcsScriptConstVarID_;
287301
extern void* FLECS_IDEcsScriptFunctionID_;
288302
extern void* FLECS_IDEcsScriptID_;
289303
extern void* FLECS_IDEcsScriptMethodID_;
304+
extern void* FLECS_IDEcsScriptRngID_;
290305
extern void* FLECS_IDEcsScriptTemplateID_;
306+
extern void* FLECS_IDEcsScriptVectorTypeID_;
291307
extern void* FLECS_IDEcsStructID_;
292308
extern void* FLECS_IDEcsSystemStatsID_;
293309
extern void* FLECS_IDEcsTickSourceID_;
294310
extern void* FLECS_IDEcsTimerID_;
311+
extern void* FLECS_IDEcsTreeSpawnerID_;
295312
extern void* FLECS_IDEcsTypeID_;
296313
extern void* FLECS_IDEcsTypeSerializerID_;
297314
extern void* FLECS_IDEcsUnitID_;
298315
extern void* FLECS_IDEcsUnitPrefixID_;
299316
extern void* FLECS_IDEcsVectorID_;
317+
extern void* FLECS_IDEcsWorldMemoryID_;
300318
extern void* FLECS_IDEcsWorldStatsID_;
301319
extern void* FLECS_IDEcsWorldSummaryID_;
302320
extern void* FLECS_IDFlecsAlertsID_;
@@ -365,6 +383,9 @@ BINDGEN_API void* ecs_stack_allocator_free_count_BindgenGetExtern() {
365383
BINDGEN_API void* ECS_TOGGLE_BindgenGetExtern() {
366384
return &ECS_TOGGLE;
367385
}
386+
BINDGEN_API void* ECS_VALUE_PAIR_BindgenGetExtern() {
387+
return &ECS_VALUE_PAIR;
388+
}
368389
BINDGEN_API void* EcsAcceleration_BindgenGetExtern() {
369390
return &EcsAcceleration;
370391
}
@@ -509,6 +530,9 @@ BINDGEN_API void* EcsDocLink_BindgenGetExtern() {
509530
BINDGEN_API void* EcsDocUuid_BindgenGetExtern() {
510531
return &EcsDocUuid;
511532
}
533+
BINDGEN_API void* EcsDontFragment_BindgenGetExtern() {
534+
return &EcsDontFragment;
535+
}
512536
BINDGEN_API void* EcsDontInherit_BindgenGetExtern() {
513537
return &EcsDontInherit;
514538
}
@@ -782,6 +806,9 @@ BINDGEN_API void* EcsOnUpdate_BindgenGetExtern() {
782806
BINDGEN_API void* EcsOnValidate_BindgenGetExtern() {
783807
return &EcsOnValidate;
784808
}
809+
BINDGEN_API void* EcsOrderedChildren_BindgenGetExtern() {
810+
return &EcsOrderedChildren;
811+
}
785812
BINDGEN_API void* EcsOverride_BindgenGetExtern() {
786813
return &EcsOverride;
787814
}
@@ -791,6 +818,9 @@ BINDGEN_API void* EcsPairIsTag_BindgenGetExtern() {
791818
BINDGEN_API void* EcsPanic_BindgenGetExtern() {
792819
return &EcsPanic;
793820
}
821+
BINDGEN_API void* EcsParentDepth_BindgenGetExtern() {
822+
return &EcsParentDepth;
823+
}
794824
BINDGEN_API void* EcsPascal_BindgenGetExtern() {
795825
return &EcsPascal;
796826
}
@@ -866,9 +896,6 @@ BINDGEN_API void* EcsPreStore_BindgenGetExtern() {
866896
BINDGEN_API void* EcsPreUpdate_BindgenGetExtern() {
867897
return &EcsPreUpdate;
868898
}
869-
BINDGEN_API void* EcsPrivate_BindgenGetExtern() {
870-
return &EcsPrivate;
871-
}
872899
BINDGEN_API void* EcsQuantity_BindgenGetExtern() {
873900
return &EcsQuantity;
874901
}
@@ -896,9 +923,15 @@ BINDGEN_API void* EcsScopeOpen_BindgenGetExtern() {
896923
BINDGEN_API void* EcsScriptTemplate_BindgenGetExtern() {
897924
return &EcsScriptTemplate;
898925
}
926+
BINDGEN_API void* EcsScriptVectorType_BindgenGetExtern() {
927+
return &EcsScriptVectorType;
928+
}
899929
BINDGEN_API void* EcsSeconds_BindgenGetExtern() {
900930
return &EcsSeconds;
901931
}
932+
BINDGEN_API void* EcsSingleton_BindgenGetExtern() {
933+
return &EcsSingleton;
934+
}
902935
BINDGEN_API void* EcsSlotOf_BindgenGetExtern() {
903936
return &EcsSlotOf;
904937
}
@@ -944,9 +977,6 @@ BINDGEN_API void* EcsTransitive_BindgenGetExtern() {
944977
BINDGEN_API void* EcsTraversable_BindgenGetExtern() {
945978
return &EcsTraversable;
946979
}
947-
BINDGEN_API void* EcsUnion_BindgenGetExtern() {
948-
return &EcsUnion;
949-
}
950980
BINDGEN_API void* EcsUnitPrefixes_BindgenGetExtern() {
951981
return &EcsUnitPrefixes;
952982
}
@@ -992,6 +1022,9 @@ BINDGEN_API void* EcsZepto_BindgenGetExtern() {
9921022
BINDGEN_API void* EcsZetta_BindgenGetExtern() {
9931023
return &EcsZetta;
9941024
}
1025+
BINDGEN_API void* FLECS_IDecs_allocator_memory_tID__BindgenGetExtern() {
1026+
return &FLECS_IDecs_allocator_memory_tID_;
1027+
}
9951028
BINDGEN_API void* FLECS_IDecs_bool_tID__BindgenGetExtern() {
9961029
return &FLECS_IDecs_bool_tID_;
9971030
}
@@ -1001,6 +1034,15 @@ BINDGEN_API void* FLECS_IDecs_byte_tID__BindgenGetExtern() {
10011034
BINDGEN_API void* FLECS_IDecs_char_tID__BindgenGetExtern() {
10021035
return &FLECS_IDecs_char_tID_;
10031036
}
1037+
BINDGEN_API void* FLECS_IDecs_component_index_memory_tID__BindgenGetExtern() {
1038+
return &FLECS_IDecs_component_index_memory_tID_;
1039+
}
1040+
BINDGEN_API void* FLECS_IDecs_component_memory_tID__BindgenGetExtern() {
1041+
return &FLECS_IDecs_component_memory_tID_;
1042+
}
1043+
BINDGEN_API void* FLECS_IDecs_entities_memory_tID__BindgenGetExtern() {
1044+
return &FLECS_IDecs_entities_memory_tID_;
1045+
}
10041046
BINDGEN_API void* FLECS_IDecs_entity_tID__BindgenGetExtern() {
10051047
return &FLECS_IDecs_entity_tID_;
10061048
}
@@ -1028,9 +1070,21 @@ BINDGEN_API void* FLECS_IDecs_id_tID__BindgenGetExtern() {
10281070
BINDGEN_API void* FLECS_IDecs_iptr_tID__BindgenGetExtern() {
10291071
return &FLECS_IDecs_iptr_tID_;
10301072
}
1073+
BINDGEN_API void* FLECS_IDecs_misc_memory_tID__BindgenGetExtern() {
1074+
return &FLECS_IDecs_misc_memory_tID_;
1075+
}
1076+
BINDGEN_API void* FLECS_IDecs_query_memory_tID__BindgenGetExtern() {
1077+
return &FLECS_IDecs_query_memory_tID_;
1078+
}
10311079
BINDGEN_API void* FLECS_IDecs_string_tID__BindgenGetExtern() {
10321080
return &FLECS_IDecs_string_tID_;
10331081
}
1082+
BINDGEN_API void* FLECS_IDecs_table_histogram_tID__BindgenGetExtern() {
1083+
return &FLECS_IDecs_table_histogram_tID_;
1084+
}
1085+
BINDGEN_API void* FLECS_IDecs_table_memory_tID__BindgenGetExtern() {
1086+
return &FLECS_IDecs_table_memory_tID_;
1087+
}
10341088
BINDGEN_API void* FLECS_IDecs_u16_tID__BindgenGetExtern() {
10351089
return &FLECS_IDecs_u16_tID_;
10361090
}
@@ -1079,6 +1133,9 @@ BINDGEN_API void* FLECS_IDEcsBitmaskID__BindgenGetExtern() {
10791133
BINDGEN_API void* FLECS_IDEcsComponentID__BindgenGetExtern() {
10801134
return &FLECS_IDEcsComponentID_;
10811135
}
1136+
BINDGEN_API void* FLECS_IDEcsConstantsID__BindgenGetExtern() {
1137+
return &FLECS_IDEcsConstantsID_;
1138+
}
10821139
BINDGEN_API void* FLECS_IDEcsCounterID__BindgenGetExtern() {
10831140
return &FLECS_IDEcsCounterID_;
10841141
}
@@ -1124,6 +1181,9 @@ BINDGEN_API void* FLECS_IDEcsMetricValueID__BindgenGetExtern() {
11241181
BINDGEN_API void* FLECS_IDEcsOpaqueID__BindgenGetExtern() {
11251182
return &FLECS_IDEcsOpaqueID_;
11261183
}
1184+
BINDGEN_API void* FLECS_IDEcsParentID__BindgenGetExtern() {
1185+
return &FLECS_IDEcsParentID_;
1186+
}
11271187
BINDGEN_API void* FLECS_IDEcsPipelineID__BindgenGetExtern() {
11281188
return &FLECS_IDEcsPipelineID_;
11291189
}
@@ -1154,9 +1214,15 @@ BINDGEN_API void* FLECS_IDEcsScriptID__BindgenGetExtern() {
11541214
BINDGEN_API void* FLECS_IDEcsScriptMethodID__BindgenGetExtern() {
11551215
return &FLECS_IDEcsScriptMethodID_;
11561216
}
1217+
BINDGEN_API void* FLECS_IDEcsScriptRngID__BindgenGetExtern() {
1218+
return &FLECS_IDEcsScriptRngID_;
1219+
}
11571220
BINDGEN_API void* FLECS_IDEcsScriptTemplateID__BindgenGetExtern() {
11581221
return &FLECS_IDEcsScriptTemplateID_;
11591222
}
1223+
BINDGEN_API void* FLECS_IDEcsScriptVectorTypeID__BindgenGetExtern() {
1224+
return &FLECS_IDEcsScriptVectorTypeID_;
1225+
}
11601226
BINDGEN_API void* FLECS_IDEcsStructID__BindgenGetExtern() {
11611227
return &FLECS_IDEcsStructID_;
11621228
}
@@ -1169,6 +1235,9 @@ BINDGEN_API void* FLECS_IDEcsTickSourceID__BindgenGetExtern() {
11691235
BINDGEN_API void* FLECS_IDEcsTimerID__BindgenGetExtern() {
11701236
return &FLECS_IDEcsTimerID_;
11711237
}
1238+
BINDGEN_API void* FLECS_IDEcsTreeSpawnerID__BindgenGetExtern() {
1239+
return &FLECS_IDEcsTreeSpawnerID_;
1240+
}
11721241
BINDGEN_API void* FLECS_IDEcsTypeID__BindgenGetExtern() {
11731242
return &FLECS_IDEcsTypeID_;
11741243
}
@@ -1184,6 +1253,9 @@ BINDGEN_API void* FLECS_IDEcsUnitPrefixID__BindgenGetExtern() {
11841253
BINDGEN_API void* FLECS_IDEcsVectorID__BindgenGetExtern() {
11851254
return &FLECS_IDEcsVectorID_;
11861255
}
1256+
BINDGEN_API void* FLECS_IDEcsWorldMemoryID__BindgenGetExtern() {
1257+
return &FLECS_IDEcsWorldMemoryID_;
1258+
}
11871259
BINDGEN_API void* FLECS_IDEcsWorldStatsID__BindgenGetExtern() {
11881260
return &FLECS_IDEcsWorldStatsID_;
11891261
}

src/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>4.0.4</VersionPrefix>
3+
<VersionPrefix>4.1.5</VersionPrefix>
44
<Authors>BeanCheeseBurrito</Authors>
55
<Copyright>BeanCheeseBurrito</Copyright>
66
<PackageProjectUrl>https://github.com/BeanCheeseBurrito/Flecs.NET</PackageProjectUrl>
@@ -21,7 +21,7 @@
2121

2222
<PropertyGroup>
2323
<IsPackable>false</IsPackable>
24-
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
24+
<NoWarn>$(NoWarn);NETSDK1138;IDE0005</NoWarn>
2525
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true' And '$(ContinuousIntegrationBuild)' == ''">true</ContinuousIntegrationBuild>
2626
<Deterministic Condition="'$(GITHUB_ACTIONS)' == 'true' And '$(Deterministic)' == ''">true</Deterministic>
2727
<AllowedOutputExtensionsInPackageBuildOutputFolder Condition="'$(FlecsPackPdb)' == 'true'">$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -55,4 +55,4 @@
5555
</PropertyGroup>
5656
</When>
5757
</Choose>
58-
</Project>
58+
</Project>

src/Flecs.NET.Bindgen/Program.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
SuppressedWarnings = { "CS8981" },
1212

1313
SystemIncludeDirectories = { Path.Combine(BuildConstants.ZigLibPath, "include") },
14-
IncludeDirectories = { GetFlecsIncludePath() },
1514

1615
InputFile = GetFlecsHeaderPath(),
16+
IncludeDirectories = { GetFlecsIncludePath(), GetBootstrapDir() },
1717
OutputFile = GetBindingsOutputPath(),
1818
NativeOutputFile = GetBindingsHelperOutputPath(),
1919

@@ -37,7 +37,12 @@ string GetFlecsIncludePath([CallerFilePath] string filePath = "")
3737

3838
string GetFlecsHeaderPath([CallerFilePath] string filePath = "")
3939
{
40-
return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs", "include", "flecs.h"));
40+
return Path.GetFullPath(Path.Combine(filePath, "..", "bootstrap.h"));
41+
}
42+
43+
string GetBootstrapDir([CallerFilePath] string filePath = "")
44+
{
45+
return Path.GetFullPath(Path.Combine(filePath, ".."));
4146
}
4247

4348
string GetBindingsOutputPath([CallerFilePath] string filePath = "")
@@ -48,4 +53,4 @@ string GetBindingsOutputPath([CallerFilePath] string filePath = "")
4853
string GetBindingsHelperOutputPath([CallerFilePath] string filePath = "")
4954
{
5055
return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs_helpers.c"));
51-
}
56+
}

src/Flecs.NET.Bindgen/bootstrap.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#define FLECS_SCRIPT_MATH
2+
3+
#include <flecs.h>

0 commit comments

Comments
 (0)