diff --git a/source/bubel/ecs/manager.d b/source/bubel/ecs/manager.d index c1eb62a..15d1f6e 100644 --- a/source/bubel/ecs/manager.d +++ b/source/bubel/ecs/manager.d @@ -104,8 +104,8 @@ export struct EntityManager Mallocator.dispose(system.jobs); if (system.m_read_only_components) Mallocator.dispose(system.m_read_only_components); - if (system.m_modified_components) - Mallocator.dispose(system.m_modified_components); + if (system.m_writable_components) + Mallocator.dispose(system.m_writable_components); if (system.m_components) Mallocator.dispose(system.m_components); if (system.m_excluded_components) @@ -656,7 +656,7 @@ export struct EntityManager size_t opt = components_info.optional.length; size_t excluded = components_info.excluded.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 writable_deps = components_info.writableDeps.length; @@ -668,8 +668,8 @@ export struct EntityManager system.m_excluded_components = Mallocator.makeArray!ushort(excluded); if (read_only > 0) system.m_read_only_components = Mallocator.makeArray!ushort(read_only); - if (modified > 0) - system.m_modified_components = Mallocator.makeArray!ushort(modified); + if (writable > 0) + system.m_writable_components = Mallocator.makeArray!ushort(writable); if (read_only_deps > 0) system.m_readonly_dependencies = Mallocator.makeArray!ushort(read_only_deps); if (writable_deps > 0) @@ -870,7 +870,7 @@ export struct EntityManager else assert(comp != ushort.max, "Can't register system \"" ~ Sys.stringof ~ "\" 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 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) { @@ -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) { @@ -2973,7 +2973,7 @@ export struct EntityManager continue out_for; } } - foreach (cmp2; caller2.system.m_modified_components) + foreach (cmp2; caller2.system.m_writable_components) { if (cmp == cmp2) { diff --git a/source/bubel/ecs/system.d b/source/bubel/ecs/system.d index 5bf750b..7bcaf01 100644 --- a/source/bubel/ecs/system.d +++ b/source/bubel/ecs/system.d @@ -127,7 +127,7 @@ package: //System*[] m_dependencies; ushort[] m_read_only_components; - ushort[] m_modified_components; + ushort[] m_writable_components; ushort[] m_readonly_dependencies; ushort[] m_writable_dependencies;