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

Bump ext/flecs from f786277 to a990162 #164

Merged
merged 3 commits into from
May 15, 2023
Merged

Bump ext/flecs from f786277 to a990162 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4915104
Bump ext/flecs from `f786277` to `a990162`
dependabot[bot] May 15, 2023
9453985
Fixs for PR
lithiumtoast May 15, 2023
41d3303
Update flecs.cs
lithiumtoast May 15, 2023
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 ext/flecs
Open in desktop
Submodule flecs updated 15 files
+1 −1 docs/Quickstart.md
+60 −46 flecs.c
+5 −3 flecs.h
+2 −1 include/flecs/addons/app.h
+3 −2 include/flecs/addons/cpp/mixins/app/builder.hpp
+1 −1 src/addons/app.c
+28 −26 src/addons/stats.c
+28 −18 src/query.c
+3 −1 src/table.c
+1 −0 test/addons/project.json
+18 −0 test/addons/src/Stats.c
+6 −1 test/addons/src/main.c
+1 −0 test/api/project.json
+39 −0 test/api/src/Query.c
+6 −1 test/api/src/main.c
19 changes: 9 additions & 10 deletions src/cs/production/Flecs/World.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public void RegisterComponent<TComponent>(ComponentHooks? hooks = null)
{
var type = typeof(TComponent);
var componentName = GetFlecsTypeName(type);
var componentNameC = (Runtime.CString)componentName;
var structLayoutAttribute = type.StructLayoutAttribute;
CheckStructLayout(structLayoutAttribute);
var structSize = Unsafe.SizeOf<TComponent>();
Expand All @@ -92,8 +91,8 @@ public void RegisterComponent<TComponent>(ComponentHooks? hooks = null)
}

ecs_entity_desc_t entityDesc = default;
entityDesc.name = componentNameC;
entityDesc.symbol = componentNameC;
entityDesc.name = componentName;
entityDesc.symbol = componentName;
ecs_component_desc_t componentDesc = default;
componentDesc.entity = ecs_entity_init(Handle, &entityDesc);
componentDesc.type.size = structSize;
Expand All @@ -109,7 +108,7 @@ public void RegisterTag<TTag>()
ecs_entity_desc_t desc = default;
var type = typeof(TTag);
var typeName = GetFlecsTypeName<TTag>();
desc.name = (Runtime.CString)typeName;
desc.name = typeName;
var id = ecs_entity_init(Handle, &desc);
Debug.Assert(id.Data != 0, "ECS_INVALID_PARAMETER");
_componentIdentifiersByType[type] = id.Data.Data;
Expand All @@ -127,7 +126,7 @@ public void RegisterTag<TTag>()
ecs_system_desc_t desc = default;
FillSystemDescriptorCommon(ref desc, callback, phase, name);

desc.query.filter.expr = (Runtime.CString)filterExpression;
desc.query.filter.expr = filterExpression;
ecs_system_init(Handle, &desc);
}

Expand All @@ -137,7 +136,7 @@ public void RegisterTag<TTag>()
ecs_system_desc_t desc = default;
FillSystemDescriptorCommon(ref desc, callback, phase._handle, name);

desc.query.filter.expr = (Runtime.CString)GetFlecsTypeName<TComponent1>();
desc.query.filter.expr = GetFlecsTypeName<TComponent1>();
ecs_system_init(Handle, &desc);
}

Expand All @@ -151,15 +150,15 @@ public void RegisterTag<TTag>()

var componentName1 = GetFlecsTypeName<TComponent1>();
var componentName2 = GetFlecsTypeName<TComponent2>();
desc.query.filter.expr = (Runtime.CString)(componentName1 + ", " + componentName2);
desc.query.filter.expr = componentName1 + ", " + componentName2;
ecs_system_init(Handle, &desc);
}

private void FillSystemDescriptorCommon(
ref ecs_system_desc_t systemDesc, CallbackIterator callback, ecs_entity_t phase, string? name)
{
ecs_entity_desc_t entityDesc = default;
entityDesc.name = (Runtime.CString)(name ?? callback.Method.Name);
entityDesc.name = name ?? callback.Method.Name;
entityDesc.add[0] = phase.Data != 0 ? ecs_pair(EcsDependsOn._handle, phase) : default;
entityDesc.add[1] = phase;
systemDesc.entity = ecs_entity_init(Handle, &entityDesc);
Expand All @@ -179,7 +178,7 @@ private static void SystemCallback(ecs_iter_t* it)
public Entity CreateEntity(string name)
{
var desc = default(ecs_entity_desc_t);
desc.name = (Runtime.CString)name;
desc.name = name;
var entity = ecs_entity_init(Handle, &desc);
var result = new Entity(this, entity);
return result;
Expand All @@ -188,7 +187,7 @@ public Entity CreateEntity(string name)
public Entity CreatePrefab(string name)
{
var desc = default(ecs_entity_desc_t);
desc.name = (Runtime.CString)name;
desc.name = name;
desc.add[0] = pinvoke_EcsPrefab();

var entity = ecs_entity_init(Handle, &desc);
Expand Down
Loading