Bubel/bubel-ecs
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge branch 'wasm_fixes' into 'master'

Browse source 
Don't use ForeachType as it don't work if foreach type is not copyable.

See merge request Mergul/bubel-ecs!22
This commit is contained in:
Dawid Masiukiewicz 2022-10-06 17:01:50 +00:00
commit a8d48f1218
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -55,15 +55,26 @@ add_project_link_arguments(link_args, language : 'd')
# Dependencies
threads_dep = dependency('threads')
d_versions = []
deps = []
if host_machine.cpu_family() == 'wasm32'
d_versions += 'ECSEmscripten'
else
# meson incorectly adds "-s USE_PTHREADS=1" to ldc2 invocation whe pthreads is added as dependency
# add it for non wasm builds
deps += threads_dep
endif
ecs_lib = library('BubelECS',
src,
d_module_versions : d_versions,
include_directories : [inc],
)
bubel_ecs_dep = declare_dependency(
include_directories : [inc],
link_with : ecs_lib,
dependencies : threads_dep,
dependencies : deps,
)
meson.override_dependency('bubel-ecs', bubel_ecs_dep)

14
source/bubel/ecs/manager.d
View file

@ -465,7 +465,7 @@ export struct EntityManager
static if (isArray!MemberType)
{ // Workaround. This code is never called with: not an array type, but compiler prints an error
// name = fullyQualifiedName!(Unqual!(ForeachType!MemberType));//.stringof;
name = fullName!(Unqual!(ForeachType!MemberType));
name = fullName!(Unqual!(typeof(MemberType.init[0])));
}
bool is_optional;
@ -691,7 +691,7 @@ export struct EntityManager
static if (isArray!MemberType)
{ // Workaround. This code is never called with: not an array type, but compiler prints an error
// name = fullyQualifiedName!(Unqual!(ForeachType!MemberType));
name = fullName!(Unqual!(ForeachType!MemberType));
name = fullName!(Unqual!(typeof(MemberType.init[0])));
//name = Unqual!(ForeachType!MemberType).stringof;
}
@ -899,10 +899,12 @@ export struct EntityManager
static foreach (iii, comp_info; components_info.m_req[0
.. components_info.m_req_counter])
{
__traits(getMember, input_data, comp_info.name) = (cast(ForeachType!(typeof(__traits(getMember,
Sys.EntitiesData, comp_info.name)))*)(
cast(void*) block + info.deltas[system.m_components[iii]]))[offset
.. entities_count];
__traits(getMember, input_data, comp_info.name) = (
cast(typeof(
(typeof(__traits(getMember, Sys.EntitiesData, comp_info.name))).init[0]
)*)
(cast(void*) block + info.deltas[system.m_components[iii]])
)[offset .. entities_count];
}
static foreach (iii, comp_info; components_info.m_optional[0