-some cleanup
This commit is contained in:
parent
41f1c6474b
commit
9c5ceacacb
7 changed files with 17 additions and 42 deletions
|
|
@ -2,11 +2,8 @@ module ecs.block_allocator;
|
||||||
|
|
||||||
import ecs.manager;
|
import ecs.manager;
|
||||||
import ecs.std;
|
import ecs.std;
|
||||||
/*
|
|
||||||
import std.experimental.allocator;
|
|
||||||
import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
|
|
||||||
|
|
||||||
struct BlockAllocator//(uint block_size, uint blocks_in_allocation)
|
struct BlockAllocator
|
||||||
{
|
{
|
||||||
private uint block_size;
|
private uint block_size;
|
||||||
private uint blocks_in_allocation;
|
private uint blocks_in_allocation;
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,12 @@
|
||||||
module ecs.events;
|
module ecs.events;
|
||||||
|
|
||||||
import ecs.manager;
|
|
||||||
import ecs.block_allocator;
|
import ecs.block_allocator;
|
||||||
import ecs.entity;
|
import ecs.entity;
|
||||||
|
import ecs.manager;
|
||||||
import ecs.std;
|
import ecs.std;
|
||||||
/*
|
|
||||||
import std.experimental.allocator;
|
|
||||||
import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
|
|
||||||
import std.algorithm.comparison : max;
|
import std.algorithm.comparison : max;
|
||||||
|
|
||||||
//import core.sync.mutex;
|
|
||||||
|
|
||||||
/*struct Event
|
|
||||||
{
|
|
||||||
uint id;
|
|
||||||
|
|
||||||
}*/
|
|
||||||
|
|
||||||
//mixin template EventManagerCode()
|
|
||||||
struct EventManager
|
struct EventManager
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,11 @@
|
||||||
module ecs.id_manager;
|
module ecs.id_manager;
|
||||||
/*
|
|
||||||
import std.experimental.allocator;
|
|
||||||
import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;*/
|
|
||||||
|
|
||||||
import ecs.entity;
|
import ecs.entity;
|
||||||
import ecs.vector;
|
|
||||||
import ecs.std;
|
import ecs.std;
|
||||||
|
import ecs.vector;
|
||||||
|
|
||||||
import core.atomic;
|
import core.atomic;
|
||||||
import core.stdc.string : memcpy;
|
import core.stdc.string : memcpy;
|
||||||
//import core.sync.mutex;
|
|
||||||
|
|
||||||
/************************************************************************************************************************
|
/************************************************************************************************************************
|
||||||
*IDManager is responsible for assignment and removing IDs. IDs are unique throughtout a whole duration of the program.
|
*IDManager is responsible for assignment and removing IDs. IDs are unique throughtout a whole duration of the program.
|
||||||
|
|
|
||||||
|
|
@ -5,25 +5,22 @@ module ecs.manager;
|
||||||
|
|
||||||
import std.algorithm : max;
|
import std.algorithm : max;
|
||||||
import std.conv : to;
|
import std.conv : to;
|
||||||
//import std.experimental.allocator;
|
|
||||||
//import std.experimental.allocator.mallocator : AlignedMallocator, Mallocator;
|
|
||||||
import std.traits;
|
import std.traits;
|
||||||
|
|
||||||
|
import core.atomic;
|
||||||
import core.stdc.stdlib : qsort;
|
import core.stdc.stdlib : qsort;
|
||||||
import core.stdc.string;
|
import core.stdc.string;
|
||||||
import core.atomic;
|
|
||||||
//import core.sync.mutex;
|
|
||||||
|
|
||||||
import ecs.system;
|
import ecs.system;//not ordered as forward reference bug workaround
|
||||||
import ecs.entity;
|
|
||||||
import ecs.block_allocator;
|
import ecs.block_allocator;
|
||||||
|
import ecs.entity;
|
||||||
|
import ecs.events;
|
||||||
import ecs.hash_map;
|
import ecs.hash_map;
|
||||||
import ecs.id_manager;
|
import ecs.id_manager;
|
||||||
import ecs.vector;
|
|
||||||
import ecs.simple_vector;
|
import ecs.simple_vector;
|
||||||
import ecs.events;
|
|
||||||
import ecs.traits;
|
|
||||||
import ecs.std;
|
import ecs.std;
|
||||||
|
import ecs.traits;
|
||||||
|
import ecs.vector;
|
||||||
|
|
||||||
export alias gEM = EntityManager.instance;
|
export alias gEM = EntityManager.instance;
|
||||||
export alias gEntityManager = EntityManager.instance;
|
export alias gEntityManager = EntityManager.instance;
|
||||||
|
|
@ -491,9 +488,6 @@ export struct EntityManager
|
||||||
{
|
{
|
||||||
ComponentsIndices components_info;
|
ComponentsIndices components_info;
|
||||||
|
|
||||||
//import core.stdc.stdlib;
|
|
||||||
//uint[] aaa = (cast(uint*)malloc(400))[0..100];
|
|
||||||
|
|
||||||
bool checkExcludedComponentsSomething(Sys)()
|
bool checkExcludedComponentsSomething(Sys)()
|
||||||
{
|
{
|
||||||
return __traits(compiles, allSameType!(string, typeof(Sys.ExcludedComponents))) && allSameType!(string,
|
return __traits(compiles, allSameType!(string, typeof(Sys.ExcludedComponents))) && allSameType!(string,
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
module ecs;
|
module ecs;
|
||||||
|
|
||||||
public import ecs.manager;
|
|
||||||
public import ecs.entity;
|
|
||||||
public import ecs.system;
|
|
||||||
public import ecs.core;
|
public import ecs.core;
|
||||||
import ecs.id_manager;
|
public import ecs.entity;
|
||||||
|
public import ecs.manager;
|
||||||
|
public import ecs.system;
|
||||||
|
|
||||||
import ecs.events;
|
import ecs.events;
|
||||||
|
import ecs.id_manager;
|
||||||
|
import ecs.std;
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
module ecs.simple_vector;
|
module ecs.simple_vector;
|
||||||
/*
|
|
||||||
import std.experimental.allocator;
|
|
||||||
import std.experimental.allocator.mallocator;*/
|
|
||||||
|
|
||||||
import ecs.std;
|
import ecs.std;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@ module ecs.std;
|
||||||
|
|
||||||
import core.stdc.stdlib : malloc, free, realloc;
|
import core.stdc.stdlib : malloc, free, realloc;
|
||||||
import core.stdc.string : memcpy;
|
import core.stdc.string : memcpy;
|
||||||
|
|
||||||
import std.traits;
|
import std.traits;
|
||||||
import core.time;
|
|
||||||
|
|
||||||
version (Windows)
|
version (Windows)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue