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

FIxed GDC compilation (basic betterC WIP) and some improvements

Browse source 
-fixed issue with adding/removing entities inside events handling
-fixed EntityMeta.getComponent() (added check if component_id is valid)
-added function hasComponent to entity to check if component exists
This commit is contained in:
Mergul 2020-05-14 22:18:57 +02:00
parent f731b4cedb
commit 9589a5cb2d
11 changed files with 174 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

7
demos/external/sources/mmutils/thread_pool.d vendored
View file

@ -182,6 +182,12 @@ void instructionPause()
__builtin_ia32_pause();
}
else version(GNU)
{
import gcc.builtins;
__builtin_ia32_pause();
}
else version (DigitalMars)
{
asm
@ -189,7 +195,6 @@ void instructionPause()
rep;
nop;
}
}
else
{

2
demos/source/demos/snake.d
View file

@ -17,7 +17,7 @@ import ecs_utils.gfx.texture;
import ecs_utils.math.vector;
import ecs_utils.utils;
import std.array : staticArray;
//import std.array : staticArray;
enum float px = 1.0/512.0;

12
demos/utils/source/ecs_utils/utils.d
View file

@ -21,7 +21,19 @@ float randomRangef(float min, float max)
return rand()%4096;
}*/
version(GNU)
{
public import core.stdc.stdio : printf;
pragma(inline, true) T[n] staticArray(T, size_t n)(auto ref T[n] a)
{
return a;
}
}
else
{
extern(C) int printf(scope const char* format, ...) @nogc nothrow @system;
public import std.array : staticArray;
}
extern(C) int rand();
version(D_BetterC)

14
dub.json
View file

@ -74,6 +74,9 @@
"dflags": [
"-betterC",
"-defaultlib="
],
"dflags-gdc": [
"-fno-druntime"
]
},
{
@ -88,9 +91,7 @@
],
"dflags-gdc": [
"-fno-druntime",
"-fvisibility=hidden"
],
"lflags-gdc": [
"-fvisibility=hidden",
"-lpthread"
]
},
@ -105,9 +106,7 @@
"-betterC"
],
"dflags-gdc": [
"-fno-druntime"
],
"lflags-gdc": [
"-fno-druntime",
"-lpthread"
]
},
@ -118,6 +117,9 @@
"-betterC",
"-unittest"
],
"dflags-gdc": [
"-fno-druntime"
],
"sourcePaths": ["source/","tests/"],
"mainSourceFile":"tests/runner.d",
"excludedSourceFiles":[

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

@ -46,6 +46,14 @@ struct Entity
return cast(T*)(cast(void*)block + info.deltas[T.component_id] + ind * T.sizeof);
}
bool hasComponent(ushort component_id)
{
EntityManager.EntitiesBlock* block = gEM.getMetaData(&this);
EntityManager.EntityInfo* info = block.type_info;
if (component_id >= info.deltas.length || info.deltas[component_id] == 0)return false;
return true;
}
EntityMeta getMeta()
{
EntityMeta meta;
@ -65,8 +73,18 @@ struct EntityMeta
T* getComponent(T)() const
{
const (EntityManager.EntityInfo)* info = block.type_info;
if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
return null;
return cast(T*)(cast(void*)block + block.type_info.deltas[T.component_id] + index * T.sizeof);
}
bool hasComponent(ushort component_id)
{
EntityManager.EntityInfo* info = block.type_info;
if (component_id >= info.deltas.length || info.deltas[component_id] == 0)return false;
return true;
}
}
/************************************************************************************************************************

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

@ -126,7 +126,7 @@ export struct EntityManager
//if(info.components)Mallocator.dispose(info.components);
Mallocator.dispose(info);
} //*/
}
foreach (UpdatePass* pass; passes)
{
@ -472,9 +472,10 @@ export struct EntityManager
if (member == "length" || member == "thread_id"
|| is(MemberType == Entity[]) || is(MemberType == const(Entity)[]))
{
continue;
//continue;
}
else
{
string name;
static if (isArray!MemberType)
{ // Workaround. This code is never called with: not an array type, but compiler prints an error
@ -518,6 +519,7 @@ export struct EntityManager
components_counts.req++;
}
}
}
static if (__traits(hasMember, Sys, "ExcludedComponents"))
{
@ -695,9 +697,10 @@ export struct EntityManager
{
if (is(MemberType == Entity[]) || is(MemberType == const(Entity)[]))
components_info.entites_array = member;
continue;
//continue;
}
else
{
string name;
static if (isArray!MemberType)
{ // Workaround. This code is never called with: not an array type, but compiler prints an error
@ -741,6 +744,7 @@ export struct EntityManager
components_info.addReq(CompInfo(member, name));
}
}
}
static if (__traits(hasMember, Sys, "ExcludedComponents"))
{
@ -874,7 +878,7 @@ export struct EntityManager
}
}
static void fillInputData(ref Sys.EntitiesData input_data, EntityInfo* info,
static void fillInputData()(ref Sys.EntitiesData input_data, EntityInfo* info,
EntitiesBlock* block, uint offset, uint entities_count, System* system)
{
//enum ComponentsIndices components_info = getComponentsInfo();
@ -2863,7 +2867,11 @@ export struct EntityManager
id_manager.optimize();
updateBlocks();
changeEntities();
updateEvents();
id_manager.optimize();
updateBlocks();
removeEntities();
event_manager.clearEvents();
}

8
source/bubel/ecs/std.d
View file

@ -113,6 +113,14 @@ else version(D_BetterC)
alloca_pos += length;
return ret;
}
version(GNU)
{
extern(C) void __gdc_personality_v0()
{
}
}
}
else
{

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

@ -55,7 +55,8 @@ public:
/*foreach (ref el; array[0 .. used]) {
destroy(el);
}*/
freeData(cast(void[]) array);
//freeData(cast(void[]) array);
freeData((cast(void*)array.ptr)[0 .. array.length * T.sizeof]);
gVectorsDestroyed++;
}
array = null;
@ -78,7 +79,9 @@ public:
}
} else {
foreach (ref el; array[newLength .. used]) {
destroy(el);
//destroy(el);
static if(__traits(hasMember, T, "__xdtor"))el.__xdtor();
else static if(__traits(hasMember, T, "__dtor"))el.__dtor();
}
}
used = newLength;
@ -122,7 +125,8 @@ public:
T* memory = cast(T*) malloc(newSize);
memcpy(cast(void*) memory, cast(void*) oldArray.ptr, oldSize);
array = memory[0 .. newNumOfElements];
return cast(void[]) oldArray;
//return cast(void[]) oldArray;
return (cast(void*)oldArray.ptr)[0 .. oldArray.length * T.sizeof];
}
export Vector!T copy()() {
@ -169,7 +173,9 @@ public:
}
export void remove(size_t elemNum) {
destroy(array[elemNum]);
//destroy(array[elemNum]);
static if(__traits(hasMember, T, "__xdtor"))array[elemNum].__xdtor();
else static if(__traits(hasMember, T, "__dtor"))array[elemNum].__dtor();
//swap(array[elemNum], array[used - 1]);
array[elemNum] = array[used - 1];
used--;

9
tests/access_perf.d
View file

@ -6,7 +6,14 @@ import bubel.ecs.core;
import bubel.ecs.manager;
import bubel.ecs.entity;
import std.array : staticArray;
version(GNU)
{
pragma(inline, true) T[n] staticArray(T, size_t n)(auto ref T[n] a)
{
return a;
}
}
else import std.array : staticArray;
import core.stdc.stdio;

9
tests/basic.d
View file

@ -5,7 +5,14 @@ import bubel.ecs.manager;
import bubel.ecs.system;
import bubel.ecs.attributes;
import std.array : staticArray;
version(GNU)
{
pragma(inline, true) T[n] staticArray(T, size_t n)(auto ref T[n] a)
{
return a;
}
}
else import std.array : staticArray;
struct CInt
{

9
tests/perf.d
View file

@ -6,7 +6,14 @@ import bubel.ecs.core;
import bubel.ecs.manager;
import bubel.ecs.entity;
import std.array : staticArray;
version(GNU)
{
pragma(inline, true) T[n] staticArray(T, size_t n)(auto ref T[n] a)
{
return a;
}
}
else import std.array : staticArray;
import core.stdc.stdio;