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

Demos #10

Merged
Mergul merged 39 commits from Demos into master 2020-05-28 18:48:45 +02:00
Conversation 4 Commits 39 Files changed 62 +10 -10
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1b925b7ab1 - Show all commits

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

@ -104,8 +104,8 @@ export struct EntityManager
Mallocator.dispose(system.jobs); Mallocator.dispose(system.jobs);
if (system.m_read_only_components) if (system.m_read_only_components)
Mallocator.dispose(system.m_read_only_components); Mallocator.dispose(system.m_read_only_components);
if (system.m_modified_components) if (system.m_writable_components)
Mallocator.dispose(system.m_modified_components); Mallocator.dispose(system.m_writable_components);
if (system.m_components) if (system.m_components)
Mallocator.dispose(system.m_components); Mallocator.dispose(system.m_components);
if (system.m_excluded_components) if (system.m_excluded_components)
@ -656,7 +656,7 @@ export struct EntityManager
size_t opt = components_info.optional.length; size_t opt = components_info.optional.length;
size_t excluded = components_info.excluded.length; size_t excluded = components_info.excluded.length;
size_t read_only = components_info.readonly.length; size_t read_only = components_info.readonly.length;
size_t modified = components_info.mutable.length; size_t writable = components_info.mutable.length;
size_t read_only_deps = components_info.readonlyDeps.length; size_t read_only_deps = components_info.readonlyDeps.length;
size_t writable_deps = components_info.writableDeps.length; size_t writable_deps = components_info.writableDeps.length;
@ -668,8 +668,8 @@ export struct EntityManager
system.m_excluded_components = Mallocator.makeArray!ushort(excluded); system.m_excluded_components = Mallocator.makeArray!ushort(excluded);
if (read_only > 0) if (read_only > 0)
system.m_read_only_components = Mallocator.makeArray!ushort(read_only); system.m_read_only_components = Mallocator.makeArray!ushort(read_only);
if (modified > 0) if (writable > 0)
system.m_modified_components = Mallocator.makeArray!ushort(modified); system.m_writable_components = Mallocator.makeArray!ushort(writable);
if (read_only_deps > 0) if (read_only_deps > 0)
system.m_readonly_dependencies = Mallocator.makeArray!ushort(read_only_deps); system.m_readonly_dependencies = Mallocator.makeArray!ushort(read_only_deps);
if (writable_deps > 0) if (writable_deps > 0)
@ -870,7 +870,7 @@ export struct EntityManager
else else
assert(comp != ushort.max, "Can't register system \"" ~ Sys.stringof assert(comp != ushort.max, "Can't register system \"" ~ Sys.stringof
~ "\" due to non existing component \"" ~ comp_info.type ~ "\"."); ~ "\" due to non existing component \"" ~ comp_info.type ~ "\".");
system.m_modified_components[iii] = comp; system.m_writable_components[iii] = comp;
} }
} }
@ -2954,7 +2954,7 @@ export struct EntityManager
///check for component dependencies ///check for component dependencies
foreach (cmp; caller.system.m_read_only_components) foreach (cmp; caller.system.m_read_only_components)
{ {
foreach (cmp2; caller2.system.m_modified_components) foreach (cmp2; caller2.system.m_writable_components)
{ {
if (cmp == cmp2) if (cmp == cmp2)
{ {
@ -2963,7 +2963,7 @@ export struct EntityManager
} }
} }
} }
foreach (cmp; caller.system.m_modified_components) foreach (cmp; caller.system.m_writable_components)
{ {
foreach (cmp2; caller2.system.m_read_only_components) foreach (cmp2; caller2.system.m_read_only_components)
{ {
@ -2973,7 +2973,7 @@ export struct EntityManager
continue out_for; continue out_for;
} }
} }
foreach (cmp2; caller2.system.m_modified_components) foreach (cmp2; caller2.system.m_writable_components)
{ {
if (cmp == cmp2) if (cmp == cmp2)
{ {

2
source/bubel/ecs/system.d
View file

@ -127,7 +127,7 @@ package:
//System*[] m_dependencies; //System*[] m_dependencies;
ushort[] m_read_only_components; ushort[] m_read_only_components;
ushort[] m_modified_components; ushort[] m_writable_components;
ushort[] m_readonly_dependencies; ushort[] m_readonly_dependencies;
ushort[] m_writable_dependencies; ushort[] m_writable_dependencies;