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

-registering same system multiple times only replace pointer for callback

Browse source 
-added export attributes (required by windows to make DLL library, not work at now due to DMD bugs)
-interface D files to import
This commit is contained in:
Mergul 2018-09-18 13:28:04 +02:00
parent cb0f56b0fb
commit d0fcdba6cd
20 changed files with 1322 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -10,4 +10,8 @@ perf.data.old
*.obj *.obj
*.exe *.exe
*.lib *.lib
*.so *.so
*.def
*.lib
*.dll
*.exp

12
dub.json
View file

@ -16,6 +16,18 @@
"name" : "tests", "name" : "tests",
"sourcePaths" : ["source\/","tests\/"], "sourcePaths" : ["source\/","tests\/"],
"targetType" : "executable" "targetType" : "executable"
},
{
"name" : "dynlib",
"targetType" : "dynamicLibrary"
},
{
"name" : "sources",
"targetType" : "dynamicLibrary",
"dflags": [
"-Hdimport/",
"-op"
]
} }
] ]
} }

112
import/ecs/ecs.di Normal file
View file

@ -0,0 +1,112 @@
// D import file generated from 'source\ecs\ecs.d'
module ecs.ecs;
import std.stdio;
version (Design)
{
alias SytemFuncType = void function(ref SystemCallData data, void* componentsStart);
struct HasComponentsStore
{
ulong[4] bits;
bool has(HasComponentsStore components);
bool notIn(HasComponentsStore components);
int length();
}
struct ComponentInfo
{
int size;
int aligment;
SerializeJSON funsSerJ;
SerializeBiN funcSerB;
}
struct System
{
HasComponentsStore requiredComponents;
HasComponentsStore absenComponents;
HasComponentsStore maybeComponents;
bool enabled;
int priority;
SytemFuncType func;
}
struct SystemCallData
{
System* system;
int[] componentsDt;
}
struct EntityTypeData
{
HasComponentsStore components;
int[] deltas;
int totalSize;
int totalAligment = 8;
SystemCallData[] systems;
}
struct EntitiesBlock
{
EntityTypeData* typeData;
Entity* freeEntitySlot;
EntitiesBlock* nextBlock;
}
struct EntityID
{
ulong id = (ulong).max;
static immutable notUsedValue = EntityID((ulong).max);
}
struct Entity
{
EntityID entityID = EntityID.notUsedValue;
union
{
string name;
Entity* nextFreeSlot;
}
uint group;
EntityID entityID;
}
struct Template
{
HasComponentsStore hasComp;
Entity* entity;
}
struct Manager
{
EntityAllocator entityArrayAllcoator;
ComponentInfo[] components;
System[] systems;
HashMap!(HasComponentsStore, EntitiesBlock*) entitiesDatas;
HashMapTwoWays!(string, Entity*) nameMap;
HashMapTwoWays!(EntityID, Entity*) idMap;
EntitiesBlock* getEntitiesBlock(HasComponentsStore hasComponents);
EntitiesBlock* addNewBlock(HasComponentsStore hasComponents, EntitiesBlock* firstBlock);
void alignNum(ref int num, int aligment);
EntityTypeData* newEntityTypeData(HasComponentsStore hasComponents);
void addEntity(Template* templ);
void addSystem(Func)(int priority)
{
HasComponentsStore requiredComponents;
HasComponentsStore absenComponents;
HasComponentsStore maybeComponents;
void systemCaller(ref SystemCallData data, void* componentsStart);
System* system = new System(&systemCaller, entTypeData);
systems ~= system;
foreach (ref entTypeData; entitiesDatas)
{
if (!entTypeData.hasComp.has(requiredComponents) || !entTypeData.hasComp.notIn(absenComponents))
{
continue;
}
entTypeData.systems ~= system;
}
}
}
void someSystem(CompA a, CompB b, CompC* c);
void main();
class System
{
void start();
void end();
void update(ref ObjRend a);
void useEvent(EventData evvv, ref ObjRend a);
}
alias SerializeVector = ubyte[];
__gshared EntityManager gEntityManager;
}

30
import/ecs/entity.di Normal file
View file

@ -0,0 +1,30 @@
// D import file generated from 'source\ecs\entity.d'
module ecs.entity;
import ecs.manager;
struct EntityID
{
uint id;
uint counter;
}
struct Entity
{
EntityID id;
void updateID();
T* getComponent(T)()
{
EntityManager.EntitiesBlock* block = gEM.getMetaData(&this);
EntityManager.EntityInfo* info = block.type_data;
if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
return null;
return cast(T*)(cast(void*)&this + info.deltas[T.component_id]);
}
}
export struct EntityTemplate
{
ubyte[] entity_data;
EntityManager.EntityInfo* info;
T* getComponent(T)()
{
return cast(T*)(entity_data.ptr + info.deltas[T.component_id]);
}
}

11
import/ecs/entity_allocator.di Normal file
View file

@ -0,0 +1,11 @@
// D import file generated from 'source\ecs\entity_allocator.d'
module ecs.entity_allocator;
import ecs.manager;
import std.experimental.allocator;
import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
struct EntityAllocator
{
void* next_block;
void* getBlock();
private void allocBlock();
}

9
import/ecs/events.di Normal file
View file

@ -0,0 +1,9 @@
// D import file generated from 'source\ecs\events.d'
module ecs.events;
struct Event
{
uint type;
}
class EventManager
{
}

328
import/ecs/hash_map.di Normal file
View file

@ -0,0 +1,328 @@
// D import file generated from 'source\ecs\hash_map.d'
module ecs.hash_map;
import std.traits;
import ecs.vector;
import ecs.traits;
enum doNotInline = "version(DigitalMars)pragma(inline,false);version(LDC)pragma(LDC_never_inline);";
private enum HASH_EMPTY = 0;
private enum HASH_DELETED = 1;
private enum HASH_FILLED_MARK = ulong(1) << 8 * (ulong).sizeof - 1;
export ulong defaultHashFunc(T)(auto ref T t)
{
static if (isIntegral!T)
{
return hashInt(t);
}
else
{
return hashInt(t.hashOf);
}
}
export nothrow @nogc @safe ulong hashInt(ulong x);
struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc)
{
alias Key = KeyPar;
alias Value = ValuePar;
enum rehashFactor = 0.75;
enum size_t getIndexEmptyValue = size_t.max;
static struct KeyVal
{
Key key;
Value value;
}
static struct Bucket
{
ulong hash;
KeyVal keyValue;
}
Vector!Bucket elements;
size_t length;
size_t markerdDeleted;
export void clear()
{
elements.clear();
length = 0;
markerdDeleted = 0;
}
export void reset()
{
elements.reset();
length = 0;
markerdDeleted = 0;
}
export bool isIn(ref Key el)
{
return getIndex(el) != getIndexEmptyValue;
}
export bool isIn(Key el)
{
return getIndex(el) != getIndexEmptyValue;
}
export Value* getPtr()(auto ref Key k)
{
size_t index = getIndex(k);
if (index == getIndexEmptyValue)
{
return null;
}
else
{
return &elements[index].keyValue.value;
}
}
export ref Value get()(auto ref Key k)
{
size_t index = getIndex(k);
assert(index != getIndexEmptyValue);
return elements[index].keyValue.value;
}
deprecated("Use get with second parameter.") export auto ref Value getDefault()(auto ref Key k, auto ref Value defaultValue)
{
return get(k, defaultValue);
}
export auto ref Value get()(auto ref Key k, auto ref Value defaultValue)
{
size_t index = getIndex(k);
if (index == getIndexEmptyValue)
{
return defaultValue;
}
else
{
return elements[index].keyValue.value;
}
}
export ref Value getInsertDefault()(auto ref Key k, auto ref Value defaultValue)
{
size_t index = getIndex(k);
if (index == getIndexEmptyValue)
{
add(k, defaultValue);
}
index = getIndex(k);
assert(index != getIndexEmptyValue);
return elements[index].keyValue.value;
}
export bool tryRemove(Key el)
{
size_t index = getIndex(el);
if (index == getIndexEmptyValue)
{
return false;
}
length--;
elements[index].hash = HASH_DELETED;
markerdDeleted++;
return true;
}
export void remove(Key el)
{
bool ok = tryRemove(el);
assert(ok);
}
export ref Value opIndex()(auto ref Key key)
{
return get(key);
}
export void opIndexAssign()(auto ref Value value, auto ref Key key)
{
add(key, value);
}
export void add()(auto ref Key key, auto ref Value value)
{
size_t index = getIndex(key);
if (index != getIndexEmptyValue)
{
elements[index].keyValue.value = value;
return ;
}
if (getLoadFactor(length + 1) > rehashFactor || getLoadFactor(length + markerdDeleted) > rehashFactor)
{
rehash();
}
length++;
immutable ulong hash = hashFunc(key) | HASH_FILLED_MARK;
immutable size_t rotateMask = elements.length - 1;
index = hash & rotateMask;
while (true)
{
Bucket* gr = &elements[index];
if ((gr.hash & HASH_FILLED_MARK) == 0)
{
if (gr.hash == HASH_DELETED)
{
markerdDeleted--;
}
gr.hash = hash;
gr.keyValue.key = key;
gr.keyValue.value = value;
return ;
}
index++;
index = index & rotateMask;
}
}
export size_t getIndex(Key el)
{
return getIndex(el);
}
export size_t getIndex(ref Key el)
{
mixin(doNotInline);
immutable size_t groupsLength = elements.length;
if (groupsLength == 0)
{
return getIndexEmptyValue;
}
immutable ulong hash = hashFunc(el) | HASH_FILLED_MARK;
immutable size_t rotateMask = groupsLength - 1;
size_t index = hash & rotateMask;
while (true)
{
Bucket* gr = &elements[index];
if (gr.hash == hash && (gr.keyValue.key == el))
{
return index;
}
if (gr.hash == HASH_EMPTY)
{
return getIndexEmptyValue;
}
index++;
index = index & rotateMask;
}
}
export float getLoadFactor(size_t forElementsNum)
{
if (elements.length == 0)
{
return 1;
}
return cast(float)forElementsNum / elements.length;
}
export void rehash()
{
mixin(doNotInline);
Vector!KeyVal allElements;
allElements.reserve(elements.length);
foreach (ref Bucket el; elements)
{
if ((el.hash & HASH_FILLED_MARK) == 0)
{
el.hash = HASH_EMPTY;
continue;
}
el.hash = HASH_EMPTY;
allElements ~= el.keyValue;
}
if (getLoadFactor(length + 1) > rehashFactor)
{
elements.length = (elements.length ? elements.length : 4) << 1;
}
foreach (i, ref el; allElements)
{
add(el.key, el.value);
}
length = allElements.length;
markerdDeleted = 0;
}
export int opApply(DG)(scope DG dg)
{
int result;
foreach (ref Bucket gr; elements)
{
if ((gr.hash & HASH_FILLED_MARK) == 0)
{
continue;
}
static if (isForeachDelegateWithTypes!(DG, Key))
{
result = dg(gr.keyValue.key);
}
else
{
static if (isForeachDelegateWithTypes!(DG, Value))
{
result = dg(gr.keyValue.value);
}
else
{
static if (isForeachDelegateWithTypes!(DG, Key, Value))
{
result = dg(gr.keyValue.key, gr.keyValue.value);
}
else
{
static assert(0);
}
}
}
if (result)
break;
}
return result;
}
export int byKey(scope int delegate(Key k) dg)
{
int result;
foreach (ref Key k; this)
{
result = dg(k);
if (result)
break;
}
return result;
}
export int byValue(scope int delegate(ref Value k) dg)
{
int result;
foreach (ref Value v; this)
{
result = dg(v);
if (result)
break;
}
return result;
}
export int byKeyValue(scope int delegate(ref Key k, ref Value v) dg)
{
int result;
foreach (ref Key k, ref Value v; this)
{
result = dg(k, v);
if (result)
break;
}
return result;
}
import std.format : FormatSpec, formatValue;
export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt)
{
formatValue(sink, '[', fmt);
foreach (ref k, ref v; &byKeyValue)
{
formatValue(sink, k, fmt);
formatValue(sink, ':', fmt);
formatValue(sink, v, fmt);
formatValue(sink, ", ", fmt);
}
formatValue(sink, ']', fmt);
}
}
static void dumpHashMapToJson(T)(ref T map, string path = "HashMapDump.json")
{
Vector!char data;
import std.file;
import mutils.serializer.json;
JSONSerializer.instance.serialize!(Load.no)(map, data);
std.file.write(path, data[]);
}
static void printHashMap(T)(ref T map)
{
import std.stdio;
writeln(T.stringof, " dump:\x0a");
foreach (k, v; &map.byKeyValue)
{
writefln("%20s : %20s", k, v);
}
}

20
import/ecs/id_manager.di Normal file
View file

@ -0,0 +1,20 @@
// D import file generated from 'source\ecs\id_manager.d'
module ecs.id_manager;
import ecs.entity;
import ecs.vector;
struct IDManager
{
EntityID getNewID();
void releaseID(EntityID id);
void update(ref Entity entity);
Entity* getEntityPointer(EntityID id);
bool isExist(EntityID id);
struct Data
{
uint counter = 0;
uint next_id = (uint).max;
Entity* entity = null;
}
private uint m_next_id = 0;
Vector!Data m_ids_array;
}

287
import/ecs/manager.di Normal file
View file

@ -0,0 +1,287 @@
// D import file generated from 'source\ecs\manager.d'
module ecs.manager;
import std.algorithm : max;
import std.conv : to;
import std.experimental.allocator;
import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
import std.traits;
import core.stdc.stdlib;
import core.stdc.string;
import ecs.entity;
import ecs.entity_allocator;
import ecs.hash_map;
import ecs.id_manager;
import ecs.system;
import ecs.vector;
alias gEM = EntityManager.instance;
alias SerializeVector = ecs.vector.Vector!ubyte;
class EntityManager
{
export static void initialize();
export static void destroy();
export void registerSystem(Sys)(int priority)
{
alias types = Parameters!(Sys.update);
alias storages = ParameterStorageClassTuple!(Sys.update);
alias STC = ParameterStorageClass;
System system;
static string genCall()()
{
string ret = "s.update(*cast(Entity*)data_pointer,";
uint i = 0;
uint req = 0;
uint opt = 0;
static foreach (param; Parameters!(Sys.update)[1..$])
{
i++;
if (isPointer!param)
{
ret ~= "cast(types[" ~ i.to!string ~ "])(optional_pointers[" ~ opt++.to!string ~ "]),";
}
else
{
ret ~= "*cast(types[" ~ i.to!string ~ "]*)(pointers[" ~ req++.to!string ~ "]),";
}
}
ret ~= ");";
return ret;
}
static string genCompList()()
{
string ret = "ushort comp;uint req;uint opt;";
foreach (i; 1 .. (Parameters!(Sys.update)).length)
{
ret ~= "\x0a static if(isPointer!(types[" ~ i.to!string ~ "]))opt++;\x0a else static if(storages[" ~ i.to!string ~ "] == STC.ref_)req++;\x0a\x0a else static assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\". Unsupported parameter type \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");";
}
ret ~= "system.m_components = Mallocator.instance.makeArray!ushort(req);";
ret ~= "system.m_optional_components = Mallocator.instance.makeArray!ushort(opt);";
ret ~= "opt = 0;req = 0;";
foreach (i; 1 .. (Parameters!(Sys.update)).length)
{
ret ~= "\x0a static if(isPointer!(types[" ~ i.to!string ~ "]))\x0a {\x0a comp = components_map.get(PointerTarget!(types[" ~ i.to!string ~ "]).stringof, ushort.max);\x0a\x0a if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\" due to non existing component \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");\x0a system.m_optional_components[opt++] = comp;\x0a }\x0a else static if(storages[" ~ i.to!string ~ "] == STC.ref_)\x0a {\x0a comp = components_map.get(types[" ~ i.to!string ~ "].stringof, ushort.max);\x0a\x0a if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof ~ "\\\" due to non existing component \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");\x0a system.m_components[req++] = comp;\x0a }";
}
return ret;
}
static string catchFunc()(string member, string func)
{
string ret = "static if (hasMember!(Sys, \"" ~ func ~ "\"))\x0a {\x0a static void call" ~ func ~ "(void* system_pointer)\x0a {\x0a\x0a Sys* s = cast(Sys*) system_pointer;\x0a s." ~ func ~ "();\x0a }\x0a\x0a system." ~ member ~ " = &call" ~ func ~ ";\x0a }";
return ret;
}
static if (hasMember!(Sys, "update"))
{
static void callUpdate(ref CallData data, void* entity)
{
static if (hasMember!(Sys, "update"))
{
Sys* s = cast(Sys*) data.system.m_system_pointer;
void*[] pointers = (cast(void**) alloca(data.system.m_components.length * (void*)
.sizeof))[0 .. data.system.m_components.length];
void*[] optional_pointers = (cast(void**) alloca(
data.system.m_optional_components.length * (void*).sizeof))[0
.. data.system.m_optional_components.length];
EntitiesBlock* block = data.info.first_block;
while (block !is null)
{
uint size = block.type_data.size;
void* data_pointer = block.dataBegin();
foreach (i, ref pointer; pointers)
{
pointer = data_pointer + data.deltas[i];
}
foreach (i, ref pointer; optional_pointers)
{
uint ind = cast(uint)(i + pointers.length);
if (data.deltas[ind] != uint.max)
pointer = data_pointer + data.deltas[ind];
else
pointer = null;
}
foreach (i; 0 .. block.entities_count)
{
mixin(genCall());
data_pointer += size; //data.info.size;
foreach (ref pointer; pointers)
pointer += size;
foreach (ref pointer; optional_pointers)
if (pointer != null)
pointer += size;
}
block = block.next_block;
}
}
}
system.m_update = &callUpdate;
}
mixin(catchFunc("m_enable", "onEnable"));
mixin(catchFunc("m_disable", "onDisable"));
mixin(catchFunc("m_create", "onCreate"));
mixin(catchFunc("m_destroy", "onDestroy"));
mixin(catchFunc("m_begin", "onBegin"));
mixin(catchFunc("m_end", "onEnd"));
system.m_system_pointer = cast(void*)Mallocator.instance.make!Sys;
system.m_priority = priority;
mixin(genCompList());
ushort sys_id = systems_map.get(Sys.stringof, (ushort).max);
if (sys_id < systems.length)
{
system.enable();
systems[sys_id] = system;
}
else
{
systems_map.add(Sys.stringof, cast(ushort)systems.length);
systems.add(system);
if (system.m_create)
system.m_create(system.m_system_pointer);
systems[$ - 1].enable();
foreach (info; &entities_infos.byValue)
{
addEntityCaller(*info, cast(uint)systems.length - 1);
}
}
updateEntityCallers();
}
void registerComponent(Comp)()
{
ComponentInfo info;
static if (!hasMember!(Comp, "component_id") || !is(typeof(Comp.component_id) == ushort))
{
static assert(0, "Component should have \"__gshared ushort component_id");
}
static if (hasMember!(Comp, "onDestroy") && isFunction!(Comp.onDestroy) && is(ReturnType!(Comp.onDestroy) == void) && (Parameters!(Comp.onDestroy).length == 0))
{
static void callDestroy(void* pointer)
{
(cast(Comp*) pointer).onDestroy();
}
info.destroy_callback = &callDestroy;
}
info.size = Comp.sizeof;
info.aligment = Comp.alignof;
info.init_data = Mallocator.instance.makeArray!ubyte(Comp.sizeof);
*cast(Comp*)info.init_data.ptr = Comp.init;
ushort comp_id = components_map.get(Comp.stringof, (ushort).max);
if (comp_id < components.length)
{
Comp.component_id = comp_id;
}
else
{
components.add(info);
Comp.component_id = cast(ushort)(components.length - 1);
components_map.add(Comp.stringof, cast(ushort)(components.length - 1));
}
}
export void update();
static void alignNum(ref ushort num, ushort aligment);
extern (C) static int compareUShorts(const void* a, const void* b);
export EntityTemplate* allocateTemplate(ushort[] components_ids);
export EntityInfo* getEntityInfo(ushort[] ids);
export void updateEntityCallers();
export void addEntityCaller(ref EntityInfo entity, uint system_id);
export Entity* getEntity(EntityID id);
export void removeComponents(EntityID entity_id, ushort[] del_ids);
private void __removeComponents(EntityID entity_id, ushort[] del_ids);
void removeComponents(Components...)(EntityID entity_id)
{
const uint num = Components.length;
ushort[num] del_ids;
static foreach (i, comp; Components)
{
del_ids[i] = comp.component_id;
}
removeComponents(entity_id, del_ids);
}
private void __addComponents(EntityID entity_id, ushort[] new_ids, void*[] data_pointers);
void addComponents(Components...)(EntityID entity_id, Components comps)
{
const uint num = Components.length;
Entity* entity = id_manager.getEntityPointer(entity_id);
EntitiesBlock* block = getMetaData(entity);
EntityInfo* info = block.type_data;
ushort[] ids = (cast(ushort*)alloca((ushort).sizeof * (info.components.length + num)))[0..info.components.length + num];
ushort[num] new_ids;
static foreach (i, comp; Components)
{
new_ids[i] = comp.component_id;
}
change_entities_list.add(1);
change_entities_list.add((cast(ubyte*)&entity_id)[0..8]);
change_entities_list.add((cast(ubyte*)&num)[0..4]);
change_entities_list.add(cast(ubyte[])new_ids);
static foreach (i, comp; comps)
{
change_entities_list.add((cast(ubyte*)&comp)[0..comp.sizeof]);
}
}
export void freeTemplate(EntityTemplate* template_);
export ref Entity addEntity(EntityTemplate* tmpl);
private EntitiesBlock* findBlockWithFreeSpace(EntityInfo* info);
export void removeEntity(EntityID id);
private void __removeEntity(EntityID id);
private void removeEntityNoID(Entity* entity, EntitiesBlock* block, bool call_destructors = false);
export EntitiesBlock* getMetaData(void* pointer);
private void changeEntites();
private void updateBlocks();
private void removeEntities();
export void begin();
export void end();
struct ComponentInfo
{
ushort size;
ushort aligment;
ubyte[] init_data;
void function(void* pointer) destroy_callback;
}
struct EntityInfo
{
ushort[] components;
ushort[] deltas;
ushort alignment;
ushort size;
EntitiesBlock* first_block;
EntitiesBlock* first_with_free_space;
Vector!CallData callers;
}
struct EntitiesBlock
{
uint dataDelta();
void* dataBegin();
EntityInfo* type_data;
ushort entities_count;
ushort added_count;
uint id;
EntitiesBlock* next_block;
}
struct CallData
{
uint system_id;
System* system;
EntityManager.EntityInfo* info;
ushort[] deltas;
}
alias SytemFuncType = void function(ref EntityManager.CallData data, void* entity);
enum page_size = 4096;
enum pages_in_block = 128;
IDManager id_manager;
EntityAllocator allocator;
Vector!EntityID entities_to_remove;
Vector!(EntitiesBlock*) blocks_to_update;
Vector!ubyte change_entities_list;
HashMap!(ushort[], EntityInfo*) entities_infos;
HashMap!(string, ushort) systems_map;
HashMap!(string, ushort) components_map;
Vector!System systems;
Vector!ComponentInfo components;
__gshared EntityManager instance;
}
version (Windows)
{
extern (Windows) bool DllMain(void* hInstance, uint ulReason, void*);
}

7
import/ecs/package.di Normal file
View file

@ -0,0 +1,7 @@
// D import file generated from 'source\ecs\package.d'
module ecs;
public import ecs.manager;
public import ecs.entity;
public import ecs.system;
import ecs.id_manager;
import ecs.events;

31
import/ecs/string_intern.di Normal file
View file

@ -0,0 +1,31 @@
// D import file generated from 'source\ecs\string_intern.d'
module ecs.string_intern;
import ecs.hash_map;
import ecs.traits : isForeachDelegateWithI;
import std.experimental.allocator;
import std.experimental.allocator.mallocator;
import std.traits : Parameters;
private static __gshared HashMap!(const(char)[], StringIntern) gStringInterns;
struct StringIntern
{
private const(char)* strPtr;
this(const(char)[] fromStr)
{
opAssign(fromStr);
}
void reset();
size_t length();
const(char)[] str();
const(char)[] cstr();
bool opEquals()(auto ref const StringIntern s)
{
return strPtr == s.strPtr;
}
bool opEquals()(auto ref const(char[]) s)
{
return str() == s;
}
void opAssign(const(char)[] fromStr);
const(char)[] opSlice();
private const(char)[] allocStr(const(char)[] fromStr);
}

26
import/ecs/system.di Normal file
View file

@ -0,0 +1,26 @@
// D import file generated from 'source\ecs\system.d'
module ecs.system;
import ecs.entity;
import ecs.manager;
struct System
{
export bool enabled();
export void enable();
export void disable();
export int priority();
package
{
bool m_enabled = false;
int m_priority;
void* m_system_pointer;
ushort[] m_components;
ushort[] m_optional_components;
void* m_update;
void function(void* system_pointer) m_enable;
void function(void* system_pointer) m_disable;
void function(void* system_pointer) m_create;
void function(void* system_pointer) m_destroy;
void function(void* system_pointer) m_begin;
void function(void* system_pointer) m_end;
}
}

20
import/ecs/traits.di Normal file
View file

@ -0,0 +1,20 @@
// D import file generated from 'source\ecs\traits.d'
module ecs.traits;
import std.traits;
bool isForeachDelegateWithI(DG)()
{
return is(DG == delegate) && is(ReturnType!DG == int) && (Parameters!DG.length == 2) && isIntegral!(Parameters!DG[0]);
}
bool isForeachDelegateWithoutI(DG)()
{
return is(DG == delegate) && is(ReturnType!DG == int) && (Parameters!DG.length == 1);
}
bool isForeachDelegateWithTypes(DG, Types...)()
{
return is(DG == delegate) && is(ReturnType!DG == int) && is(Parameters!DG == Types);
}
auto assumeNoGC(T)(T t) if (isFunctionPointer!T || isDelegate!T)
{
enum attrs = functionAttributes!T | FunctionAttribute.nogc;
return cast(SetFunctionAttributes!(T, functionLinkage!T, attrs))t;
}

274
import/ecs/vector.di Normal file
View file

@ -0,0 +1,274 @@
// D import file generated from 'source\ecs\vector.d'
module ecs.vector;
import core.bitop;
import core.stdc.stdlib : free, malloc;
import core.stdc.string : memcpy, memset;
import std.algorithm : swap;
import std.conv : emplace;
import std.traits : hasMember, isCopyable, TemplateOf, Unqual;
export pure nothrow @nogc @safe size_t nextPow2(size_t num);
__gshared size_t gVectorsCreated = 0;
__gshared size_t gVectorsDestroyed = 0;
struct Vector(T)
{
T[] array;
size_t used;
public
{
export this()(T t)
{
add(t);
}
export this(X)(X[] t) if (is(Unqual!X == Unqual!T))
{
add(t);
}
static if (isCopyable!T)
{
export this(this)
{
T[] tmp = array[0..used];
array = null;
used = 0;
add(tmp);
}
}
else
{
@disable this(this);
}
export ~this()
{
clear();
}
export void clear()
{
removeAll();
}
export void removeAll()
{
if (array !is null)
{
foreach (ref el; array[0..used])
{
destroy(el);
}
freeData(cast(void[])array);
gVectorsDestroyed++;
}
array = null;
used = 0;
}
export bool empty()
{
return used == 0;
}
export size_t length()
{
return used;
}
export void length(size_t newLength)
{
if (newLength > used)
{
reserve(newLength);
foreach (ref el; array[used..newLength])
{
emplace(&el);
}
}
else
{
foreach (ref el; array[newLength..used])
{
destroy(el);
}
}
used = newLength;
}
export void reset()
{
used = 0;
}
export void reserve(size_t numElements)
{
if (numElements > array.length)
{
extend(numElements);
}
}
export size_t capacity()
{
return array.length - used;
}
export void extend(size_t newNumOfElements)
{
auto oldArray = manualExtend(array, newNumOfElements);
if (oldArray !is null)
{
freeData(oldArray);
}
}
export @nogc void freeData(void[] data)
{
memset(data.ptr, 15, data.length);
free(data.ptr);
}
export static void[] manualExtend(ref T[] array, size_t newNumOfElements = 0)
{
if (newNumOfElements == 0)
newNumOfElements = 2;
if (array.length == 0)
gVectorsCreated++;
T[] oldArray = array;
size_t oldSize = oldArray.length * T.sizeof;
size_t newSize = newNumOfElements * T.sizeof;
T* memory = cast(T*)malloc(newSize);
memcpy(cast(void*)memory, cast(void*)oldArray.ptr, oldSize);
array = memory[0..newNumOfElements];
return cast(void[])oldArray;
}
export Vector!T copy()()
{
Vector!T duplicate;
duplicate.reserve(used);
duplicate ~= array[0..used];
return duplicate;
}
export bool canAddWithoutRealloc(uint elemNum = 1)
{
return used + elemNum <= array.length;
}
export void add()(T t)
{
if (used >= array.length)
{
extend(nextPow2(used + 1));
}
emplace(&array[used], t);
used++;
}
export void add()(T t, size_t pos)
{
assert(pos <= used);
if (used >= array.length)
{
extend(array.length * 2);
}
foreach_reverse (size_t i; pos .. used)
{
array[i + 1] = array[i];
}
emplace(&array[pos], t);
used++;
}
export void add(X)(X[] t) if (is(Unqual!X == Unqual!T))
{
if (used + t.length > array.length)
{
extend(nextPow2(used + t.length));
}
foreach (i; 0 .. t.length)
{
emplace(&array[used + i], t[i]);
}
used += t.length;
}
export void remove(size_t elemNum)
{
destroy(array[elemNum]);
swap(array[elemNum], array[used - 1]);
used--;
}
export void removeStable()(size_t elemNum)
{
used--;
foreach (i; 0 .. used)
{
array[i] = array[i + 1];
}
}
export bool tryRemoveElement()(T elem)
{
foreach (i, ref el; array[0..used])
{
if (el == elem)
{
remove(i);
return true;
}
}
return false;
}
export void removeElement()(T elem)
{
bool ok = tryRemoveElement(elem);
assert(ok, "There is no such an element in vector");
}
export ref T opIndex(size_t elemNum)
{
assert(elemNum < used, "Range violation [index]");
return array.ptr[elemNum];
}
export auto opSlice()
{
return array.ptr[0..used];
}
export T[] opSlice(size_t x, size_t y)
{
assert(y <= used);
return array.ptr[x..y];
}
export size_t opDollar()
{
return used;
}
export void opAssign(X)(X[] slice)
{
reset();
this ~= slice;
}
export void opOpAssign(string op)(T obj)
{
static assert(op == "~");
add(obj);
}
export void opOpAssign(string op, X)(X[] obj)
{
static assert(op == "~");
add(obj);
}
export void opIndexAssign()(T obj, size_t elemNum)
{
assert(elemNum < used, "Range viloation");
array[elemNum] = obj;
}
export void opSliceAssign()(T[] obj, size_t a, size_t b)
{
assert(b <= used && (a <= b), "Range viloation");
array.ptr[a..b] = obj;
}
export const bool opEquals()(auto ref const Vector!T r)
{
return used == r.used && (array.ptr[0..used] == r.array.ptr[0..r.used]);
}
export const nothrow @trusted size_t toHash()
{
return hashOf(cast(Unqual!T[])array.ptr[0..used]);
}
import std.format : FormatSpec, formatValue;
export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt)
{
static if (__traits(compiles, formatValue(sink, array[0..used], fmt)))
{
formatValue(sink, array[0..used], fmt);
}
}
}
}
private pure nothrow @nogc @safe T[n] s(T, size_t n)(auto ref T[n] array)
{
return array;
}
enum string checkVectorAllocations = "\x0a//assert(gVectorsCreated==gVectorsDestroyed);\x0agVectorsCreated=gVectorsDestroyed=0;\x0ascope(exit){if(gVectorsCreated!=gVectorsDestroyed){\x09\x0a\x09import std.stdio : writefln;\x0a\x09writefln(\"created==destroyed %s==%s\", gVectorsCreated, gVectorsDestroyed);\x0a\x09assert(gVectorsCreated==gVectorsDestroyed, \"Vector memory leak\");\x0a}}\x0a";

2
source/ecs/entity.d
View file

@ -26,7 +26,7 @@ struct Entity
} }
} }
struct EntityTemplate export struct EntityTemplate
{ {
ubyte[] entity_data; ubyte[] entity_data;
EntityManager.EntityInfo* info; EntityManager.EntityInfo* info;

50
source/ecs/hash_map.d
View file

@ -11,7 +11,7 @@ private enum HASH_EMPTY = 0;
private enum HASH_DELETED = 0x1; private enum HASH_DELETED = 0x1;
private enum HASH_FILLED_MARK = ulong(1) << 8 * ulong.sizeof - 1; private enum HASH_FILLED_MARK = ulong(1) << 8 * ulong.sizeof - 1;
ulong defaultHashFunc(T)(auto ref T t) { export ulong defaultHashFunc(T)(auto ref T t) {
static if (isIntegral!(T)) { static if (isIntegral!(T)) {
return hashInt(t); return hashInt(t);
} else { } else {
@ -20,7 +20,7 @@ ulong defaultHashFunc(T)(auto ref T t) {
} }
// Can turn bad hash function to good one // Can turn bad hash function to good one
ulong hashInt(ulong x) nothrow @nogc @safe { export ulong hashInt(ulong x) nothrow @nogc @safe {
x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9; x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9;
x = (x ^ (x >> 27)) * 0x94d049bb133111eb; x = (x ^ (x >> 27)) * 0x94d049bb133111eb;
x = x ^ (x >> 31); x = x ^ (x >> 31);
@ -48,27 +48,27 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
size_t length; // Used to compute loadFactor size_t length; // Used to compute loadFactor
size_t markerdDeleted; size_t markerdDeleted;
void clear() { export void clear() {
elements.clear(); elements.clear();
length = 0; length = 0;
markerdDeleted = 0; markerdDeleted = 0;
} }
void reset() { export void reset() {
elements.reset(); elements.reset();
length = 0; length = 0;
markerdDeleted = 0; markerdDeleted = 0;
} }
bool isIn(ref Key el) { export bool isIn(ref Key el) {
return getIndex(el) != getIndexEmptyValue; return getIndex(el) != getIndexEmptyValue;
} }
bool isIn(Key el) { export bool isIn(Key el) {
return getIndex(el) != getIndexEmptyValue; return getIndex(el) != getIndexEmptyValue;
} }
Value* getPtr()(auto ref Key k) { export Value* getPtr()(auto ref Key k) {
size_t index = getIndex(k); size_t index = getIndex(k);
if (index == getIndexEmptyValue) { if (index == getIndexEmptyValue) {
return null; return null;
@ -77,18 +77,18 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
} }
} }
ref Value get()(auto ref Key k) { export ref Value get()(auto ref Key k) {
size_t index = getIndex(k); size_t index = getIndex(k);
assert(index != getIndexEmptyValue); assert(index != getIndexEmptyValue);
return elements[index].keyValue.value; return elements[index].keyValue.value;
} }
deprecated("Use get with second parameter.") auto ref Value getDefault()( deprecated("Use get with second parameter.") export auto ref Value getDefault()(
auto ref Key k, auto ref Value defaultValue) { auto ref Key k, auto ref Value defaultValue) {
return get(k, defaultValue); return get(k, defaultValue);
} }
auto ref Value get()(auto ref Key k, auto ref Value defaultValue) { export auto ref Value get()(auto ref Key k, auto ref Value defaultValue) {
size_t index = getIndex(k); size_t index = getIndex(k);
if (index == getIndexEmptyValue) { if (index == getIndexEmptyValue) {
return defaultValue; return defaultValue;
@ -97,7 +97,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
} }
} }
ref Value getInsertDefault()(auto ref Key k, auto ref Value defaultValue) { export ref Value getInsertDefault()(auto ref Key k, auto ref Value defaultValue) {
size_t index = getIndex(k); size_t index = getIndex(k);
if (index == getIndexEmptyValue) { if (index == getIndexEmptyValue) {
add(k, defaultValue); add(k, defaultValue);
@ -108,7 +108,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
} }
bool tryRemove(Key el) { export bool tryRemove(Key el) {
size_t index = getIndex(el); size_t index = getIndex(el);
if (index == getIndexEmptyValue) { if (index == getIndexEmptyValue) {
return false; return false;
@ -119,20 +119,20 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
return true; return true;
} }
void remove(Key el) { export void remove(Key el) {
bool ok = tryRemove(el); bool ok = tryRemove(el);
assert(ok); assert(ok);
} }
ref Value opIndex()(auto ref Key key) { export ref Value opIndex()(auto ref Key key) {
return get(key); return get(key);
} }
void opIndexAssign()(auto ref Value value, auto ref Key key) { export void opIndexAssign()(auto ref Value value, auto ref Key key) {
add(key, value); add(key, value);
} }
void add()(auto ref Key key, auto ref Value value) { export void add()(auto ref Key key, auto ref Value value) {
size_t index = getIndex(key); size_t index = getIndex(key);
if (index != getIndexEmptyValue) { if (index != getIndexEmptyValue) {
elements[index].keyValue.value = value; elements[index].keyValue.value = value;
@ -170,11 +170,11 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
//int numA; //int numA;
//int numB; //int numB;
size_t getIndex(Key el) { export size_t getIndex(Key el) {
return getIndex(el); return getIndex(el);
} }
size_t getIndex(ref Key el) { export size_t getIndex(ref Key el) {
mixin(doNotInline); mixin(doNotInline);
immutable size_t groupsLength = elements.length; immutable size_t groupsLength = elements.length;
@ -203,14 +203,14 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
} }
float getLoadFactor(size_t forElementsNum) { export float getLoadFactor(size_t forElementsNum) {
if (elements.length == 0) { if (elements.length == 0) {
return 1; return 1;
} }
return cast(float) forElementsNum / (elements.length); return cast(float) forElementsNum / (elements.length);
} }
void rehash() { export void rehash() {
mixin(doNotInline); mixin(doNotInline);
// Get all elements // Get all elements
Vector!KeyVal allElements; Vector!KeyVal allElements;
@ -239,7 +239,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
} }
// foreach support // foreach support
int opApply(DG)(scope DG dg) { export int opApply(DG)(scope DG dg) {
int result; int result;
foreach (ref Bucket gr; elements) { foreach (ref Bucket gr; elements) {
if ((gr.hash & HASH_FILLED_MARK) == 0) { if ((gr.hash & HASH_FILLED_MARK) == 0) {
@ -262,7 +262,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
return result; return result;
} }
int byKey(scope int delegate(Key k) dg) { export int byKey(scope int delegate(Key k) dg) {
int result; int result;
foreach (ref Key k; this) { foreach (ref Key k; this) {
result = dg(k); result = dg(k);
@ -272,7 +272,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
return result; return result;
} }
int byValue(scope int delegate(ref Value k) dg) { export int byValue(scope int delegate(ref Value k) dg) {
int result; int result;
foreach (ref Value v; this) { foreach (ref Value v; this) {
result = dg(v); result = dg(v);
@ -282,7 +282,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
return result; return result;
} }
int byKeyValue(scope int delegate(ref Key k, ref Value v) dg) { export int byKeyValue(scope int delegate(ref Key k, ref Value v) dg) {
int result; int result;
foreach (ref Key k, ref Value v; this) { foreach (ref Key k, ref Value v; this) {
result = dg(k, v); result = dg(k, v);
@ -297,7 +297,7 @@ struct HashMap(KeyPar, ValuePar, alias hashFunc = defaultHashFunc) {
/** /**
* Preety print * Preety print
*/ */
void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt) { export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt) {
formatValue(sink, '[', fmt); formatValue(sink, '[', fmt);
foreach (ref k, ref v; &byKeyValue) { foreach (ref k, ref v; &byKeyValue) {
formatValue(sink, k, fmt); formatValue(sink, k, fmt);

4
source/ecs/id_manager.d
View file

@ -33,7 +33,7 @@ struct IDManager
m_ids_array[entity.id.id].entity = &entity; m_ids_array[entity.id.id].entity = &entity;
} }
Entity* getEntityPointer(EntityID id) export Entity* getEntityPointer(EntityID id)
{ {
Data* data = &m_ids_array[id.id]; Data* data = &m_ids_array[id.id];
if (data.counter != id.counter) if (data.counter != id.counter)
@ -42,7 +42,7 @@ struct IDManager
return data.entity; return data.entity;
} }
bool isExist(EntityID id) export bool isExist(EntityID id)
{ {
Data* data = &m_ids_array[id.id]; Data* data = &m_ids_array[id.id];
return data.counter == id.counter; return data.counter == id.counter;

116
source/ecs/manager.d
View file

@ -22,12 +22,12 @@ alias SerializeVector = ecs.vector.Vector!ubyte;
class EntityManager class EntityManager
{ {
static void initialize() export static void initialize()
{ {
instance = Mallocator.instance.make!EntityManager; instance = Mallocator.instance.make!EntityManager;
} }
static void destroy() export static void destroy()
{ {
foreach (ref system; instance.systems) foreach (ref system; instance.systems)
@ -204,16 +204,27 @@ class EntityManager
//system.m_components = Mallocator.instance.makeArray!uint(types.length - 1); //system.m_components = Mallocator.instance.makeArray!uint(types.length - 1);
mixin(genCompList()); mixin(genCompList());
systems.add(system); ushort sys_id = systems_map.get(Sys.stringof, ushort.max);
if(sys_id < systems.length)
if (system.m_create)
system.m_create(system.m_system_pointer);
systems[$ - 1].enable();
foreach (info; &entities_infos.byValue)
{ {
addEntityCaller(*info, cast(uint) systems.length - 1); system.enable();
systems[sys_id] = system;
}
else
{
systems_map.add(Sys.stringof,cast(ushort)systems.length);
systems.add(system);
if (system.m_create)
system.m_create(system.m_system_pointer);
systems[$ - 1].enable();
foreach (info; &entities_infos.byValue)
{
addEntityCaller(*info, cast(uint) systems.length - 1);
}
} }
updateEntityCallers(); updateEntityCallers();
@ -246,12 +257,20 @@ class EntityManager
info.init_data = Mallocator.instance.makeArray!ubyte(Comp.sizeof); info.init_data = Mallocator.instance.makeArray!ubyte(Comp.sizeof);
*cast(Comp*) info.init_data.ptr = Comp.init; // = Comp(); *cast(Comp*) info.init_data.ptr = Comp.init; // = Comp();
components.add(info); ushort comp_id = components_map.get(Comp.stringof, ushort.max);
Comp.component_id = cast(ushort)(components.length - 1); if(comp_id < components.length)
components_map.add(Comp.stringof, cast(ushort)(components.length - 1)); {
Comp.component_id = comp_id;
}
else
{
components.add(info);
Comp.component_id = cast(ushort)(components.length - 1);
components_map.add(Comp.stringof, cast(ushort)(components.length - 1));
}
} }
void update() export void update()
{ {
foreach (info; &entities_infos.byValue) foreach (info; &entities_infos.byValue)
{ {
@ -280,7 +299,7 @@ class EntityManager
return 1; return 1;
} }
EntityTemplate* allocateTemplate(ushort[] components_ids) export EntityTemplate* allocateTemplate(ushort[] components_ids)
{ {
ushort[] ids = (cast(ushort*) alloca(ushort.sizeof * components_ids.length))[0 ushort[] ids = (cast(ushort*) alloca(ushort.sizeof * components_ids.length))[0
@ -318,7 +337,7 @@ class EntityManager
return temp; return temp;
} }
EntityInfo* getEntityInfo(ushort[] ids) export EntityInfo* getEntityInfo(ushort[] ids)
{ {
EntityInfo* info = entities_infos.get(ids, null); EntityInfo* info = entities_infos.get(ids, null);
if (info is null) if (info is null)
@ -354,7 +373,7 @@ class EntityManager
return info; return info;
} }
void updateEntityCallers() export void updateEntityCallers()
{ {
foreach (entity; &entities_infos.byValue) foreach (entity; &entities_infos.byValue)
{ {
@ -365,7 +384,7 @@ class EntityManager
} }
} }
void addEntityCaller(ref EntityInfo entity, uint system_id) export void addEntityCaller(ref EntityInfo entity, uint system_id)
{ {
System* system = &systems[system_id]; System* system = &systems[system_id];
CallData call_data = CallData(system_id, system, &entity, null); CallData call_data = CallData(system_id, system, &entity, null);
@ -412,12 +431,12 @@ class EntityManager
entity.callers.add(call_data, index); entity.callers.add(call_data, index);
} }
Entity* getEntity(EntityID id) export Entity* getEntity(EntityID id)
{ {
return cast(Entity*) id_manager.getEntityPointer(id); return cast(Entity*) id_manager.getEntityPointer(id);
} }
void removeComponents(EntityID entity_id, ushort[] del_ids) export void removeComponents(EntityID entity_id, ushort[] del_ids)
{ {
uint num = cast(uint) del_ids.length; uint num = cast(uint) del_ids.length;
change_entities_list.add(0); change_entities_list.add(0);
@ -426,7 +445,7 @@ class EntityManager
change_entities_list.add(cast(ubyte[]) del_ids); change_entities_list.add(cast(ubyte[]) del_ids);
} }
void __removeComponents(EntityID entity_id, ushort[] del_ids) private void __removeComponents(EntityID entity_id, ushort[] del_ids)
{ {
Entity* entity = id_manager.getEntityPointer(entity_id); Entity* entity = id_manager.getEntityPointer(entity_id);
EntitiesBlock* block = getMetaData(entity); EntitiesBlock* block = getMetaData(entity);
@ -493,7 +512,7 @@ class EntityManager
removeComponents(entity_id, del_ids); removeComponents(entity_id, del_ids);
} }
void __addComponents(EntityID entity_id, ushort[] new_ids, void*[] data_pointers) private void __addComponents(EntityID entity_id, ushort[] new_ids, void*[] data_pointers)
{ {
uint num = cast(uint) new_ids.length; uint num = cast(uint) new_ids.length;
Entity* entity = id_manager.getEntityPointer(entity_id); Entity* entity = id_manager.getEntityPointer(entity_id);
@ -644,13 +663,13 @@ class EntityManager
//__addComponents(entity_id, new_ids, pointers); //__addComponents(entity_id, new_ids, pointers);
} }
void freeTemplate(EntityTemplate* template_) export void freeTemplate(EntityTemplate* template_)
{ {
Mallocator.instance.dispose(template_.entity_data); Mallocator.instance.dispose(template_.entity_data);
Mallocator.instance.dispose(template_); Mallocator.instance.dispose(template_);
} }
ref Entity addEntity(EntityTemplate* tmpl) export ref Entity addEntity(EntityTemplate* tmpl)
{ {
EntitiesBlock* block = findBlockWithFreeSpace(tmpl.info); EntitiesBlock* block = findBlockWithFreeSpace(tmpl.info);
@ -669,7 +688,7 @@ class EntityManager
return *entity; return *entity;
} }
EntitiesBlock* findBlockWithFreeSpace(EntityInfo* info) private EntitiesBlock* findBlockWithFreeSpace(EntityInfo* info)
{ {
EntitiesBlock* previous_block; EntitiesBlock* previous_block;
EntitiesBlock* block = info.first_with_free_space; EntitiesBlock* block = info.first_with_free_space;
@ -709,12 +728,12 @@ class EntityManager
return block; return block;
} }
void removeEntity(EntityID id) export void removeEntity(EntityID id)
{ {
entities_to_remove.add(id); entities_to_remove.add(id);
} }
void __removeEntity(EntityID id) private void __removeEntity(EntityID id)
{ {
//get entity and block meta data pointers //get entity and block meta data pointers
Entity* entity = id_manager.getEntityPointer(id); Entity* entity = id_manager.getEntityPointer(id);
@ -771,12 +790,12 @@ class EntityManager
*params: *params:
*pointer = pointer to any data of entity (i.e. component data pointer) *pointer = pointer to any data of entity (i.e. component data pointer)
*/ */
EntitiesBlock* getMetaData(void* pointer) export EntitiesBlock* getMetaData(void* pointer)
{ {
return cast(EntitiesBlock*)(cast(size_t) pointer & (~cast(size_t)(page_size - 1))); return cast(EntitiesBlock*)(cast(size_t) pointer & (~cast(size_t)(page_size - 1)));
} }
void changeEntites() private void changeEntites()
{ {
uint index = 0; uint index = 0;
uint len = cast(uint) change_entities_list.length; uint len = cast(uint) change_entities_list.length;
@ -814,7 +833,7 @@ class EntityManager
change_entities_list.clear(); change_entities_list.clear();
} }
void updateBlocks() private void updateBlocks()
{ {
foreach (block; blocks_to_update) foreach (block; blocks_to_update)
{ {
@ -824,7 +843,7 @@ class EntityManager
blocks_to_update.clear(); blocks_to_update.clear();
} }
void removeEntities() private void removeEntities()
{ {
foreach (id; entities_to_remove) foreach (id; entities_to_remove)
{ {
@ -833,7 +852,7 @@ class EntityManager
entities_to_remove.clear(); entities_to_remove.clear();
} }
void begin() export void begin()
{ {
updateBlocks(); updateBlocks();
changeEntites(); changeEntites();
@ -845,7 +864,7 @@ class EntityManager
} }
} }
void end() export void end()
{ {
foreach (ref system; instance.systems) foreach (ref system; instance.systems)
{ {
@ -900,7 +919,7 @@ class EntityManager
} }
///return pointer to first element in block ///return pointer to first element in block
void* dataBegin() export void* dataBegin()
{ {
ushort dif = EntitiesBlock.sizeof; ushort dif = EntitiesBlock.sizeof;
alignNum(dif, type_data.alignment); alignNum(dif, type_data.alignment);
@ -950,12 +969,39 @@ class EntityManager
Vector!ubyte change_entities_list; Vector!ubyte change_entities_list;
HashMap!(ushort[], EntityInfo*) entities_infos; HashMap!(ushort[], EntityInfo*) entities_infos;
HashMap!(string, ushort) systems_map;
HashMap!(string, ushort) components_map; HashMap!(string, ushort) components_map;
Vector!System systems; Vector!System systems;
Vector!ComponentInfo components; Vector!ComponentInfo components;
__gshared EntityManager instance; __gshared EntityManager instance;
} }
version(Windows)
extern(Windows) bool DllMain(void* hInstance, uint ulReason, void*) {
import core.sys.windows.windows;
import core.sys.windows.dll;
switch (ulReason)
{
default: assert(0);
case DLL_PROCESS_ATTACH:
dll_process_attach( hInstance, true );
break;
case DLL_PROCESS_DETACH:
dll_process_detach( hInstance, true );
break;
case DLL_THREAD_ATTACH:
dll_thread_attach( true, true );
break;
case DLL_THREAD_DETACH:
dll_thread_detach( true, true );
break;
}
return true;
}
/* /*
static ulong defaultHashFunc(T)(auto ref T t) static ulong defaultHashFunc(T)(auto ref T t)
{ {

8
source/ecs/system.d
View file

@ -5,26 +5,26 @@ import ecs.manager;
struct System struct System
{ {
bool enabled() export bool enabled()
{ {
return m_enabled; return m_enabled;
} }
void enable() export void enable()
{ {
if (!m_enabled && m_enable) if (!m_enabled && m_enable)
m_enable(m_system_pointer); m_enable(m_system_pointer);
m_enabled = true; m_enabled = true;
} }
void disable() export void disable()
{ {
if (m_enabled && m_disable) if (m_enabled && m_disable)
m_disable(m_system_pointer); m_disable(m_system_pointer);
m_enabled = false; m_enabled = false;
} }
int priority() export int priority()
{ {
return m_priority; return m_priority;
} }

74
source/ecs/vector.d
View file

@ -7,7 +7,7 @@ import std.algorithm : swap;
import std.conv : emplace; import std.conv : emplace;
import std.traits : hasMember, isCopyable, TemplateOf, Unqual; import std.traits : hasMember, isCopyable, TemplateOf, Unqual;
@nogc @safe nothrow pure size_t nextPow2(size_t num) { export @nogc @safe nothrow pure size_t nextPow2(size_t num) {
return 1 << bsr(num) + 1; return 1 << bsr(num) + 1;
} }
@ -19,17 +19,17 @@ struct Vector(T) {
size_t used; size_t used;
public: public:
this()(T t) { export this()(T t) {
add(t); add(t);
} }
this(X)(X[] t) if (is(Unqual!X == Unqual!T)) { export this(X)(X[] t) if (is(Unqual!X == Unqual!T)) {
add(t); add(t);
} }
static if (isCopyable!T) { static if (isCopyable!T) {
this(this) { export this(this) {
T[] tmp = array[0 .. used]; T[] tmp = array[0 .. used];
array = null; array = null;
used = 0; used = 0;
@ -39,15 +39,15 @@ public:
@disable this(this); @disable this(this);
} }
~this() { export ~this() {
clear(); clear();
} }
void clear() { export void clear() {
removeAll(); removeAll();
} }
void removeAll() { export void removeAll() {
if (array !is null) { if (array !is null) {
foreach (ref el; array[0 .. used]) { foreach (ref el; array[0 .. used]) {
destroy(el); destroy(el);
@ -59,15 +59,15 @@ public:
used = 0; used = 0;
} }
bool empty() { export bool empty() {
return (used == 0); return (used == 0);
} }
size_t length() { export size_t length() {
return used; return used;
} }
void length(size_t newLength) { export void length(size_t newLength) {
if (newLength > used) { if (newLength > used) {
reserve(newLength); reserve(newLength);
foreach (ref el; array[used .. newLength]) { foreach (ref el; array[used .. newLength]) {
@ -81,34 +81,34 @@ public:
used = newLength; used = newLength;
} }
void reset() { export void reset() {
used = 0; used = 0;
} }
void reserve(size_t numElements) { export void reserve(size_t numElements) {
if (numElements > array.length) { if (numElements > array.length) {
extend(numElements); extend(numElements);
} }
} }
size_t capacity() { export size_t capacity() {
return array.length - used; return array.length - used;
} }
void extend(size_t newNumOfElements) { export void extend(size_t newNumOfElements) {
auto oldArray = manualExtend(array, newNumOfElements); auto oldArray = manualExtend(array, newNumOfElements);
if (oldArray !is null) { if (oldArray !is null) {
freeData(oldArray); freeData(oldArray);
} }
} }
@nogc void freeData(void[] data) { export @nogc void freeData(void[] data) {
// 0x0F probably invalid value for pointers and other types // 0x0F probably invalid value for pointers and other types
memset(data.ptr, 0x0F, data.length); // Makes bugs show up xD memset(data.ptr, 0x0F, data.length); // Makes bugs show up xD
free(data.ptr); free(data.ptr);
} }
static void[] manualExtend(ref T[] array, size_t newNumOfElements = 0) { export static void[] manualExtend(ref T[] array, size_t newNumOfElements = 0) {
if (newNumOfElements == 0) if (newNumOfElements == 0)
newNumOfElements = 2; newNumOfElements = 2;
if (array.length == 0) if (array.length == 0)
@ -122,18 +122,18 @@ public:
return cast(void[]) oldArray; return cast(void[]) oldArray;
} }
Vector!T copy()() { export Vector!T copy()() {
Vector!T duplicate; Vector!T duplicate;
duplicate.reserve(used); duplicate.reserve(used);
duplicate ~= array[0 .. used]; duplicate ~= array[0 .. used];
return duplicate; return duplicate;
} }
bool canAddWithoutRealloc(uint elemNum = 1) { export bool canAddWithoutRealloc(uint elemNum = 1) {
return used + elemNum <= array.length; return used + elemNum <= array.length;
} }
void add()(T t) { export void add()(T t) {
if (used >= array.length) { if (used >= array.length) {
extend(nextPow2(used + 1)); extend(nextPow2(used + 1));
} }
@ -142,7 +142,7 @@ public:
} }
/// Add element at given position moving others /// Add element at given position moving others
void add()(T t, size_t pos) { export void add()(T t, size_t pos) {
assert(pos <= used); assert(pos <= used);
if (used >= array.length) { if (used >= array.length) {
extend(array.length * 2); extend(array.length * 2);
@ -155,7 +155,7 @@ public:
used++; used++;
} }
void add(X)(X[] t) if (is(Unqual!X == Unqual!T)) { export void add(X)(X[] t) if (is(Unqual!X == Unqual!T)) {
if (used + t.length > array.length) { if (used + t.length > array.length) {
extend(nextPow2(used + t.length)); extend(nextPow2(used + t.length));
} }
@ -165,20 +165,20 @@ public:
used += t.length; used += t.length;
} }
void remove(size_t elemNum) { export void remove(size_t elemNum) {
destroy(array[elemNum]); destroy(array[elemNum]);
swap(array[elemNum], array[used - 1]); swap(array[elemNum], array[used - 1]);
used--; used--;
} }
void removeStable()(size_t elemNum) { export void removeStable()(size_t elemNum) {
used--; used--;
foreach (i; 0 .. used) { foreach (i; 0 .. used) {
array[i] = array[i + 1]; array[i] = array[i + 1];
} }
} }
bool tryRemoveElement()(T elem) { export bool tryRemoveElement()(T elem) {
foreach (i, ref el; array[0 .. used]) { foreach (i, ref el; array[0 .. used]) {
if (el == elem) { if (el == elem) {
remove(i); remove(i);
@ -188,59 +188,59 @@ public:
return false; return false;
} }
void removeElement()(T elem) { export void removeElement()(T elem) {
bool ok = tryRemoveElement(elem); bool ok = tryRemoveElement(elem);
assert(ok, "There is no such an element in vector"); assert(ok, "There is no such an element in vector");
} }
ref T opIndex(size_t elemNum) { export ref T opIndex(size_t elemNum) {
assert(elemNum < used, "Range violation [index]"); assert(elemNum < used, "Range violation [index]");
return array.ptr[elemNum]; return array.ptr[elemNum];
} }
auto opSlice() { export auto opSlice() {
return array.ptr[0 .. used]; return array.ptr[0 .. used];
} }
T[] opSlice(size_t x, size_t y) { export T[] opSlice(size_t x, size_t y) {
assert(y <= used); assert(y <= used);
return array.ptr[x .. y]; return array.ptr[x .. y];
} }
size_t opDollar() { export size_t opDollar() {
return used; return used;
} }
void opAssign(X)(X[] slice) { export void opAssign(X)(X[] slice) {
reset(); reset();
this ~= slice; this ~= slice;
} }
void opOpAssign(string op)(T obj) { export void opOpAssign(string op)(T obj) {
static assert(op == "~"); static assert(op == "~");
add(obj); add(obj);
} }
void opOpAssign(string op, X)(X[] obj) { export void opOpAssign(string op, X)(X[] obj) {
static assert(op == "~"); static assert(op == "~");
add(obj); add(obj);
} }
void opIndexAssign()(T obj, size_t elemNum) { export void opIndexAssign()(T obj, size_t elemNum) {
assert(elemNum < used, "Range viloation"); assert(elemNum < used, "Range viloation");
array[elemNum] = obj; array[elemNum] = obj;
} }
void opSliceAssign()(T[] obj, size_t a, size_t b) { export void opSliceAssign()(T[] obj, size_t a, size_t b) {
assert(b <= used && a <= b, "Range viloation"); assert(b <= used && a <= b, "Range viloation");
array.ptr[a .. b] = obj; array.ptr[a .. b] = obj;
} }
bool opEquals()(auto ref const Vector!(T) r) const { export bool opEquals()(auto ref const Vector!(T) r) const {
return used == r.used && array.ptr[0 .. used] == r.array.ptr[0 .. r.used]; return used == r.used && array.ptr[0 .. used] == r.array.ptr[0 .. r.used];
} }
size_t toHash() const nothrow @trusted { export size_t toHash() const nothrow @trusted {
return hashOf(cast(Unqual!(T)[]) array.ptr[0 .. used]); return hashOf(cast(Unqual!(T)[]) array.ptr[0 .. used]);
} }
@ -249,7 +249,7 @@ public:
/** /**
* Preety print * Preety print
*/ */
void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt) { export void toString(scope void delegate(const(char)[]) sink, FormatSpec!char fmt) {
static if (__traits(compiles, formatValue(sink, array[0 .. used], fmt))) { static if (__traits(compiles, formatValue(sink, array[0 .. used], fmt))) {
formatValue(sink, array[0 .. used], fmt); formatValue(sink, array[0 .. used], fmt);
} }