.gitignore

@@ -1,8 +1,9 @@
 *
+!*/
 !source/**
 !tests/**
 !README.md
-!dub.json
+!./dub.json
 !.gitignore
 !codecov.yml
 !skeleton.html
@@ -11,5 +12,3 @@
 !meson_options.txt
 !compile_wasm.py
 !compile_android.py
-!.gitlab-ci.yml
-!LICENSE

.gitlab-ci.yml

@@ -23,7 +23,7 @@ build_code:
 
 test_dmd_debug:
     stage: test    
-    image: debian:buster-slim
+    image: frolvlad/alpine-glibc
     script:
         - binaries/dmd_debug_unittest
     artifacts:
@@ -31,7 +31,7 @@ test_dmd_debug:
             junit: test_report.xml
 test_dmd:
     stage: test    
-    image: debian:buster-slim
+    image: frolvlad/alpine-glibc
     script:
         - binaries/dmd_release_unittest
     artifacts:
@@ -39,7 +39,7 @@ test_dmd:
             junit: test_report.xml
 test_dmd_betterC:
     stage: test    
-    image: debian:buster-slim
+    image: frolvlad/alpine-glibc
     script:
         - binaries/dmd_debug_unittest_bc
     artifacts:
@@ -56,7 +56,7 @@ coverage_test_dmd:
         - mkdir reports
         - binaries/dmd_unittest_cov
     after_script:
-        - bash <(curl -s https://codecov.io/bash) -s reports -t df87b1d8-85f4-4584-96e3-1315d27ec2c5
+        - bash <(curl -s https://codecov.io/bash) -s reports -t 1a0c0169-a721-4085-8252-fed4755dcd8c
 
 wasm:
     stage: build_wasm

README.md

@@ -10,13 +10,6 @@ Bubel ECS was tested on Linux, Windows, Android and WASM.
 
 **Currently library is in beta stage so some significant API changes can appear.**
 
-Package is available on [DUB package repository](https://code.dlang.org/packages/bubel-ecs). Usage:
-```
-    "dependencies": {
-        "bubel-ecs": "~>0.1.1"
-    }
-```
-
 ## Design
 
 For core information about Entity-Component-System architectural pattern please read definition described at [Wikipedia](https://en.wikipedia.org/wiki/Entity_component_system).

compile_wasm.py

@@ -13,7 +13,7 @@ def compile(sources, output):
                     if file_extension == '.d' and filename != 'package':
                         files.append(os.path.join(r, file))
 
-    ldc_cmd = 'ldc2 ' + shared_flags + ldc_flags + '-oq -mtriple=wasm32-unknown-emscripten -betterC --output-bc --od=.bc --singleobj --checkaction=C --of=' + output + ' '
+    ldc_cmd = 'ldc2 ' + shared_flags + ldc_flags + '-oq -mtriple=wasm32-unknown-unknown-wasm -betterC --output-bc --od=.bc --singleobj --checkaction=C --of=' + output + ' '
 
     for path in sources:
         ldc_cmd += '-I' + path + ' '
@@ -33,7 +33,7 @@ def compile(sources, output):
 shared_flags = ''
 clean = 0
 emc_flags = ''
-ldc_flags = ''
+ldc_flags = '--d-version=ECSEmscripten '
 import_paths = ['source','tests']
 build_tests = 0
 

demos/compile_wasm.py

@@ -1,6 +1,7 @@
 import os
 import ntpath
 import sys
+import imp
 
 def compile(sources, output):
     files = []
@@ -13,7 +14,7 @@ def compile(sources, output):
                     if file_extension == '.d' and filename != 'package':
                         files.append(os.path.join(r, file))
 
-    ldc_cmd = compiler + shared_flags + ldc_flags + '-oq -mtriple=wasm32-unknown-emscripten -betterC --output-bc --od=.bc --singleobj --checkaction=C --of=' + output + ' '
+    ldc_cmd = compiler + shared_flags + ldc_flags + '-oq -mtriple=wasm32-unknown-unknown-wasm -betterC --output-bc --od=.bc --singleobj --checkaction=C --of=' + output + ' '
 
     for path in sources:
         ldc_cmd += '-I' + path + ' '
@@ -40,7 +41,7 @@ only_bc = 0
 multi = 0
 sources = ['tests', 'source']
 emc_flags = '-s USE_SDL=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS="[\'png\']" '
-ldc_flags = '--d-version=SDL_209 --d-version=BindSDL_Static --d-version=BindSDL_Image --d-version=MM_USE_POSIX_THREADS '
+ldc_flags = '--d-version=ECSEmscripten --d-version=SDL_209 --d-version=BindSDL_Static --d-version=BindSDL_Image --d-version=MM_USE_POSIX_THREADS '
 import_paths = ['external/sources', 'external/imports', 'external/wasm_imports', '../source', 'utils/source', 'simple/source']
 
 for arg in sys.argv[1:]:
@@ -120,9 +121,8 @@ emcc_cmd += 'demo.bc '
 
 os.system("mkdir build")
 
-# emscripten = imp.load_source('', os.path.expanduser("~") + '/.emscripten')
+emscripten = imp.load_source('', os.path.expanduser("~") + '/.emscripten')
-# pack_cmd = emscripten.EMSCRIPTEN_ROOT + '/tools/file_packager.py build/assets.data --preload assets --js-output=build/assets.js'
+pack_cmd = emscripten.EMSCRIPTEN_ROOT + '/tools/file_packager.py build/assets.data --preload assets --js-output=build/assets.js'
-pack_cmd = os.path.expandvars('$EMSDK/upstream/emscripten') + '/tools/file_packager.py build/assets.data --preload assets --js-output=build/assets.js'
 print('Packafing files: ' + pack_cmd)
 
 os.system(pack_cmd)

demos/meson.build

@@ -19,7 +19,7 @@ sdl2_image_dep = dependency('SDL2_image')
 
 subdir('utils') # Utils library
 
-executable('BubelECSDemos', [demos_src, external_src], 
+executable('decs-demos', [demos_src, external_src], 
 	include_directories : [demos_inc, external_inc],
 	d_module_versions : versions,
 	link_with : [ecs_lib, ecs_utils_lib],
@@ -27,7 +27,7 @@ executable('BubelECSDemos', [demos_src, external_src],
 		bindbc_loader_dep,
 		bindbc_sdl_dep,
 		cimgui_dep,
-		bubel_ecs_dep,
+		decs_dep,
 		ecs_utils_dep,
 		sdl2_dep,
 		sdl2_image_dep,

demos/utils/meson.build

@@ -5,12 +5,12 @@ subdir('source/ecs_utils')
 utils_inc = include_directories('source/')
 
 # Dependencies
-ecs_utils_lib = library('ECSUtils', utils_src,
+ecs_utils_lib = library('ecs_utils', utils_src,
 	include_directories : [demos_inc, external_inc, utils_inc],
 	link_args : link_args, 
 	d_module_versions : versions,
 	dependencies : [
-		bubel_ecs_dep,
+		decs_dep,
 		bindbc_loader_dep,
 		bindbc_sdl_dep,
 	]

dub.json

@@ -1,11 +1,11 @@
 {
-	"name": "bubel-ecs",
+	"name": "bubel_ecs",
-    "targetName" : "BubelECS",
+    "targetName" : "bubel_ecs",
 	"authors": [
 		"Michał Masiukiewicz", "Dawid Masiukiewicz"
 	],
 	"description": "Dynamic Entity Component System",
-	"copyright": "Copyright © 2018-2023, Michał Masiukiewicz, Dawid Masiukiewicz",
+	"copyright": "Copyright © 2018-2019, Michał Masiukiewicz, Dawid Masiukiewicz",
 	"license": "BSD 3-clause",
 	"sourcePaths" : ["source\/"],
 	"excludedSourceFiles":[
@@ -63,7 +63,7 @@
 			],
 			"dflags": [
 				"-unittest",
-				"-cov=ctfe"
+				"-cov"
 			]
 		},
 		{

meson.build

@@ -1,4 +1,4 @@
-project('bubel-ecs', 'd', version : '0.5.0')
+project('decs', 'd', version : '0.5.0')
 
 # Options
 betterC_opt = get_option('betterC')
@@ -49,36 +49,23 @@ if betterC_opt
 	endif
 endif
 
-add_project_arguments(args, language : 'd')
+add_global_arguments(args, language : 'd')
-add_project_link_arguments(link_args, language : 'd')
+add_global_link_arguments(link_args, language : 'd')
 
 # Dependencies
 threads_dep = dependency('threads')
 
-d_versions = []
+ecs_lib = library('decs',
-deps = []
-if host_machine.cpu_family() == 'wasm32'
-
-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(
+decs_dep = declare_dependency(
 	include_directories : [inc],
 	link_with : ecs_lib,
-	dependencies : deps,
+	dependencies : threads_dep,	
 )
 
-meson.override_dependency('bubel-ecs', bubel_ecs_dep)
-
 # Tests
 if BuildTests_opt
 	subdir('tests')

source/bubel/ecs/atomic.d

@@ -4,10 +4,129 @@ It's internal code. Can be used for atomics if emscripten backend will be used.
 This module contain atomic operations which include support for emscripten atomics functions.
 Emscripten functions are contained in API similar to druntime.
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.atomic;
 
-public import core.atomic;
+version (Emscripten) version = ECSEmscripten;
 
+version (ECSEmscripten)
+{
+    import std.traits;
+
+    enum MemoryOrder
+    {
+        acq,
+        acq_rel,
+        raw,
+        rel,
+        seq
+    }
+
+    extern (C) ubyte emscripten_atomic_cas_u8(void* addr, ubyte oldVal, ubyte newVal) @nogc nothrow pure;
+    extern (C) ushort emscripten_atomic_cas_u16(void* addr, ushort oldVal, ushort newVal) @nogc nothrow pure;
+    extern (C) uint emscripten_atomic_cas_u32(void* addr, uint oldVal, uint newVal) @nogc nothrow pure;
+
+    extern (C) ubyte emscripten_atomic_load_u8(const void* addr) @nogc nothrow pure;
+    extern (C) ushort emscripten_atomic_load_u16(const void* addr) @nogc nothrow pure;
+    extern (C) uint emscripten_atomic_load_u32(const void* addr) @nogc nothrow pure;
+
+    extern (C) ubyte emscripten_atomic_store_u8(void* addr, ubyte val) @nogc nothrow pure;
+    extern (C) ushort emscripten_atomic_store_u16(void* addr, ushort val) @nogc nothrow pure;
+    extern (C) uint emscripten_atomic_store_u32(void* addr, uint val) @nogc nothrow pure;
+
+    extern (C) ubyte emscripten_atomic_add_u8(void* addr, ubyte val) @nogc nothrow pure;
+    extern (C) ushort emscripten_atomic_add_u16(void* addr, ushort val) @nogc nothrow pure;
+    extern (C) uint emscripten_atomic_add_u32(void* addr, uint val) @nogc nothrow pure;
+
+    extern (C) ubyte emscripten_atomic_sub_u8(void* addr, ubyte val) @nogc nothrow pure;
+    extern (C) ushort emscripten_atomic_sub_u16(void* addr, ushort val) @nogc nothrow pure;
+    extern (C) uint emscripten_atomic_sub_u32(void* addr, uint val) @nogc nothrow pure;
+
+    public pure nothrow @nogc Unqual!T atomicOp(string op, T, V1)(ref shared T val, V1 mod)
+    {
+        static if (op == "+=")
+        {
+            static if (is(T == byte) || is(T == ubyte))
+                return cast(Unqual!T)(emscripten_atomic_add_u8(cast(void*)&val,
+                        cast(Unqual!T) mod) + 1);
+            else static if (is(T == short) || is(T == ushort))
+                return cast(Unqual!T)(emscripten_atomic_add_u16(cast(void*)&val,
+                        cast(Unqual!T) mod) + 1);
+            else static if (is(T == int) || is(T == uint))
+                return cast(Unqual!T)(emscripten_atomic_add_u32(cast(void*)&val,
+                        cast(Unqual!T) mod) + 1);
+            else
+                static assert(0);
+        }
+        else static if (op == "-=")
+        {
+            static if (is(T == byte) || is(T == ubyte))
+                return cast(Unqual!T)(emscripten_atomic_sub_u8(cast(void*)&val,
+                        cast(Unqual!T) mod) - 1);
+            else static if (is(T == short) || is(T == ushort))
+                return cast(Unqual!T)(emscripten_atomic_sub_u16(cast(void*)&val,
+                        cast(Unqual!T) mod) - 1);
+            else static if (is(T == int) || is(T == uint))
+                return cast(Unqual!T)(emscripten_atomic_sub_u32(cast(void*)&val,
+                        cast(Unqual!T) mod) - 1);
+            else
+                static assert(0);
+        }
+    }
+
+    public pure nothrow @nogc @trusted void atomicStore(MemoryOrder ms = MemoryOrder.seq, T, V)(ref T val,
+            V newval)
+    {
+        alias UT = Unqual!T;
+        static if (is(UT == bool) || is(UT == byte) || is(UT == ubyte))
+            emscripten_atomic_store_u8(cast(void*)&val, cast(UT) newval);
+        else static if (is(UT == short) || is(UT == ushort))
+            emscripten_atomic_store_u16(cast(void*)&val, cast(UT) newval);
+        else static if (is(UT == int) || is(UT == uint))
+            emscripten_atomic_store_u32(cast(void*)&val, cast(UT) newval);
+        else
+            static assert(0);
+    }
+
+    public pure nothrow @nogc @trusted T atomicLoad(MemoryOrder ms = MemoryOrder.seq, T)(
+            ref const T val)
+    {
+        alias UT = Unqual!T;
+        static if (is(UT == bool))
+            return emscripten_atomic_load_u8(cast(const void*)&val) != 0;
+        else static if (is(UT == byte) || is(UT == ubyte))
+            return emscripten_atomic_load_u8(cast(const void*)&val);
+        else static if (is(UT == short) || is(UT == ushort))
+            return emscripten_atomic_load_u16(cast(const void*)&val);
+        else static if (is(UT == int) || is(UT == uint))
+            return emscripten_atomic_load_u32(cast(const void*)&val);
+        else
+            static assert(0);
+    }
+
+    public pure nothrow @nogc @trusted bool cas(MemoryOrder succ = MemoryOrder.seq,
+            MemoryOrder fail = MemoryOrder.seq, T, V1, V2)(T* here, V1 ifThis, V2 writeThis)
+    {
+        alias UT = Unqual!T;
+        static if (is(UT == bool))
+            return emscripten_atomic_cas_u8(cast(void*) here,
+                    cast(Unqual!T) ifThis, cast(Unqual!T) writeThis) == ifThis;
+        else static if (is(UT == byte) || is(UT == ubyte))
+            return emscripten_atomic_cas_u8(cast(void*) here,
+                    cast(Unqual!T) ifThis, cast(Unqual!T) writeThis) == ifThis;
+        else static if (is(UT == short) || is(UT == ushort))
+            return emscripten_atomic_cas_u16(cast(void*) here,
+                    cast(Unqual!T) ifThis, cast(Unqual!T) writeThis) == ifThis;
+        else static if (is(UT == int) || is(UT == uint))
+            return emscripten_atomic_cas_u32(cast(void*) here,
+                    cast(Unqual!T) ifThis, cast(Unqual!T) writeThis) == ifThis;
+        else
+            static assert(0);
+    }
+}
+else
+{
+    public import core.atomic;
+}

source/bubel/ecs/attributes.d

@@ -17,7 +17,7 @@ Struct EntitiesData
 }
 ---
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.attributes;

source/bubel/ecs/block_allocator.d

@@ -3,7 +3,7 @@ It's internal code.
 
 Module contain memory allocator.
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.block_allocator;

source/bubel/ecs/core.d

@@ -67,7 +67,7 @@ Struct System1
 }
 ---
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.core;
@@ -94,7 +94,7 @@ static struct ECS
 	*/
 	mixin template Component()
 	{
-		deprecated ComponentRef ref_() @nogc nothrow return 
+		ComponentRef ref_() @nogc nothrow return 
 		{
 			return ComponentRef(&this, becsID!(typeof(this)));
 		}

source/bubel/ecs/entity.d

@@ -1,7 +1,7 @@
 /************************************************************************************************************************
 Entity module.
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.entity;
@@ -44,7 +44,7 @@ struct Entity
         return cast(T*)getComponent(becsID!T);
     }
 
-    export void* getComponent(ushort component_id) const
+    void* getComponent(ushort component_id) const
     {
         EntityManager.EntitiesBlock* block = gEntityManager.getMetaData(&this);
         EntityManager.EntityInfo* info = block.type_info;
@@ -54,7 +54,7 @@ struct Entity
         return (cast(void*)block + info.deltas[component_id] + block.entityIndex(&this) * gEntityManager.components[component_id].size);
     }
 
-    export bool hasComponent(ushort component_id) const
+    bool hasComponent(ushort component_id) const
     {
         EntityManager.EntitiesBlock* block = gEntityManager.getMetaData(&this);
         EntityManager.EntityInfo* info = block.type_info;
@@ -62,7 +62,7 @@ struct Entity
         return true;
     }
 
-    export EntityMeta getMeta() const
+    EntityMeta getMeta() const
     {
         EntityMeta meta;
         meta.block = gEntityManager.getMetaData(&this);
@@ -85,7 +85,7 @@ struct EntityMeta
         return cast(T*)getComponent(becsID!T);
     }
     
-    export void* getComponent(ushort component_id) const
+    void* getComponent(ushort component_id) const
     {
         const (EntityManager.EntityInfo)* info = block.type_info;
 
@@ -95,7 +95,7 @@ struct EntityMeta
         return (cast(void*)block + info.deltas[component_id] + index * gEntityManager.components[component_id].size);
     }
 
-    export bool hasComponent(ushort component_id) const
+    bool hasComponent(ushort component_id) const
     {
         const EntityManager.EntityInfo* info = block.type_info;
         if (component_id >= info.deltas.length || info.deltas[component_id] == 0)return false;
@@ -133,7 +133,7 @@ export struct EntityTemplate
     /************************************************************************************************************************
     Get specified component. If component doesn't exist function return null. Returned pointer is valid during EntityTemplate lifetime.
     */
-    export void* getComponent(ushort component_id) const nothrow @nogc
+    void* getComponent(ushort component_id) const nothrow @nogc
     {
         if(component_id >= info.tmpl_deltas.length || info.tmpl_deltas[component_id] == ushort.max)return null;
         return cast(void*)(entity_data.ptr + info.tmpl_deltas[component_id]);

source/bubel/ecs/events.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module bubel.ecs.events;
 
 import bubel.ecs.block_allocator;

source/bubel/ecs/hash_map.d

@@ -1,8 +1,4 @@
-/************************************************************************************************************************
+module bubel.ecs.hash_map;
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
-module bubel.ecs.hash_map;
 
 import std.traits;
 
@@ -28,7 +24,7 @@ export ulong defaultHashFunc(T)(auto ref T t) nothrow @nogc
 	}
 }
 
-export ulong hash(byte[] array) nothrow @nogc
+ulong hash(byte[] array) nothrow @nogc
 {
 	ulong hash = 0;
 
@@ -336,36 +332,36 @@ nothrow:
 		return result;
 	}
 
-	export int byKey(scope int delegate(ref Key k) dg)
+	export int byKey(scope int delegate(Key k) nothrow dg)
 	{
 		int result;
 		foreach (ref Key k; this)
 		{
-			result = (cast(int delegate(ref Key k) nothrow @nogc)dg)(k);
+			result = dg(k);
 			if (result)
 				break;
 		}
 		return result;
 	}
 
-	export int byValue(scope int delegate(ref Value v) dg)
+	export int byValue(scope int delegate(ref Value k) nothrow dg)
 	{
 		int result;
 		foreach (ref Value v; this)
 		{
-			result = (cast(int delegate(ref Value v) nothrow @nogc)dg)(v);
+			result = dg(v);
 			if (result)
 				break;
 		}
 		return result;
 	}
 
-	export int byKeyValue(scope int delegate(ref Key k, ref Value v) dg)
+	export int byKeyValue(scope int delegate(ref Key k, ref Value v) nothrow dg)
 	{
 		int result;
 		foreach (ref Key k, ref Value v; this)
 		{
-			result = (cast(int delegate(ref Key k, ref Value v) nothrow @nogc)dg)(k, v);
+			result = dg(k, v);
 			if (result)
 				break;
 		}

source/bubel/ecs/id_manager.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module bubel.ecs.id_manager;
 
 import bubel.ecs.entity;

source/bubel/ecs/package.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module ecs;
 
 public import bubel.ecs.core;

source/bubel/ecs/simple_vector.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module bubel.ecs.simple_vector;
 
 import bubel.ecs.std;

source/bubel/ecs/std.d

@@ -2,14 +2,16 @@
 It's internal code!
 This module contain implementation of standard functionality.
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.std;
 
+version (Emscripten) version = ECSEmscripten;
+
 import std.traits;
 
-version (Emscripten)
+version (ECSEmscripten)
 {
     extern (C) struct pthread_mutex_t
     {
@@ -27,6 +29,10 @@ version (Emscripten)
 
     extern (C) int memcmp(const void* s1, const void* s2, size_t size);
     extern (C) void exit(int status) nothrow @nogc;
+    extern (C) void __assert(const(char)* msg, const(char)* file, uint line)
+    {
+        exit(-20);
+    }
 
     extern (C) void free(void*) @nogc nothrow @system;
     extern (C) void* malloc(size_t size) @nogc nothrow @system;
@@ -54,7 +60,7 @@ else
     public import core.stdc.stdlib : qsort;
 }
 
-version (Emscripten)
+version (ECSEmscripten)
 {
 }
 else version (Windows)
@@ -83,7 +89,7 @@ else version (Posix)
     import core.sys.posix.stdlib : posix_memalign;
 }
 
-version (Emscripten)
+version (ECSEmscripten)
 {
     private const uint max_alloca = 10000;
     private __gshared byte[max_alloca] alloca_array;
@@ -288,7 +294,7 @@ static struct Mallocator
             posix_memalign(&ret, alignment, length); //ret = aligned_alloc(alignment, length);
         else version (Windows)
             ret = _aligned_malloc(length, alignment);
-        else version (Emscripten)
+        else version (ECSEmscripten)
             posix_memalign(&ret, alignment, length); //malloc(length);
         else
             static assert(0, "Unimplemented platform!");
@@ -335,7 +341,7 @@ static struct Mallocator
             free(cast(void*) object);
         else version (Windows)
             _aligned_free(cast(void*) object);
-        else version (Emscripten)
+        else version (ECSEmscripten)
             free(cast(void*) object);
         else
             static assert(0, "Unimplemented platform!");
@@ -345,7 +351,7 @@ static struct Mallocator
 struct Mutex
 {
 
-    version (Emscripten)
+    version (ECSEmscripten)
     {
         void initialize() nothrow @nogc
         {

source/bubel/ecs/system.d

@@ -1,7 +1,7 @@
 /************************************************************************************************************************
 System module.
 
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
+Copyright: Copyright © 2018-2019, Dawid Masiukiewicz, Michał Masiukiewicz
 License: BSD 3-clause, see LICENSE file in project root folder.
 */
 module bubel.ecs.system;
@@ -13,14 +13,14 @@ import bubel.ecs.manager;
 System contain data required to proper glue EntityManager with Systems.
 System callbacks:
 $(LIST
-    * void onUpdate(EntitiesData);
+    * void onUpdate(EntitesData);
     * void onEnable() - called inside system.enable() function
     * void onDisable() - called inside system.disable() function
     * bool onBegin() - called inside manager.begin()
     * void onEnd() - called inside manager.end()
     * void onCreate() - called after registration inside registerSystem function
     * void onDestroy() - called during re-registration and inside manager destructor
-    * void onAddEntity(EntitiesData) - called for every entity which are assigned to system (by adding new entity or changing its components)
+    * void onAddEntity(EntitesData) - called for every entity which are assigned to system (by adding new entity or changing its components)
     * void onRemoveEntity(EntitiesData) - called for every entity removed from system update process
     * void onChangeEntity(EntitiesData) - called for every entity which components are changed but it was previously assigned to system
     * void handleEvent(Entity*, Event) - called for every event supported by system
@@ -89,100 +89,38 @@ struct System
         return cast(const(char)[]) m_name;
     }
 
-    /************************************************************************************************************************
-    Return false if system was unregistered, true otherwise.
-    */
-    export bool isAlive() nothrow @nogc
-    {
-        return m_system_pointer != null;
-    }
-
-    /************************************************************************************************************************
-    Return pointer to user side system object
-    */
-    export void* ptr() nothrow @nogc
-    {
-        return m_system_pointer;
-    }
-
 package:
 
-    ///destory system. Dispose all data
+    void destroy()
-    export void destroy() nothrow @nogc
-    {
-        import bubel.ecs.std : Mallocator;
-
-        destroySystemData();
-
-        if (m_name)
-        {
-            Mallocator.dispose(m_name);
-            m_name = null;
-        }
-    }
-
-    ///destroy all system data but keeps name which is used for case of system re-registration
-    void destroySystemData() nothrow @nogc
     {
         import bubel.ecs.std : Mallocator;
         disable();
         if (m_destroy)
-        {
+            (cast(void function(void*)) m_destroy)(m_system_pointer);
-            (cast(void function(void*) nothrow @nogc) m_destroy)(m_system_pointer);
-            m_destroy = null;
-        }
 
+        if (m_name)
+            Mallocator.dispose(m_name);
         if (m_components)
-        {
             Mallocator.dispose(m_components);
-            m_components = null;
-        }
         if (m_excluded_components)
-        {
             Mallocator.dispose(m_excluded_components);
-            m_excluded_components = null;
-        }
         if (m_optional_components)
-        {
             Mallocator.dispose(m_optional_components);
-            m_optional_components = null;
-        }
         if (jobs)
-        {
             Mallocator.dispose(jobs);
-            jobs = null;
-        }
         if (m_read_only_components)
-        {
             Mallocator.dispose(m_read_only_components);
-            m_read_only_components = null;
-        }
         if (m_writable_components)
-        {
             Mallocator.dispose(m_writable_components);
-            m_writable_components = null;
-        }
         if (m_readonly_dependencies)
-        {
             Mallocator.dispose(m_readonly_dependencies);
-            m_readonly_dependencies = null;
-        }
         if (m_writable_dependencies)
-        {
             Mallocator.dispose(m_writable_dependencies);
-            m_writable_dependencies = null;
-        }
         if (m_event_callers)
-        {
             Mallocator.dispose(m_event_callers);
-            m_event_callers = null;
-        }
 
         if (m_system_pointer)
-        {
             Mallocator.dispose(m_system_pointer);
-            m_system_pointer = null;
-        }
     }
 
     struct EventCaller

source/bubel/ecs/traits.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module bubel.ecs.traits;
 
 import std.traits;
@@ -11,11 +7,8 @@ import std.traits;
 */
 ref ushort becsID(T)()
 {
-	/// Embed id in struct so export can be added to variable definition
+	__gshared ushort id = ushort.max;
-	static struct LocalStruct {
+	return id;
-		export __gshared ushort id = ushort.max;
-	}
-	return LocalStruct.id;
 }
 
 /************************************************************************************************************************
@@ -73,7 +66,7 @@ static string attachParentName(alias T, string str)()
 		{
 			return attachParentName!(parent, parent_str[7 .. $] ~ '.' ~ str);
 		}
-		else return parent_str[7 .. $] ~ '.' ~ str;
+		else return parent_str[8 .. $] ~ '.' ~ str;
 	}
 	else static if(parent_str[0..8] == "package ")
 	{

source/bubel/ecs/vector.d

@@ -1,7 +1,3 @@
-/************************************************************************************************************************
-Copyright: Copyright © 2018-2023, Dawid Masiukiewicz, Michał Masiukiewicz
-License: BSD 3-clause, see LICENSE file in project root folder.
-*/
 module bubel.ecs.vector;
 
 import core.bitop;

tests/basic.d

@@ -16,7 +16,7 @@ else import std.array : staticArray;
 
 struct CInt
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -25,7 +25,7 @@ struct CInt
 
 struct CFloat
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -34,7 +34,7 @@ struct CFloat
 
 struct CDouble
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -43,7 +43,7 @@ struct CDouble
 
 struct CLong
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -52,7 +52,7 @@ struct CLong
 
 struct CShort
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -61,7 +61,7 @@ struct CShort
 
 struct CUnregistered
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 
     alias value this;
 
@@ -70,7 +70,7 @@ struct CUnregistered
 
 struct CFlag
 {
-    // mixin ECS.Component;
+    mixin ECS.Component;
 }
 
 struct LongAddSystem
@@ -113,31 +113,6 @@ struct EmptySystem
     int count = 0;
 }
 
-struct EntityCounterSystem
-{
-    mixin ECS.System!1;
-
-    struct EntitiesData
-    {
-        int thread_id;
-        uint length;
-        Entity[] entity;
-    }
-
-    bool onBegin()
-    {
-        count = 0;
-        return true;
-    }
-
-    void onUpdate(EntitiesData data)
-    {
-        count += data.length;
-    }
-
-    int count = 0;
-}
-
 void beforeEveryTest()
 {
     becsID!CUnregistered = ushort.max;
@@ -207,18 +182,17 @@ unittest
     assert(*entity2.getComponent!CInt == 2);
     assert(*entity2.getComponent!CFloat == 2.0);
 
-    CInt int1 = CInt(10);
+    //CInt cint = CInt(10);
-    CLong long1 = CLong();
+    //CLong clong;
-    CFlag flag1 = CFlag();
+    //Entity* entity3 = gEntityManager.addEntity(tmpl_, [cint.ref_, clong.ref_].staticArray);
-    Entity* entity3 = gEntityManager.addEntity(tmpl_, [ComponentRef(&int1, becsID(int1)), ComponentRef(&long1, becsID(long1)), ComponentRef(&flag1, becsID(flag1))].staticArray);
+    Entity* entity3 = gEntityManager.addEntity(tmpl_, [CInt(10).ref_, CLong().ref_, CFlag().ref_].staticArray);
     EntityID id = entity3.id;
     assert(entity3.hasComponent(becsID!CInt));
     assert(entity3.hasComponent(becsID!CFloat));
     assert(*entity3.getComponent!CInt == 10);
     assert(*entity3.getComponent!CFloat == 2.0);
 
-    CShort short1 = CShort(2);
+    gEntityManager.addComponents(entity3.id, [CFlag().ref_,CShort(2).ref_].staticArray);
-    gEntityManager.addComponents(entity3.id, [ComponentRef(&flag1, becsID(flag1)),ComponentRef(&short1, becsID(short1))].staticArray);
     gEntityManager.commit();
     entity3 = gEntityManager.getEntity(id);
     assert(entity3.getComponent!CInt);
@@ -239,7 +213,7 @@ unittest
     assert(*entity3.getComponent!CInt == 10);
     assert(*entity3.getComponent!CFloat == 2.0);
 
-    gEntityManager.addComponents(entity3.id, [ComponentRef(&flag1, becsID(flag1)),ComponentRef(&short1, becsID(short1))].staticArray);
+    gEntityManager.addComponents(entity3.id, [CFlag().ref_,CShort(2).ref_].staticArray);
     gEntityManager.removeComponents(entity3.id, [becsID!CUnregistered].staticArray);
     gEntityManager.commit();
     entity3 = gEntityManager.getEntity(id);
@@ -257,8 +231,7 @@ unittest
 
     gEntityManager.endRegister();
 
-    CUnregistered unregistered1 = CUnregistered(4);
+    gEntityManager.addComponents(entity3.id, [CUnregistered(4).ref_].staticArray);
-    gEntityManager.addComponents(entity3.id, [ComponentRef(&unregistered1, becsID(unregistered1))].staticArray);
     gEntityManager.commit();
     entity3 = gEntityManager.getEntity(id);
     assert(entity3.getComponent!CUnregistered);
@@ -268,82 +241,7 @@ unittest
     gEntityManager.commit();
     entity3 = gEntityManager.getEntity(id);
     assert(!entity3.getComponent!CUnregistered);
-}
 
-@("AddEmptyEntity")
-unittest
-{
-    struct OnAddRemoveChangeCounter
-    {
-        mixin ECS.System!1;
-
-        struct EntitiesData
-        {
-            int thread_id;
-            uint length;
-            Entity[] entity;
-        }
-
-        void onAddEntity(EntitiesData data)
-        {
-            add += data.length;
-        }
-        
-        void onRemoveEntity(EntitiesData data)
-        {
-            assert(0, "It's impossible to remove entity from being updated by system which accept empty entity");
-        }
-
-        int add = 0;
-    }
-
-    gEntityManager.beginRegister();
-
-    gEntityManager.registerSystem!EntityCounterSystem(0);
-    gEntityManager.registerSystem!OnAddRemoveChangeCounter(1);
-
-    gEntityManager.endRegister();
-
-    CLong long_component = CLong(3);
-
-    Entity* entity = null;
-    EntityID entity_id = gEntityManager.addEntity(null).id;
-
-    EntityCounterSystem* system = gEntityManager.getSystem!EntityCounterSystem;
-    assert(system !is null);
-    assert(system.count == 0);
-
-    OnAddRemoveChangeCounter* add_remove_change_system = gEntityManager.getSystem!OnAddRemoveChangeCounter;
-    assert(add_remove_change_system !is null);
-    assert(add_remove_change_system.add == 0);
-
-    gEntityManager.commit();
-    assert(add_remove_change_system.add == 1);
-
-    entity = gEntityManager.getEntity(entity_id);
-    assert(!entity.hasComponent(becsID!CLong));
-    assert(entity.getComponent(becsID!CLong) is null);
-    
-
-    gEntityManager.begin();
-    gEntityManager.update();
-    assert(system.count == 1);
-    gEntityManager.end();
-
-    gEntityManager.addEntityCopy(entity_id);
-    gEntityManager.addEntityCopy(entity_id);
-    gEntityManager.addComponents(entity_id, [ComponentRef(&long_component, becsID(long_component))].staticArray);
-    gEntityManager.commit();
-    assert(add_remove_change_system.add == 3, "onAddEntity missed");
-
-    entity = gEntityManager.getEntity(entity_id);
-    assert(entity.hasComponent(becsID!CLong));
-    assert(*entity.getComponent!CLong == 3);
-
-    gEntityManager.begin();
-    gEntityManager.update();
-    assert(system.count == 3);
-    gEntityManager.end();
 }
 
 //allocate templates

tests/bugs.d

@@ -119,12 +119,8 @@ unittest
     gEntityManager.endRegister();
 
     EntityTemplate* tmpl = gEntityManager.allocateTemplate([becsID!CInt, becsID!CLong].staticArray);
-
+    EntityID id = gEntityManager.addEntity(tmpl,[CLong(10).ref_, CInt(6).ref_].staticArray).id;
-    CLong clong = CLong(10);
+    EntityID id2 = gEntityManager.addEntity(tmpl,[CInt(4).ref_].staticArray).id;
-    CInt cint = CInt(6);
-    CInt cint2 = CInt(4);
-    EntityID id = gEntityManager.addEntity(tmpl,[ComponentRef(&clong, becsID(clong)), ComponentRef(&cint, becsID(cint))].staticArray).id;
-    EntityID id2 = gEntityManager.addEntity(tmpl,[ComponentRef(&cint2, becsID(cint2))].staticArray).id;
     gEntityManager.freeTemplate(tmpl);
     gEntityManager.commit();
 
@@ -144,32 +140,3 @@ unittest
 
     gEntityManager.destroy();
 }
-
-@("2-empty-entity-crash")
-unittest
-{
-    
-    gEntityManager.initialize(0);
-
-    gEntityManager.beginRegister();
-
-    gEntityManager.registerComponent!CInt;
-    gEntityManager.registerComponent!CFloat;
-
-    gEntityManager.endRegister();
-
-
-    EntityTemplate* tmpl = gEntityManager.allocateTemplate([becsID!CInt, becsID!CFloat].staticArray);
-    scope(exit) gEntityManager.freeTemplate(tmpl);
-
-    EntityID id = gEntityManager.addEntity(tmpl).id;
-    // EntityID id2 = gEntityManager.addEntity().id;
-
-    gEntityManager.commit();
-
-    gEntityManager.removeComponents(id, [becsID!CInt, becsID!CFloat].staticArray);
-
-    gEntityManager.commit();
-
-    gEntityManager.destroy();
-}

tests/meson.build

@@ -10,7 +10,7 @@ tests_src = files(
 	'vector.d'
 )
 
-exe = executable('BubelECSTests',
+exe = executable('decs-tests',
 	tests_src,
 	include_directories : [inc, include_directories('..')],
 	d_args : args,