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 f786277 to a990162 (#164)
Browse files Browse the repository at this point in the history
* Bump ext/flecs from `f786277` to `a990162`

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

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

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

* Fixs for PR

* Update flecs.cs

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lucas Girouard-Stranks <lithiumtoast@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and lithiumtoast committed May 15, 2023
1 parent a67307f commit 1ae8ffa
Show file tree
Hide file tree
Showing 3 changed files with 572 additions and 58 deletions.
19 changes: 9 additions & 10 deletions src/cs/production/Flecs/World.cs
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

0 comments on commit 1ae8ffa

Please sign in to comment.