-removed LinearLayout switch (from now it's default behaviour)

dub.json

@@ -7,9 +7,6 @@
 	"copyright": "Copyright © 2017-2018, Michał Masiukiewicz, Dawid Masiukiewicz",
 	"license": "BSD",
 	"sourcePaths" : ["source\/"],
-	"versions": [
-		"LinearLayout"
-	],
 	"dflags-posix-ldc": [
 		"-defaultlib=phobos2-ldc,druntime-ldc"
 	],

source/ecs/entity.d

@@ -6,11 +6,6 @@ struct EntityID
 {
     uint id;
     uint counter;
-
-    /*int opCmp(ref const EntityID s) const 
-    {
-        return id < s.id;
-    }*/
 }
 
 struct Entity
@@ -28,19 +23,13 @@ struct Entity
         EntityManager.EntityInfo* info = block.type_info;
         if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
             return null;
-        version (LinearLayout)
+       
-        {
         static if (EntityID.sizeof == 8)
             uint ind = cast(uint)((cast(void*)&this - block.dataBegin()) >> 3);
         else
             uint ind = cast(uint)((cast(void*)&this - block.dataBegin()) / EntityID.sizeof());
         return cast(T*)(cast(void*)block + info.deltas[T.component_id] + ind * T.sizeof);
     }
-        else
-        {
-            return cast(T*)(cast(void*)&this + info.deltas[T.component_id]);
-        }
-    }
 }
 
 export struct EntityTemplate
@@ -49,17 +38,8 @@ export struct EntityTemplate
     EntityManager.EntityInfo* info;
 
     T* getComponent(T)()
-    {
-        
-        version(LinearLayout)
     {
         if(T.component_id >= info.tmpl_deltas.length)return null;
         return cast(T*)(entity_data.ptr + info.tmpl_deltas[T.component_id]);
     }
-        else 
-        {
-            if(T.component_id >= info.deltas.length)return null;
-            return cast(T*)(entity_data.ptr + info.deltas[T.component_id]);
-        }
-    }
 }

source/ecs/manager.d

@@ -73,8 +73,6 @@ class EntityManager
             static string genCall()()
             {
                 string ret;
-                version (LinearLayout)
-                {
                 {
                     uint i = 0;
                     uint opt = 0;
@@ -89,7 +87,7 @@ class EntityManager
                         }
                     }
                 }
-                }
+                
                 /*foreach (i; 1 .. (Parameters!(Sys.update)).length)
                 {
                     ret ~= "*cast(types[" ~ i.to!string ~ "]*)(pointers[" ~ (i - 1)
@@ -98,8 +96,6 @@ class EntityManager
                 uint i = 0;
                 uint req = 0;
                 uint opt = 0;
-                version (LinearLayout)
-                {
                 ret ~= "s.update(id_array[i],";
                 static foreach (param; (Parameters!(Sys.update))[1 .. $])
                 {
@@ -113,25 +109,7 @@ class EntityManager
                         ret ~= "array" ~ (req++).to!string ~ "[i],";
                     }
                 }
-                }
+
-                else
-                {
-                    ret ~= "s.update(*cast(Entity*)data_pointer,";
-                    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;
@@ -224,22 +202,6 @@ class EntityManager
                     EntitiesBlock* block = data.info.first_block;
                     while (block !is null)
                     {
-                        version (LinearLayout)
-                        {
-                            //uint size = block.type_info.size;
-                            /*void* data_pointer = block.dataBegin();
-                            foreach (i, ref pointer; pointers)
-                            {
-                                pointer = cast(void*) block + data.deltas[i];
-                            }
-                            foreach (i, ref pointer; optional_pointers)
-                            {
-                                uint ind = cast(uint)(i + pointers.length);
-                                if (data.deltas[ind] != uint.max)
-                                    pointer = cast(void*) block + data.deltas[ind];
-                                else
-                                    pointer = null;
-                            }*/
                         EntityInfo* info = block.type_info;
                         Entity[] id_array = (cast(Entity*) block.dataBegin())[0
                             .. block.entities_count];
@@ -254,34 +216,7 @@ class EntityManager
                                 if (pointer != null)
                                     pointer += size;*/
                         }
-                        }
+
-                        else
-                        {
-                            uint size = block.type_info.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] != 0)
-                                    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;
                     }
 
@@ -511,22 +446,12 @@ class EntityManager
         temp.info = info;
 
         //fill components with default data
-        version (LinearLayout)
-        {
         foreach (comp; info.components)
         {
             temp.entity_data[info.tmpl_deltas[comp] .. info.tmpl_deltas[comp] + components[comp].size]
                 = components[comp].init_data;
         }
-        }
+
-        else
-        {
-            foreach (comp; info.components)
-            {
-                temp.entity_data[info.deltas[comp] .. info.deltas[comp] + components[comp].size]
-                    = components[comp].init_data;
-            }
-        }
 
         return temp;
     }
@@ -544,8 +469,6 @@ class EntityManager
             info.size = EntityID.sizeof;
             info.alignment = EntityID.alignof;
 
-            version (LinearLayout)
-            {
             info.tmpl_deltas = Mallocator.instance.makeArray!ushort(ids[$ - 1] + 1);
             uint components_size = EntityID.sizeof;
 
@@ -581,20 +504,7 @@ class EntityManager
                 info.deltas[id] = cast(ushort) current_delta;
                 current_delta += entites_in_block * components[id].size;
             }
-            }
-            else
-            {
-                foreach (i, id; ids)
-                {
-                    info.alignment = max(info.alignment, components[id].alignment);
-                    alignNum(info.size, components[id].alignment);
-                    info.deltas[id] = info.size;
-                    info.size += components[id].size;
-                }
-                alignNum(info.size, info.alignment);
 
-                info.max_entities = (page_size - EntitiesBlock.sizeof) / info.size;
-            }
 
             foreach (uint i, ref system; systems)
             {
@@ -733,18 +643,12 @@ class EntityManager
 
         EntitiesBlock* new_block = findBlockWithFreeSpace(new_info);
 
-        version (LinearLayout)
         void* start = new_block.dataBegin() + new_block.entities_count * EntityID.sizeof;
-        else
-            void* start = new_block.dataBegin() + new_block.entities_count * new_info.size;
        
         Entity* new_entity = cast(Entity*) start;
         new_entity.id = entity.id;
         new_entity.updateID();
 
-        version (LinearLayout)
-        {
-
         static if (EntityID.sizeof == 8)
             uint ind = cast(uint)((cast(void*) entity - block.dataBegin()) >> 3);
         else
@@ -755,15 +659,6 @@ class EntityManager
             memcpy(cast(void*) new_block + new_info.deltas[comp] + new_block.entities_count * comp_size,
                     cast(void*) block + info.deltas[comp] + ind * comp_size, comp_size);
         }
-        }
-        else
-        {
-            foreach (comp; new_info.components)
-            {
-                memcpy(cast(void*) new_entity + new_info.deltas[comp],
-                        cast(void*) entity + info.deltas[comp], components[comp].size);
-            }
-        }
 
         new_block.entities_count++;
 
@@ -863,10 +758,7 @@ class EntityManager
 
         //removeEntityNoID(entity, block);
 
-        version (LinearLayout)
         void* start = new_block.dataBegin() + new_block.entities_count * EntityID.sizeof;
-        else
-            void* start = new_block.dataBegin() + new_block.entities_count * new_info.size;
         
         Entity* new_entity = cast(Entity*) start;
         new_entity.id = entity.id;
@@ -874,8 +766,6 @@ class EntityManager
 
         j = 0;
         k = 0;
-        version (LinearLayout)
-        {
         static if (EntityID.sizeof == 8)
             uint ind = cast(uint)((cast(void*) entity - block.dataBegin()) >> 3);
         else
@@ -906,35 +796,7 @@ class EntityManager
                 j++;
             }
         }
-        }
+
-        else
-        {
-            foreach (ref id; ids)
-            {
-                void* dst = cast(void*) new_entity + new_info.deltas[id];
-                uint size = components[id].size;
-                if (k >= new_ids.length)
-                {
-                    memcpy(dst, cast(void*) entity + info.deltas[id], size);
-                    j++;
-                }
-                else if (j >= info.components.length)
-                {
-                    memcpy(dst, data_pointers[k], size);
-                    k++;
-                }
-                else if (id == new_ids[k])
-                {
-                    memcpy(dst, data_pointers[k], size);
-                    k++;
-                }
-                else
-                {
-                    memcpy(dst, cast(void*) entity + info.deltas[id], size);
-                    j++;
-                }
-            }
-        }
 
         new_block.entities_count++;
         removeEntityNoID(entity, block);
@@ -986,8 +848,6 @@ class EntityManager
         uint id = (block.entities_count + block.added_count);
         EntityInfo* info = tmpl.info;
 
-        version (LinearLayout)
-        {
         void* data_begin = block.dataBegin();
         void* start = data_begin + EntityID.sizeof * id;
         //memcpy(data_begin + EntityID.sizeof * id, tmpl.entity_data.ptr, EntityID.sizeof);
@@ -996,12 +856,7 @@ class EntityManager
             memcpy(cast(void*) block + info.deltas[comp] + components[comp].size * id,
                     tmpl.entity_data.ptr + info.tmpl_deltas[comp], components[comp].size);
         }
-        }
+
-        else
-        {
-            void* start = block.dataBegin() + id * info.size;
-            memcpy(start, tmpl.entity_data.ptr, info.size);
-        }
 
         if (!block.added_count)
             blocks_to_update.add(block);
@@ -1086,8 +941,6 @@ class EntityManager
         if (info.first_with_free_space.id > block.id)
             info.first_with_free_space = block;
 
-        version (LinearLayout)
-        {
         static if (EntityID.sizeof == 8)
             uint pos = cast(uint)((cast(void*) entity - data_begin) >> 3);
         else
@@ -1106,22 +959,7 @@ class EntityManager
                 }
             }
         }
-        }
+
-        else
-        {
-            uint pos = cast(int)(cast(void*) entity - data_begin) / info.size;
-            if (call_destructors)
-            {
-                void* data = data_begin + pos * info.size;
-                foreach (comp; info.components)
-                {
-                    if (components[comp].destroy_callback)
-                    {
-                        components[comp].destroy_callback(data + info.deltas[comp]);
-                    }
-                }
-            }
-        }
 
         if (block.entities_count == 0)
         {
@@ -1148,8 +986,6 @@ class EntityManager
         if (pos == block.entities_count)
             return;
 
-        version (LinearLayout)
-        {
         foreach (comp; info.components)
         {
             void* ptr = cast(void*) block + info.deltas[comp];
@@ -1158,15 +994,7 @@ class EntityManager
         }
 
         entity.id = *cast(EntityID*)(data_begin + block.entities_count * EntityID.sizeof);
-        }
-        else
-        {
-            //copy memory of last entity to position of removed entity
-            void* src = data_begin + block.entities_count * info.size;
-            void* dst = data_begin + pos * info.size;
 
-            memcpy(dst, src, info.size);
-        }
         //update pointer for moved entity ID
         //entity = cast(Entity*) dst;
         entity.updateID();
@@ -1289,18 +1117,10 @@ class EntityManager
         ///entity components
         ushort[] components;
 
-        version (LinearLayout)
-        {
         ///deltas in memory for components in EntitiesBlock
         ushort[] deltas;
         ///deltas in memory for components in EntityTemplate
         ushort[] tmpl_deltas;
-        }
-        else
-        {
-            ///deltas in memory for components
-            ushort[] deltas;
-        }
 
         ///alignment of whole entity
         ushort alignment; //unused in linear-layout
@@ -1334,11 +1154,6 @@ class EntityManager
         export void* dataBegin()
         {
             ushort dif = EntitiesBlock.sizeof;
-            version (LinearLayout)
-            {
-            }
-            else
-                alignNum(dif, type_info.alignment);
             return cast(void*)&this + dif;
         }