-removed 'InputStruct' version switch (now it's default behaviour)

-checking if System struct has valid update(EntitiesData) prototype

dub.json

@@ -10,9 +10,6 @@
 	"dflags-posix-ldc": [
 		"-defaultlib=phobos2-ldc,druntime-ldc"
 	],
-	"versions": [
-		"InputStruct"
-	],
 	"configurations" : [
 		{
 			"name" : "library",

source/ecs/manager.d

@@ -66,8 +66,6 @@ class EntityManager
             static assert(0, "System should have \"__gshared ushort system_id");
         }
 
-        version (InputStruct)
-        {
         static if (!(hasMember!(Sys, "EntitiesData")))
         {
             static assert(0, "System should gave \"EntitiesData\" struct for input components");
@@ -83,8 +81,8 @@ class EntityManager
                 else static if (!(isArray!(typeof(__traits(getMember,
                         Sys.EntitiesData, member)))))
                     static assert(0, "EntitiesData members should be arrays of elements!");
-                    else static if (is(typeof(__traits(getMember,
+                else static if (is(typeof(__traits(getMember, Sys.EntitiesData,
-                            Sys.EntitiesData, member)) == Entity[]))
+                        member)) == Entity[]))
                 {
                     //ret ~= "const string entities_name = \"" ~ member ~ "\";";
                 }
@@ -121,8 +119,9 @@ class EntityManager
 
             static foreach (member; __traits(allMembers, Sys.EntitiesData))
             {
-                    static if (is(typeof(__traits(getMember, Sys.EntitiesData, member)) == Entity[])
+                static if (is(typeof(__traits(getMember, Sys.EntitiesData,
-                        || is(typeof(__traits(getMember, Sys.EntitiesData, member)) == const(Entity)[]))
+                        member)) == Entity[]) || is(typeof(__traits(getMember,
+                        Sys.EntitiesData, member)) == const(Entity)[]))
                 {
                     //ret ~= "const string entities_name = \"" ~ member ~ "\";";
                 }
@@ -131,10 +130,10 @@ class EntityManager
                     {
 
                         ret ~= "{comp = components_map.get(Unqual!(ForeachType!(typeof(
-                                                Sys.EntitiesData."
+                                            Sys.EntitiesData." ~ member ~ ")))
-                                    ~ member ~ ")))
                                     .stringof, ushort.max);\n
-                                            if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof
+                                        if(comp == ushort.max)assert(0,\"Can't register system \\\""
+                            ~ Sys.stringof
                             ~ "\\\" due to non existing component \" ~ ForeachType!(typeof(
                                             Sys.EntitiesData."
                             ~ member ~ "))
@@ -167,128 +166,22 @@ class EntityManager
             }
             return ret;
         }
-        }
-        else
-        {
-            static string genCompList()()
-            {
-                string ret = "ushort comp;uint req;uint opt;";
-                foreach (i; 1 .. (Parameters!(Sys.update)).length)
-                {
-                    ret ~= "
-                        static if(isPointer!(types[" ~ i.to!string
-                        ~ "]))opt++;
-                        else static if(storages[" ~ i.to!string ~ "] == STC.ref_)req++;\n
-                        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 ~= "
-                        static if(isPointer!(types[" ~ i.to!string ~ "]))
-                        {
-                            comp = components_map.get(PointerTarget!(types["
-                        ~ i.to!string ~ "]).stringof, ushort.max);\n
-                            if(comp == ushort.max)assert(0,\"Can't register system \\\"" ~ Sys.stringof
-                        ~ "\\\" due to non existing component \\\"\"~types[" ~ i.to!string ~ "].stringof~\"\\\".\");
-                            system.m_optional_components[opt++] = comp;
-                        }
-                        else static if(storages["
-                        ~ i.to!string ~ "] == STC.ref_)
-                        {
-                            comp = components_map.get(types[" ~ i.to!string ~ "].stringof, ushort.max);\n
-                            if(comp == ushort.max)assert(0,\"Can't register system \\\""
-                        ~ Sys.stringof ~ "\\\" due to non existing component \\\"\"~types["
-                        ~ i.to!string ~ "].stringof~\"\\\".\");
-                            system.m_components[req++] = comp;
-                        }";
-                }
-                return ret;
-            }
-        }
 
-        static if (hasMember!(Sys, "update"))
+        string genParamsChecking()()
-        {
-            alias types = Parameters!(Sys.update);
-            alias storages = ParameterStorageClassTuple!(Sys.update);
-            static string genCall()()
         {
             string ret;
+            foreach (func; __traits(getOverloads, Sys, "update"))
             {
-                    uint i = 0;
+                if ((Parameters!(func)).length == 1)
-                    uint opt = 0;
+                    ret ~= "\"" ~ (fullyQualifiedName!(Sys.EntitiesData)) ~ "\" == \"" ~ (
-                    static foreach (param; (Parameters!(Sys.update))[1 .. $])
+                            fullyQualifiedName!((Parameters!(func))[0])) ~ "\" || ";
-                    {
-                        i++;
-                        if (isPointer!param)
-                        {
-                            ret ~= "if(opt_array" ~ opt.to!string ~ " !is null)opt_ptr"
-                                ~ opt.to!string ~ " = &opt_array" ~ opt.to!string ~ "[i];";
-                            opt++;
             }
-                    }
+            ret ~= "false";
-                }
-
-                uint i = 0;
-                uint req = 0;
-                uint opt = 0;
-                ret ~= "s.update(id_array[i],";
-                static foreach (param; (Parameters!(Sys.update))[1 .. $])
-                {
-                    i++;
-                    if (isPointer!param)
-                    {
-                        ret ~= "opt_ptr" ~ (opt++).to!string ~ ",";
-                    }
-                    else
-                    {
-                        ret ~= "array" ~ (req++).to!string ~ "[i],";
-                    }
-                }
-
-                ret ~= ");";
             return ret;
         }
 
-            static string genArrays()()
+        static if (hasMember!(Sys, "update") && (mixin(genParamsChecking())))
         {
-                string ret;
-
-                uint i = 0;
-                uint req = 0;
-                uint opt = 0;
-                static foreach (param; (Parameters!(Sys.update))[1 .. $])
-                {
-                    i++;
-                    if (isPointer!param)
-                    {
-                        ret ~= "PointerTarget!(types[" ~ i.to!string
-                            ~ "])[] opt_array" ~ opt.to!string ~ " = null;";
-                        ret ~= "if(info.deltas[types[" ~ i.to!string ~ "].component_id] != 0)opt_array" ~ opt.to!string
-                            ~ "
-                            = (cast(types[" ~ i.to!string ~ "])(cast(void*)block + info.deltas[types["
-                            ~ i.to!string ~ "].component_id]))[0..block.entities_count];";
-                        ret ~= "types[" ~ i.to!string ~ "] opt_ptr" ~ opt.to!string ~ ";";
-                        opt++;
-                    }
-                    else
-                    {
-                        ret ~= "types[" ~ i.to!string ~ "][] array" ~ req.to!string ~ " = (cast(types["
-                            ~ i.to!string ~ "]*)(cast(void*)block + info.deltas[types["
-                            ~ i.to!string ~ "].component_id]))[0..block.entities_count];";
-                        req++;
-                    }
-                }
-                return ret;
-            }
-
-            version (InputStruct)
-            {
-
             static string genFillInputData()()
             {
                 string ret;
@@ -298,8 +191,9 @@ class EntityManager
                 uint absen = 0;
                 foreach (member; __traits(allMembers, Sys.EntitiesData))
                 {
-                        if (is(typeof(__traits(getMember, Sys.EntitiesData, member)) == Entity[])
+                    if (is(typeof(__traits(getMember, Sys.EntitiesData,
-                        || is(typeof(__traits(getMember, Sys.EntitiesData, member)) == const(Entity)[]))
+                            member)) == Entity[]) || is(typeof(__traits(getMember,
+                            Sys.EntitiesData, member)) == const(Entity)[]))
                     {
                         ret ~= "input_data." ~ member
                             ~ " = (cast(Entity*) block.dataBegin())[0 .. block.entities_count];";
@@ -313,12 +207,14 @@ class EntityManager
                             {
                                 if (att == "optional")
                                 {
-                                        ret ~= "if(data.system.m_optional_components["
+                                    ret ~= "if(data.system.m_optional_components[" ~ opt.to!string
-                                        ~ opt.to!string ~ "] < info.deltas.length && info.deltas[ data.system.m_optional_components["
+                                        ~ "] < info.deltas.length && info.deltas[ data.system.m_optional_components["
-                                        ~ opt.to!string ~ "]] != 0)input_data." ~ member ~ " = (cast(ForeachType!(typeof(Sys.EntitiesData."
+                                        ~ opt.to!string ~ "]] != 0)input_data." ~ member
-                                        ~ member ~ "))*)(cast(void*) block + info.deltas[ data.system.m_optional_components["
+                                        ~ " = (cast(ForeachType!(typeof(Sys.EntitiesData." ~ member
+                                        ~ "))*)(cast(void*) block + info.deltas[ data.system.m_optional_components["
                                         ~ opt.to!string ~ "]]))[0 .. block.entities_count];
-                                        else input_data." ~ member ~ " = null;";
+                                    else input_data."
+                                        ~ member ~ " = null;";
                                     opt++;
                                     has_att = true;
                                     break;
@@ -332,8 +228,8 @@ class EntityManager
                             }
                             if (!has_att)
                             {
-                                    ret ~= "input_data." ~ member ~ " = (cast(ForeachType!(typeof(Sys.EntitiesData."
+                                ret ~= "input_data." ~ member ~ " = (cast(ForeachType!(typeof(Sys.EntitiesData." ~ member
-                                        ~ member ~ "))*)(cast(void*) block + info.deltas[ data.system.m_components["
+                                    ~ "))*)(cast(void*) block + info.deltas[ data.system.m_components["
                                     ~ req.to!string ~ "]]))[0 .. block.entities_count];";
                                 req++;
                             }
@@ -344,78 +240,22 @@ class EntityManager
             }
 
             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];*/
-
                 Sys.EntitiesData input_data;
 
                 EntitiesBlock* block = data.info.first_block;
                 while (block !is null)
                 {
                     EntityInfo* info = block.type_info;
-                            /*Entity[] id_array = (cast(Entity*) block.dataBegin())[0
-                                .. block.entities_count];*/
-                            //mixin(genArrays());
 
                     mixin(genFillInputData());
 
                     s.update(input_data);
-                            /*foreach (i; 0 .. block.entities_count)
-                            {
-                                mixin(genCall());
-                            }*/
 
                     block = block.next_block;
                 }
-
-                    }
-                }
-            }
-            else
-            {
-                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)
-                        {
-                            EntityInfo* info = block.type_info;
-                            Entity[] id_array = (cast(Entity*) block.dataBegin())[0
-                                .. block.entities_count];
-                            mixin(genArrays());
-                            foreach (i; 0 .. block.entities_count)
-                            {
-                                mixin(genCall());
-                                //data_pointer += EntityID.sizeof; //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;
@@ -449,16 +289,7 @@ class EntityManager
         system.m_system_pointer = cast(void*) Mallocator.instance.make!Sys;
         system.m_priority = priority;
 
-        //system.m_components = Mallocator.instance.makeArray!uint(types.length - 1);
-
-        version (InputStruct)
-        {
         mixin(genCompList());
-        }
-        else static if (hasMember!(Sys, "update"))
-        {
-            mixin(genCompList());
-        }
 
         ushort sys_id = systems_map.get(Sys.stringof, ushort.max);
         if (sys_id < systems.length)
@@ -487,11 +318,14 @@ class EntityManager
 
             Sys.system_id = cast(ushort)(systems.length - 1);
 
+            if (system.m_update !is null)
+            {
                 foreach (info; &entities_infos.byValue)
                 {
                     addEntityCaller(*info, cast(uint) systems.length - 1);
                 }
             }
+        }
 
         updateEntityCallers();
     }

tests/tests.d

@@ -176,18 +176,9 @@ int main()
 
 		}
 
-		void update(ref Entity entity, ref TestComp test) //ref TestComp comp)
+		void update(ref EntitiesData data)
 		{
-			assert(cast(size_t)&test % TestComp.alignof == 0);
 			
-			//writeln("High priority tekst! ");
-		}
-
-		void update(ref EntitiesData data) //ref TestComp comp)
-		{
-			assert(cast(size_t)&data.test % TestComp.alignof == 0);
-
-			//writeln("High priority tekst! ");
 		}
 
 		/*void handleEvent(Event event, ref TestComp comp)
@@ -204,11 +195,6 @@ int main()
 		{
 			Entity[] entity;
 			TestComp3[] test;
-
-			/*void a()
-			{
-				
-			}*/
 		}
 
 		void onEnable()
@@ -230,16 +216,8 @@ int main()
 
 		}
 
-		void update(ref Entity entity, ref TestComp3 test) //ref TestComp comp)
+		void update(ref EntitiesData data)
 		{
-			//writeln("TestSystem2 update");
-			test.gg += 14;
-			gEM.sendSelfEvent!(TestEvent)(entity.id, TestEvent());
-		}
-
-		void update(ref EntitiesData data) //ref TestComp comp)
-		{
-			//writeln("TestSystem2 update");
 			foreach(i;0..data.test.length)
 			{
 				data.test[i].gg += 14;