Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion native/flecs
Submodule flecs updated 630 files
88 changes: 80 additions & 8 deletions native/flecs_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ extern void* ECS_PAIR;
extern void* ecs_stack_allocator_alloc_count;
extern void* ecs_stack_allocator_free_count;
extern void* ECS_TOGGLE;
extern void* ECS_VALUE_PAIR;
extern void* EcsAcceleration;
extern void* EcsAcyclic;
extern void* EcsAlertCritical;
Expand Down Expand Up @@ -72,6 +73,7 @@ extern void* EcsDocColor;
extern void* EcsDocDetail;
extern void* EcsDocLink;
extern void* EcsDocUuid;
extern void* EcsDontFragment;
extern void* EcsDontInherit;
extern void* EcsDuration;
extern void* EcsElectricCurrent;
Expand Down Expand Up @@ -163,9 +165,11 @@ extern void* EcsOnTableCreate;
extern void* EcsOnTableDelete;
extern void* EcsOnUpdate;
extern void* EcsOnValidate;
extern void* EcsOrderedChildren;
extern void* EcsOverride;
extern void* EcsPairIsTag;
extern void* EcsPanic;
extern void* EcsParentDepth;
extern void* EcsPascal;
extern void* EcsPebi;
extern void* EcsPercentage;
Expand All @@ -191,7 +195,6 @@ extern void* EcsPreFrame;
extern void* EcsPressure;
extern void* EcsPreStore;
extern void* EcsPreUpdate;
extern void* EcsPrivate;
extern void* EcsQuantity;
extern void* EcsQuery;
extern void* EcsRadians;
Expand All @@ -201,7 +204,9 @@ extern void* EcsRemove;
extern void* EcsScopeClose;
extern void* EcsScopeOpen;
extern void* EcsScriptTemplate;
extern void* EcsScriptVectorType;
extern void* EcsSeconds;
extern void* EcsSingleton;
extern void* EcsSlotOf;
extern void* EcsSparse;
extern void* EcsSpeed;
Expand All @@ -217,7 +222,6 @@ extern void* EcsTime;
extern void* EcsTrait;
extern void* EcsTransitive;
extern void* EcsTraversable;
extern void* EcsUnion;
extern void* EcsUnitPrefixes;
extern void* EcsUri;
extern void* EcsUriFile;
Expand All @@ -233,9 +237,13 @@ extern void* EcsYotta;
extern void* EcsZebi;
extern void* EcsZepto;
extern void* EcsZetta;
extern void* FLECS_IDecs_allocator_memory_tID_;
extern void* FLECS_IDecs_bool_tID_;
extern void* FLECS_IDecs_byte_tID_;
extern void* FLECS_IDecs_char_tID_;
extern void* FLECS_IDecs_component_index_memory_tID_;
extern void* FLECS_IDecs_component_memory_tID_;
extern void* FLECS_IDecs_entities_memory_tID_;
extern void* FLECS_IDecs_entity_tID_;
extern void* FLECS_IDecs_f32_tID_;
extern void* FLECS_IDecs_f64_tID_;
Expand All @@ -245,7 +253,11 @@ extern void* FLECS_IDecs_i64_tID_;
extern void* FLECS_IDecs_i8_tID_;
extern void* FLECS_IDecs_id_tID_;
extern void* FLECS_IDecs_iptr_tID_;
extern void* FLECS_IDecs_misc_memory_tID_;
extern void* FLECS_IDecs_query_memory_tID_;
extern void* FLECS_IDecs_string_tID_;
extern void* FLECS_IDecs_table_histogram_tID_;
extern void* FLECS_IDecs_table_memory_tID_;
extern void* FLECS_IDecs_u16_tID_;
extern void* FLECS_IDecs_u32_tID_;
extern void* FLECS_IDecs_u64_tID_;
Expand All @@ -262,6 +274,7 @@ extern void* FLECS_IDEcsAlertWarningID_;
extern void* FLECS_IDEcsArrayID_;
extern void* FLECS_IDEcsBitmaskID_;
extern void* FLECS_IDEcsComponentID_;
extern void* FLECS_IDEcsConstantsID_;
extern void* FLECS_IDEcsCounterID_;
extern void* FLECS_IDEcsCounterIdID_;
extern void* FLECS_IDEcsCounterIncrementID_;
Expand All @@ -277,6 +290,7 @@ extern void* FLECS_IDEcsMetricInstanceID_;
extern void* FLECS_IDEcsMetricSourceID_;
extern void* FLECS_IDEcsMetricValueID_;
extern void* FLECS_IDEcsOpaqueID_;
extern void* FLECS_IDEcsParentID_;
extern void* FLECS_IDEcsPipelineID_;
extern void* FLECS_IDEcsPipelineStatsID_;
extern void* FLECS_IDEcsPolyID_;
Expand All @@ -287,16 +301,20 @@ extern void* FLECS_IDEcsScriptConstVarID_;
extern void* FLECS_IDEcsScriptFunctionID_;
extern void* FLECS_IDEcsScriptID_;
extern void* FLECS_IDEcsScriptMethodID_;
extern void* FLECS_IDEcsScriptRngID_;
extern void* FLECS_IDEcsScriptTemplateID_;
extern void* FLECS_IDEcsScriptVectorTypeID_;
extern void* FLECS_IDEcsStructID_;
extern void* FLECS_IDEcsSystemStatsID_;
extern void* FLECS_IDEcsTickSourceID_;
extern void* FLECS_IDEcsTimerID_;
extern void* FLECS_IDEcsTreeSpawnerID_;
extern void* FLECS_IDEcsTypeID_;
extern void* FLECS_IDEcsTypeSerializerID_;
extern void* FLECS_IDEcsUnitID_;
extern void* FLECS_IDEcsUnitPrefixID_;
extern void* FLECS_IDEcsVectorID_;
extern void* FLECS_IDEcsWorldMemoryID_;
extern void* FLECS_IDEcsWorldStatsID_;
extern void* FLECS_IDEcsWorldSummaryID_;
extern void* FLECS_IDFlecsAlertsID_;
Expand Down Expand Up @@ -365,6 +383,9 @@ BINDGEN_API void* ecs_stack_allocator_free_count_BindgenGetExtern() {
BINDGEN_API void* ECS_TOGGLE_BindgenGetExtern() {
return &ECS_TOGGLE;
}
BINDGEN_API void* ECS_VALUE_PAIR_BindgenGetExtern() {
return &ECS_VALUE_PAIR;
}
BINDGEN_API void* EcsAcceleration_BindgenGetExtern() {
return &EcsAcceleration;
}
Expand Down Expand Up @@ -509,6 +530,9 @@ BINDGEN_API void* EcsDocLink_BindgenGetExtern() {
BINDGEN_API void* EcsDocUuid_BindgenGetExtern() {
return &EcsDocUuid;
}
BINDGEN_API void* EcsDontFragment_BindgenGetExtern() {
return &EcsDontFragment;
}
BINDGEN_API void* EcsDontInherit_BindgenGetExtern() {
return &EcsDontInherit;
}
Expand Down Expand Up @@ -782,6 +806,9 @@ BINDGEN_API void* EcsOnUpdate_BindgenGetExtern() {
BINDGEN_API void* EcsOnValidate_BindgenGetExtern() {
return &EcsOnValidate;
}
BINDGEN_API void* EcsOrderedChildren_BindgenGetExtern() {
return &EcsOrderedChildren;
}
BINDGEN_API void* EcsOverride_BindgenGetExtern() {
return &EcsOverride;
}
Expand All @@ -791,6 +818,9 @@ BINDGEN_API void* EcsPairIsTag_BindgenGetExtern() {
BINDGEN_API void* EcsPanic_BindgenGetExtern() {
return &EcsPanic;
}
BINDGEN_API void* EcsParentDepth_BindgenGetExtern() {
return &EcsParentDepth;
}
BINDGEN_API void* EcsPascal_BindgenGetExtern() {
return &EcsPascal;
}
Expand Down Expand Up @@ -866,9 +896,6 @@ BINDGEN_API void* EcsPreStore_BindgenGetExtern() {
BINDGEN_API void* EcsPreUpdate_BindgenGetExtern() {
return &EcsPreUpdate;
}
BINDGEN_API void* EcsPrivate_BindgenGetExtern() {
return &EcsPrivate;
}
BINDGEN_API void* EcsQuantity_BindgenGetExtern() {
return &EcsQuantity;
}
Expand Down Expand Up @@ -896,9 +923,15 @@ BINDGEN_API void* EcsScopeOpen_BindgenGetExtern() {
BINDGEN_API void* EcsScriptTemplate_BindgenGetExtern() {
return &EcsScriptTemplate;
}
BINDGEN_API void* EcsScriptVectorType_BindgenGetExtern() {
return &EcsScriptVectorType;
}
BINDGEN_API void* EcsSeconds_BindgenGetExtern() {
return &EcsSeconds;
}
BINDGEN_API void* EcsSingleton_BindgenGetExtern() {
return &EcsSingleton;
}
BINDGEN_API void* EcsSlotOf_BindgenGetExtern() {
return &EcsSlotOf;
}
Expand Down Expand Up @@ -944,9 +977,6 @@ BINDGEN_API void* EcsTransitive_BindgenGetExtern() {
BINDGEN_API void* EcsTraversable_BindgenGetExtern() {
return &EcsTraversable;
}
BINDGEN_API void* EcsUnion_BindgenGetExtern() {
return &EcsUnion;
}
BINDGEN_API void* EcsUnitPrefixes_BindgenGetExtern() {
return &EcsUnitPrefixes;
}
Expand Down Expand Up @@ -992,6 +1022,9 @@ BINDGEN_API void* EcsZepto_BindgenGetExtern() {
BINDGEN_API void* EcsZetta_BindgenGetExtern() {
return &EcsZetta;
}
BINDGEN_API void* FLECS_IDecs_allocator_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_allocator_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_bool_tID__BindgenGetExtern() {
return &FLECS_IDecs_bool_tID_;
}
Expand All @@ -1001,6 +1034,15 @@ BINDGEN_API void* FLECS_IDecs_byte_tID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDecs_char_tID__BindgenGetExtern() {
return &FLECS_IDecs_char_tID_;
}
BINDGEN_API void* FLECS_IDecs_component_index_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_component_index_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_component_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_component_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_entities_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_entities_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_entity_tID__BindgenGetExtern() {
return &FLECS_IDecs_entity_tID_;
}
Expand Down Expand Up @@ -1028,9 +1070,21 @@ BINDGEN_API void* FLECS_IDecs_id_tID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDecs_iptr_tID__BindgenGetExtern() {
return &FLECS_IDecs_iptr_tID_;
}
BINDGEN_API void* FLECS_IDecs_misc_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_misc_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_query_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_query_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_string_tID__BindgenGetExtern() {
return &FLECS_IDecs_string_tID_;
}
BINDGEN_API void* FLECS_IDecs_table_histogram_tID__BindgenGetExtern() {
return &FLECS_IDecs_table_histogram_tID_;
}
BINDGEN_API void* FLECS_IDecs_table_memory_tID__BindgenGetExtern() {
return &FLECS_IDecs_table_memory_tID_;
}
BINDGEN_API void* FLECS_IDecs_u16_tID__BindgenGetExtern() {
return &FLECS_IDecs_u16_tID_;
}
Expand Down Expand Up @@ -1079,6 +1133,9 @@ BINDGEN_API void* FLECS_IDEcsBitmaskID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDEcsComponentID__BindgenGetExtern() {
return &FLECS_IDEcsComponentID_;
}
BINDGEN_API void* FLECS_IDEcsConstantsID__BindgenGetExtern() {
return &FLECS_IDEcsConstantsID_;
}
BINDGEN_API void* FLECS_IDEcsCounterID__BindgenGetExtern() {
return &FLECS_IDEcsCounterID_;
}
Expand Down Expand Up @@ -1124,6 +1181,9 @@ BINDGEN_API void* FLECS_IDEcsMetricValueID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDEcsOpaqueID__BindgenGetExtern() {
return &FLECS_IDEcsOpaqueID_;
}
BINDGEN_API void* FLECS_IDEcsParentID__BindgenGetExtern() {
return &FLECS_IDEcsParentID_;
}
BINDGEN_API void* FLECS_IDEcsPipelineID__BindgenGetExtern() {
return &FLECS_IDEcsPipelineID_;
}
Expand Down Expand Up @@ -1154,9 +1214,15 @@ BINDGEN_API void* FLECS_IDEcsScriptID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDEcsScriptMethodID__BindgenGetExtern() {
return &FLECS_IDEcsScriptMethodID_;
}
BINDGEN_API void* FLECS_IDEcsScriptRngID__BindgenGetExtern() {
return &FLECS_IDEcsScriptRngID_;
}
BINDGEN_API void* FLECS_IDEcsScriptTemplateID__BindgenGetExtern() {
return &FLECS_IDEcsScriptTemplateID_;
}
BINDGEN_API void* FLECS_IDEcsScriptVectorTypeID__BindgenGetExtern() {
return &FLECS_IDEcsScriptVectorTypeID_;
}
BINDGEN_API void* FLECS_IDEcsStructID__BindgenGetExtern() {
return &FLECS_IDEcsStructID_;
}
Expand All @@ -1169,6 +1235,9 @@ BINDGEN_API void* FLECS_IDEcsTickSourceID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDEcsTimerID__BindgenGetExtern() {
return &FLECS_IDEcsTimerID_;
}
BINDGEN_API void* FLECS_IDEcsTreeSpawnerID__BindgenGetExtern() {
return &FLECS_IDEcsTreeSpawnerID_;
}
BINDGEN_API void* FLECS_IDEcsTypeID__BindgenGetExtern() {
return &FLECS_IDEcsTypeID_;
}
Expand All @@ -1184,6 +1253,9 @@ BINDGEN_API void* FLECS_IDEcsUnitPrefixID__BindgenGetExtern() {
BINDGEN_API void* FLECS_IDEcsVectorID__BindgenGetExtern() {
return &FLECS_IDEcsVectorID_;
}
BINDGEN_API void* FLECS_IDEcsWorldMemoryID__BindgenGetExtern() {
return &FLECS_IDEcsWorldMemoryID_;
}
BINDGEN_API void* FLECS_IDEcsWorldStatsID__BindgenGetExtern() {
return &FLECS_IDEcsWorldStatsID_;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>4.0.4</VersionPrefix>
<VersionPrefix>4.1.5</VersionPrefix>
<Authors>BeanCheeseBurrito</Authors>
<Copyright>BeanCheeseBurrito</Copyright>
<PackageProjectUrl>https://github.com/BeanCheeseBurrito/Flecs.NET</PackageProjectUrl>
Expand All @@ -21,7 +21,7 @@

<PropertyGroup>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
<NoWarn>$(NoWarn);NETSDK1138;IDE0005</NoWarn>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true' And '$(ContinuousIntegrationBuild)' == ''">true</ContinuousIntegrationBuild>
<Deterministic Condition="'$(GITHUB_ACTIONS)' == 'true' And '$(Deterministic)' == ''">true</Deterministic>
<AllowedOutputExtensionsInPackageBuildOutputFolder Condition="'$(FlecsPackPdb)' == 'true'">$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
Expand Down Expand Up @@ -55,4 +55,4 @@
</PropertyGroup>
</When>
</Choose>
</Project>
</Project>
11 changes: 8 additions & 3 deletions src/Flecs.NET.Bindgen/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
SuppressedWarnings = { "CS8981" },

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

InputFile = GetFlecsHeaderPath(),
IncludeDirectories = { GetFlecsIncludePath(), GetBootstrapDir() },
OutputFile = GetBindingsOutputPath(),
NativeOutputFile = GetBindingsHelperOutputPath(),

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

string GetFlecsHeaderPath([CallerFilePath] string filePath = "")
{
return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs", "include", "flecs.h"));
return Path.GetFullPath(Path.Combine(filePath, "..", "bootstrap.h"));
}

string GetBootstrapDir([CallerFilePath] string filePath = "")
{
return Path.GetFullPath(Path.Combine(filePath, ".."));
}

string GetBindingsOutputPath([CallerFilePath] string filePath = "")
Expand All @@ -48,4 +53,4 @@ string GetBindingsOutputPath([CallerFilePath] string filePath = "")
string GetBindingsHelperOutputPath([CallerFilePath] string filePath = "")
{
return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs_helpers.c"));
}
}
3 changes: 3 additions & 0 deletions src/Flecs.NET.Bindgen/bootstrap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#define FLECS_SCRIPT_MATH

#include <flecs.h>
Loading
Loading