Merge branch 'dev'

.luarc.json

@@ -23,5 +23,11 @@
     "runtime": {
         "version": "LuaJIT",
         "pathStrict": true
+    },
+    "workspace": {
+        "ignoreDir": [
+            ".vscode",
+            "develop/3rdparty"
+        ]
     }
 }

ROADMAP.md

@@ -5,8 +5,9 @@
 - add auto chunk count reducing
 - optimize batch operations for cases with moving entities to empty chunks
 - should we clear chunk's components by on_insert tag callback?
-- replace id type aliases with separated types to hide implementation details
 - clear chunk's tables instead reallocating them
 - add REQUIRES fragment trait
 - try to keep entity_chunks/places tables as arrays
 - set/assign/insert/remove/destroy for lists?
+- when we call hooks from chunk operations, we should use precached hook functions
+- we shouldn't clear big reusable tables

develop/3rdparty/tiny.lua

@@ -0,0 +1,864 @@
+--[[
+Copyright (c) 2016 Calvin Rose
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+]]
+
+--- @module tiny-ecs
+-- @author Calvin Rose
+-- @license MIT
+-- @copyright 2016
+local tiny = {}
+
+-- Local versions of standard lua functions
+local tinsert = table.insert
+local tremove = table.remove
+local tsort = table.sort
+local setmetatable = setmetatable
+local type = type
+local select = select
+
+-- Local versions of the library functions
+local tiny_manageEntities
+local tiny_manageSystems
+local tiny_addEntity
+local tiny_addSystem
+local tiny_add
+local tiny_removeEntity
+local tiny_removeSystem
+
+--- Filter functions.
+-- A Filter is a function that selects which Entities apply to a System.
+-- Filters take two parameters, the System and the Entity, and return a boolean
+-- value indicating if the Entity should be processed by the System. A truthy
+-- value includes the entity, while a falsey (nil or false) value excludes the
+-- entity.
+--
+-- Filters must be added to Systems by setting the `filter` field of the System.
+-- Filter's returned by tiny-ecs's Filter functions are immutable and can be
+-- used by multiple Systems.
+--
+--    local f1 = tiny.requireAll("position", "velocity", "size")
+--    local f2 = tiny.requireAny("position", "velocity", "size")
+--
+--    local e1 = {
+--        position = {2, 3},
+--        velocity = {3, 3},
+--        size = {4, 4}
+--    }
+--
+--    local entity2 = {
+--        position = {4, 5},
+--        size = {4, 4}
+--    }
+--
+--    local e3 = {
+--        position = {2, 3},
+--        velocity = {3, 3}
+--    }
+--
+--    print(f1(nil, e1), f1(nil, e2), f1(nil, e3)) -- prints true, false, false
+--    print(f2(nil, e1), f2(nil, e2), f2(nil, e3)) -- prints true, true, true
+--
+-- Filters can also be passed as arguments to other Filter constructors. This is
+-- a powerful way to create complex, custom Filters that select a very specific
+-- set of Entities.
+--
+--    -- Selects Entities with an "image" Component, but not Entities with a
+--    -- "Player" or "Enemy" Component.
+--    filter = tiny.requireAll("image", tiny.rejectAny("Player", "Enemy"))
+--
+-- @section Filter
+
+-- A helper function to compile filters.
+local filterJoin
+
+-- A helper function to filters from string
+local filterBuildString
+
+do
+
+    local loadstring = loadstring or load
+    local function getchr(c)
+        return "\\" .. c:byte()
+    end
+    local function make_safe(text)
+        return ("%q"):format(text):gsub('\n', 'n'):gsub("[\128-\255]", getchr)
+    end
+
+    local function filterJoinRaw(prefix, seperator, ...)
+        local accum = {}
+        local build = {}
+        for i = 1, select('#', ...) do
+            local item = select(i, ...)
+            if type(item) == 'string' then
+                accum[#accum + 1] = ("(e[%s] ~= nil)"):format(make_safe(item))
+            elseif type(item) == 'function' then
+                build[#build + 1] = ('local subfilter_%d_ = select(%d, ...)')
+                    :format(i, i)
+                accum[#accum + 1] = ('(subfilter_%d_(system, e))'):format(i)
+            else
+                error 'Filter token must be a string or a filter function.'
+            end
+        end
+        local source = ('%s\nreturn function(system, e) return %s(%s) end')
+            :format(
+                table.concat(build, '\n'),
+                prefix,
+                table.concat(accum, seperator))
+        local loader, err = loadstring(source)
+        if err then error(err) end
+        return loader(...)
+    end
+
+    function filterJoin(...)
+        local state, value = pcall(filterJoinRaw, ...)
+        if state then return value else return nil, value end
+    end
+
+    local function buildPart(str)
+        local accum = {}
+        local subParts = {}
+        str = str:gsub('%b()', function(p)
+            subParts[#subParts + 1] = buildPart(p:sub(2, -2))
+            return ('\255%d'):format(#subParts)
+        end)
+        for invert, part, sep in str:gmatch('(%!?)([^%|%&%!]+)([%|%&]?)') do
+            if part:match('^\255%d+$') then
+                local partIndex = tonumber(part:match(part:sub(2)))
+                accum[#accum + 1] = ('%s(%s)')
+                    :format(invert == '' and '' or 'not', subParts[partIndex])
+            else
+                accum[#accum + 1] = ("(e[%s] %s nil)")
+                    :format(make_safe(part), invert == '' and '~=' or '==')
+            end
+            if sep ~= '' then
+                accum[#accum + 1] = (sep == '|' and ' or ' or ' and ')
+            end
+        end
+        return table.concat(accum)
+    end
+
+    function filterBuildString(str)
+        local source = ("return function(_, e) return %s end")
+            :format(buildPart(str))
+        local loader, err = loadstring(source)
+        if err then
+            error(err)
+        end
+        return loader()
+    end
+
+end
+
+--- Makes a Filter that selects Entities with all specified Components and
+-- Filters.
+function tiny.requireAll(...)
+    return filterJoin('', ' and ', ...)
+end
+
+--- Makes a Filter that selects Entities with at least one of the specified
+-- Components and Filters.
+function tiny.requireAny(...)
+    return filterJoin('', ' or ', ...)
+end
+
+--- Makes a Filter that rejects Entities with all specified Components and
+-- Filters, and selects all other Entities.
+function tiny.rejectAll(...)
+    return filterJoin('not', ' and ', ...)
+end
+
+--- Makes a Filter that rejects Entities with at least one of the specified
+-- Components and Filters, and selects all other Entities.
+function tiny.rejectAny(...)
+    return filterJoin('not', ' or ', ...)
+end
+
+--- Makes a Filter from a string. Syntax of `pattern` is as follows.
+--
+--   * Tokens are alphanumeric strings including underscores.
+--   * Tokens can be separated by |, &, or surrounded by parentheses.
+--   * Tokens can be prefixed with !, and are then inverted.
+--
+-- Examples are best:
+--    'a|b|c' - Matches entities with an 'a' OR 'b' OR 'c'.
+--    'a&!b&c' - Matches entities with an 'a' AND NOT 'b' AND 'c'.
+--    'a|(b&c&d)|e - Matches 'a' OR ('b' AND 'c' AND 'd') OR 'e'
+-- @param pattern
+function tiny.filter(pattern)
+    local state, value = pcall(filterBuildString, pattern)
+    if state then return value else return nil, value end
+end
+
+--- System functions.
+-- A System is a wrapper around function callbacks for manipulating Entities.
+-- Systems are implemented as tables that contain at least one method;
+-- an update function that takes parameters like so:
+--
+--   * `function system:update(dt)`.
+--
+-- There are also a few other optional callbacks:
+--
+--   * `function system:filter(entity)` - Returns true if this System should
+-- include this Entity, otherwise should return false. If this isn't specified,
+-- no Entities are included in the System.
+--   * `function system:onAdd(entity)` - Called when an Entity is added to the
+-- System.
+--   * `function system:onRemove(entity)` - Called when an Entity is removed
+-- from the System.
+--   * `function system:onModify(dt)` - Called when the System is modified by
+-- adding or removing Entities from the System.
+--   * `function system:onAddToWorld(world)` - Called when the System is added
+-- to the World, before any entities are added to the system.
+--   * `function system:onRemoveFromWorld(world)` - Called when the System is
+-- removed from the world, after all Entities are removed from the System.
+--   * `function system:preWrap(dt)` - Called on each system before update is
+-- called on any system.
+--   * `function system:postWrap(dt)` - Called on each system in reverse order
+-- after update is called on each system. The idea behind `preWrap` and
+-- `postWrap` is to allow for systems that modify the behavior of other systems.
+-- Say there is a DrawingSystem, which draws sprites to the screen, and a
+-- PostProcessingSystem, that adds some blur and bloom effects. In the preWrap
+-- method of the PostProcessingSystem, the System could set the drawing target
+-- for the DrawingSystem to a special buffer instead the screen. In the postWrap
+-- method, the PostProcessingSystem could then modify the buffer and render it
+-- to the screen. In this setup, the PostProcessingSystem would be added to the
+-- World after the drawingSystem (A similar but less flexible behavior could
+-- be accomplished with a single custom update function in the DrawingSystem).
+--
+-- For Filters, it is convenient to use `tiny.requireAll` or `tiny.requireAny`,
+-- but one can write their own filters as well. Set the Filter of a System like
+-- so:
+--    system.filter = tiny.requireAll("a", "b", "c")
+-- or
+--    function system:filter(entity)
+--        return entity.myRequiredComponentName ~= nil
+--    end
+--
+-- All Systems also have a few important fields that are initialized when the
+-- system is added to the World. A few are important, and few should be less
+-- commonly used.
+--
+--   * The `world` field points to the World that the System belongs to. Useful
+-- for adding and removing Entities from the world dynamically via the System.
+--   * The `active` flag is whether or not the System is updated automatically.
+-- Inactive Systems should be updated manually or not at all via
+-- `system:update(dt)`. Defaults to true.
+--   * The `entities` field is an ordered list of Entities in the System. This
+-- list can be used to quickly iterate through all Entities in a System.
+--   * The `interval` field is an optional field that makes Systems update at
+-- certain intervals using buffered time, regardless of World update frequency.
+-- For example, to make a System update once a second, set the System's interval
+-- to 1.
+--   * The `index` field is the System's index in the World. Lower indexed
+-- Systems are processed before higher indices. The `index` is a read only
+-- field; to set the `index`, use `tiny.setSystemIndex(world, system)`.
+--   * The `indices` field is a table of Entity keys to their indices in the
+-- `entities` list. Most Systems can ignore this.
+--   * The `modified` flag is an indicator if the System has been modified in
+-- the last update. If so, the `onModify` callback will be called on the System
+-- in the next update, if it has one. This is usually managed by tiny-ecs, so
+-- users should mostly ignore this, too.
+--
+-- There is another option to (hopefully) increase performance in systems that
+-- have items added to or removed from them often, and have lots of entities in
+-- them.  Setting the `nocache` field of the system might improve performance.
+-- It is still experimental. There are some restriction to systems without
+-- caching, however.
+--
+--   * There is no `entities` table.
+--   * Callbacks such onAdd, onRemove, and onModify will never be called
+--   * Noncached systems cannot be sorted (There is no entities list to sort).
+--
+-- @section System
+
+-- Use an empty table as a key for identifying Systems. Any table that contains
+-- this key is considered a System rather than an Entity.
+local systemTableKey = { "SYSTEM_TABLE_KEY" }
+
+-- Checks if a table is a System.
+local function isSystem(table)
+    return table[systemTableKey]
+end
+
+-- Update function for all Processing Systems.
+local function processingSystemUpdate(system, dt)
+    local preProcess = system.preProcess
+    local process = system.process
+    local postProcess = system.postProcess
+
+    if preProcess then
+        preProcess(system, dt)
+    end
+
+    if process then
+        if system.nocache then
+            local entities = system.world.entities
+            local filter = system.filter
+            if filter then
+                for i = 1, #entities do
+                    local entity = entities[i]
+                    if filter(system, entity) then
+                        process(system, entity, dt)
+                    end
+                end
+            end
+        else
+            local entities = system.entities
+            for i = 1, #entities do
+                process(system, entities[i], dt)
+            end
+        end
+    end
+
+    if postProcess then
+        postProcess(system, dt)
+    end
+end
+
+-- Sorts Systems by a function system.sortDelegate(entity1, entity2) on modify.
+local function sortedSystemOnModify(system)
+    local entities = system.entities
+    local indices = system.indices
+    local sortDelegate = system.sortDelegate
+    if not sortDelegate then
+        local compare = system.compare
+        sortDelegate = function(e1, e2)
+            return compare(system, e1, e2)
+        end
+        system.sortDelegate = sortDelegate
+    end
+    tsort(entities, sortDelegate)
+    for i = 1, #entities do
+        indices[entities[i]] = i
+    end
+end
+
+--- Creates a new System or System class from the supplied table. If `table` is
+-- nil, creates a new table.
+function tiny.system(table)
+    table = table or {}
+    table[systemTableKey] = true
+    return table
+end
+
+--- Creates a new Processing System or Processing System class. Processing
+-- Systems process each entity individual, and are usually what is needed.
+-- Processing Systems have three extra callbacks besides those inheritted from
+-- vanilla Systems.
+--
+--     function system:preProcess(dt) -- Called before iteration.
+--     function system:process(entity, dt) -- Process each entity.
+--     function system:postProcess(dt) -- Called after iteration.
+--
+-- Processing Systems have their own `update` method, so don't implement a
+-- a custom `update` callback for Processing Systems.
+-- @see system
+function tiny.processingSystem(table)
+    table = table or {}
+    table[systemTableKey] = true
+    table.update = processingSystemUpdate
+    return table
+end
+
+--- Creates a new Sorted System or Sorted System class. Sorted Systems sort
+-- their Entities according to a user-defined method, `system:compare(e1, e2)`,
+-- which should return true if `e1` should come before `e2` and false otherwise.
+-- Sorted Systems also override the default System's `onModify` callback, so be
+-- careful if defining a custom callback. However, for processing the sorted
+-- entities, consider `tiny.sortedProcessingSystem(table)`.
+-- @see system
+function tiny.sortedSystem(table)
+    table = table or {}
+    table[systemTableKey] = true
+    table.onModify = sortedSystemOnModify
+    return table
+end
+
+--- Creates a new Sorted Processing System or Sorted Processing System class.
+-- Sorted Processing Systems have both the aspects of Processing Systems and
+-- Sorted Systems.
+-- @see system
+-- @see processingSystem
+-- @see sortedSystem
+function tiny.sortedProcessingSystem(table)
+    table = table or {}
+    table[systemTableKey] = true
+    table.update = processingSystemUpdate
+    table.onModify = sortedSystemOnModify
+    return table
+end
+
+--- World functions.
+-- A World is a container that manages Entities and Systems. Typically, a
+-- program uses one World at a time.
+--
+-- For all World functions except `tiny.world(...)`, object-oriented syntax can
+-- be used instead of the documented syntax. For example,
+-- `tiny.add(world, e1, e2, e3)` is the same as `world:add(e1, e2, e3)`.
+-- @section World
+
+-- Forward declaration
+local worldMetaTable
+
+--- Creates a new World.
+-- Can optionally add default Systems and Entities. Returns the new World along
+-- with default Entities and Systems.
+function tiny.world(...)
+    local ret = setmetatable({
+
+        -- List of Entities to remove
+        entitiesToRemove = {},
+
+        -- List of Entities to change
+        entitiesToChange = {},
+
+        -- List of Entities to add
+        systemsToAdd = {},
+
+        -- List of Entities to remove
+        systemsToRemove = {},
+
+        -- Set of Entities
+        entities = {},
+
+        -- List of Systems
+        systems = {}
+
+    }, worldMetaTable)
+
+    tiny_add(ret, ...)
+    tiny_manageSystems(ret)
+    tiny_manageEntities(ret)
+
+    return ret, ...
+end
+
+--- Adds an Entity to the world.
+-- Also call this on Entities that have changed Components such that they
+-- match different Filters. Returns the Entity.
+function tiny.addEntity(world, entity)
+    local e2c = world.entitiesToChange
+    e2c[#e2c + 1] = entity
+    return entity
+end
+tiny_addEntity = tiny.addEntity
+
+--- Adds a System to the world. Returns the System.
+function tiny.addSystem(world, system)
+    assert(system.world == nil, "System already belongs to a World.")
+    local s2a = world.systemsToAdd
+    s2a[#s2a + 1] = system
+    system.world = world
+    return system
+end
+tiny_addSystem = tiny.addSystem
+
+--- Shortcut for adding multiple Entities and Systems to the World. Returns all
+-- added Entities and Systems.
+function tiny.add(world, ...)
+    for i = 1, select("#", ...) do
+        local obj = select(i, ...)
+        if obj then
+            if isSystem(obj) then
+                tiny_addSystem(world, obj)
+            else -- Assume obj is an Entity
+                tiny_addEntity(world, obj)
+            end
+        end
+    end
+    return ...
+end
+tiny_add = tiny.add
+
+--- Removes an Entity from the World. Returns the Entity.
+function tiny.removeEntity(world, entity)
+    local e2r = world.entitiesToRemove
+    e2r[#e2r + 1] = entity
+    return entity
+end
+tiny_removeEntity = tiny.removeEntity
+
+--- Removes a System from the world. Returns the System.
+function tiny.removeSystem(world, system)
+    assert(system.world == world, "System does not belong to this World.")
+    local s2r = world.systemsToRemove
+    s2r[#s2r + 1] = system
+    return system
+end
+tiny_removeSystem = tiny.removeSystem
+
+--- Shortcut for removing multiple Entities and Systems from the World. Returns
+-- all removed Systems and Entities
+function tiny.remove(world, ...)
+    for i = 1, select("#", ...) do
+        local obj = select(i, ...)
+        if obj then
+            if isSystem(obj) then
+                tiny_removeSystem(world, obj)
+            else -- Assume obj is an Entity
+                tiny_removeEntity(world, obj)
+            end
+        end
+    end
+    return ...
+end
+
+-- Adds and removes Systems that have been marked from the World.
+function tiny_manageSystems(world)
+    local s2a, s2r = world.systemsToAdd, world.systemsToRemove
+
+    -- Early exit
+    if #s2a == 0 and #s2r == 0 then
+        return
+    end
+
+    world.systemsToAdd = {}
+    world.systemsToRemove = {}
+
+    local worldEntityList = world.entities
+    local systems = world.systems
+
+    -- Remove Systems
+    for i = 1, #s2r do
+        local system = s2r[i]
+        local index = system.index
+        local onRemove = system.onRemove
+        if onRemove and not system.nocache then
+            local entityList = system.entities
+            for j = 1, #entityList do
+                onRemove(system, entityList[j])
+            end
+        end
+        tremove(systems, index)
+        for j = index, #systems do
+            systems[j].index = j
+        end
+        local onRemoveFromWorld = system.onRemoveFromWorld
+        if onRemoveFromWorld then
+            onRemoveFromWorld(system, world)
+        end
+        s2r[i] = nil
+
+        -- Clean up System
+        system.world = nil
+        system.entities = nil
+        system.indices = nil
+        system.index = nil
+    end
+
+    -- Add Systems
+    for i = 1, #s2a do
+        local system = s2a[i]
+        if systems[system.index or 0] ~= system then
+            if not system.nocache then
+                system.entities = {}
+                system.indices = {}
+            end
+            if system.active == nil then
+                system.active = true
+            end
+            system.modified = true
+            system.world = world
+            local index = #systems + 1
+            system.index = index
+            systems[index] = system
+            local onAddToWorld = system.onAddToWorld
+            if onAddToWorld then
+                onAddToWorld(system, world)
+            end
+
+            -- Try to add Entities
+            if not system.nocache then
+                local entityList = system.entities
+                local entityIndices = system.indices
+                local onAdd = system.onAdd
+                local filter = system.filter
+                if filter then
+                    for j = 1, #worldEntityList do
+                        local entity = worldEntityList[j]
+                        if filter(system, entity) then
+                            local entityIndex = #entityList + 1
+                            entityList[entityIndex] = entity
+                            entityIndices[entity] = entityIndex
+                            if onAdd then
+                                onAdd(system, entity)
+                            end
+                        end
+                    end
+                end
+            end
+        end
+        s2a[i] = nil
+    end
+end
+
+-- Adds, removes, and changes Entities that have been marked.
+function tiny_manageEntities(world)
+
+    local e2r = world.entitiesToRemove
+    local e2c = world.entitiesToChange
+
+    -- Early exit
+    if #e2r == 0 and #e2c == 0 then
+        return
+    end
+
+    world.entitiesToChange = {}
+    world.entitiesToRemove = {}
+
+    local entities = world.entities
+    local systems = world.systems
+
+    -- Change Entities
+    for i = 1, #e2c do
+        local entity = e2c[i]
+        -- Add if needed
+        if not entities[entity] then
+            local index = #entities + 1
+            entities[entity] = index
+            entities[index] = entity
+        end
+        for j = 1, #systems do
+            local system = systems[j]
+            if not system.nocache then
+                local ses = system.entities
+                local seis = system.indices
+                local index = seis[entity]
+                local filter = system.filter
+                if filter and filter(system, entity) then
+                    if not index then
+                        system.modified = true
+                        index = #ses + 1
+                        ses[index] = entity
+                        seis[entity] = index
+                        local onAdd = system.onAdd
+                        if onAdd then
+                            onAdd(system, entity)
+                        end
+                    end
+                elseif index then
+                    system.modified = true
+                    local tmpEntity = ses[#ses]
+                    ses[index] = tmpEntity
+                    seis[tmpEntity] = index
+                    seis[entity] = nil
+                    ses[#ses] = nil
+                    local onRemove = system.onRemove
+                    if onRemove then
+                        onRemove(system, entity)
+                    end
+                end
+            end
+        end
+        e2c[i] = nil
+    end
+
+    -- Remove Entities
+    for i = 1, #e2r do
+        local entity = e2r[i]
+        e2r[i] = nil
+        local listIndex = entities[entity]
+        if listIndex then
+            -- Remove Entity from world state
+            local lastEntity = entities[#entities]
+            entities[lastEntity] = listIndex
+            entities[entity] = nil
+            entities[listIndex] = lastEntity
+            entities[#entities] = nil
+            -- Remove from cached systems
+            for j = 1, #systems do
+                local system = systems[j]
+                if not system.nocache then
+                    local ses = system.entities
+                    local seis = system.indices
+                    local index = seis[entity]
+                    if index then
+                        system.modified = true
+                        local tmpEntity = ses[#ses]
+                        ses[index] = tmpEntity
+                        seis[tmpEntity] = index
+                        seis[entity] = nil
+                        ses[#ses] = nil
+                        local onRemove = system.onRemove
+                        if onRemove then
+                            onRemove(system, entity)
+                        end
+                    end
+                end
+            end
+        end
+    end
+end
+
+--- Manages Entities and Systems marked for deletion or addition. Call this
+-- before modifying Systems and Entities outside of a call to `tiny.update`.
+-- Do not call this within a call to `tiny.update`.
+function tiny.refresh(world)
+    tiny_manageSystems(world)
+    tiny_manageEntities(world)
+    local systems = world.systems
+    for i = #systems, 1, -1 do
+        local system = systems[i]
+        if system.active then
+            local onModify = system.onModify
+            if onModify and system.modified then
+                onModify(system, 0)
+            end
+            system.modified = false
+        end
+    end
+end
+
+--- Updates the World by dt (delta time). Takes an optional parameter, `filter`,
+-- which is a Filter that selects Systems from the World, and updates only those
+-- Systems. If `filter` is not supplied, all Systems are updated. Put this
+-- function in your main loop.
+function tiny.update(world, dt, filter)
+
+    tiny_manageSystems(world)
+    tiny_manageEntities(world)
+
+    local systems = world.systems
+
+    -- Iterate through Systems IN REVERSE ORDER
+    for i = #systems, 1, -1 do
+        local system = systems[i]
+        if system.active then
+            -- Call the modify callback on Systems that have been modified.
+            local onModify = system.onModify
+            if onModify and system.modified then
+                onModify(system, dt)
+            end
+            local preWrap = system.preWrap
+            if preWrap and
+                ((not filter) or filter(world, system)) then
+                preWrap(system, dt)
+            end
+        end
+    end
+
+    --  Iterate through Systems IN ORDER
+    for i = 1, #systems do
+        local system = systems[i]
+        if system.active and ((not filter) or filter(world, system)) then
+
+            -- Update Systems that have an update method (most Systems)
+            local update = system.update
+            if update then
+                local interval = system.interval
+                if interval then
+                    local bufferedTime = (system.bufferedTime or 0) + dt
+                    while bufferedTime >= interval do
+                        bufferedTime = bufferedTime - interval
+                        update(system, interval)
+                    end
+                    system.bufferedTime = bufferedTime
+                else
+                    update(system, dt)
+                end
+            end
+
+            system.modified = false
+        end
+    end
+
+    -- Iterate through Systems IN ORDER AGAIN
+    for i = 1, #systems do
+        local system = systems[i]
+        local postWrap = system.postWrap
+        if postWrap and system.active and
+            ((not filter) or filter(world, system)) then
+            postWrap(system, dt)
+        end
+    end
+
+end
+
+--- Removes all Entities from the World.
+function tiny.clearEntities(world)
+    local el = world.entities
+    for i = 1, #el do
+        tiny_removeEntity(world, el[i])
+    end
+end
+
+--- Removes all Systems from the World.
+function tiny.clearSystems(world)
+    local systems = world.systems
+    for i = #systems, 1, -1 do
+        tiny_removeSystem(world, systems[i])
+    end
+end
+
+--- Gets number of Entities in the World.
+function tiny.getEntityCount(world)
+    return #world.entities
+end
+
+--- Gets number of Systems in World.
+function tiny.getSystemCount(world)
+    return #world.systems
+end
+
+--- Sets the index of a System in the World, and returns the old index. Changes
+-- the order in which they Systems processed, because lower indexed Systems are
+-- processed first. Returns the old system.index.
+function tiny.setSystemIndex(world, system, index)
+    tiny_manageSystems(world)
+    local oldIndex = system.index
+    local systems = world.systems
+
+    if index < 0 then
+        index = tiny.getSystemCount(world) + 1 + index
+    end
+
+    tremove(systems, oldIndex)
+    tinsert(systems, index, system)
+
+    for i = oldIndex, index, index >= oldIndex and 1 or -1 do
+        systems[i].index = i
+    end
+
+    return oldIndex
+end
+
+-- Construct world metatable.
+worldMetaTable = {
+    __index = {
+        add = tiny.add,
+        addEntity = tiny.addEntity,
+        addSystem = tiny.addSystem,
+        remove = tiny.remove,
+        removeEntity = tiny.removeEntity,
+        removeSystem = tiny.removeSystem,
+        refresh = tiny.refresh,
+        update = tiny.update,
+        clearEntities = tiny.clearEntities,
+        clearSystems = tiny.clearSystems,
+        getEntityCount = tiny.getEntityCount,
+        getSystemCount = tiny.getSystemCount,
+        setSystemIndex = tiny.setSystemIndex
+    },
+    __tostring = function()
+        return "<tiny-ecs_World>"
+    end
+}
+
+return tiny

develop/all.lua

@@ -1,3 +1,4 @@
 require 'develop.example'
 require 'develop.unbench'
 require 'develop.untests'
+require 'develop.usbench'

develop/basics.lua

@@ -13,7 +13,8 @@ end)()
 ---@param name string
 ---@param loop fun(...): ...
 ---@param init? fun(): ...
-function basics.describe_bench(name, loop, init)
+---@param fini? fun(...): ...
+function basics.describe_bench(name, loop, init, fini)
     print(string.format('| %s ... |', name))
 
     local state = init and __table_pack(init()) or {}
@@ -28,7 +29,7 @@ function basics.describe_bench(name, loop, init)
         end)
 
         if not success then
-            print('|-- FAIL: ' .. result)
+            print('|-- WARMUP FAIL: ' .. result)
             return
         end
     end
@@ -59,7 +60,17 @@ function basics.describe_bench(name, loop, init)
                 (finish_kb - start_kb) / iters,
                 iters))
         else
-            print('|-- FAIL: ' .. result)
+            print('|-- LOOP FAIL: ' .. result)
+        end
+    end
+
+    if fini then
+        local success, result = pcall(function()
+            fini(__table_unpack(state))
+        end)
+
+        if not success then
+            print('|-- FINI FAIL: ' .. result)
         end
     end
 

develop/unbench.lua

@@ -6,6 +6,7 @@ local basics = require 'develop.basics'
 local N = 1000
 local B = evo.entity()
 local F1, F2, F3, F4, F5 = evo.id(5)
+local Q1 = evo.query():include(F1):build()
 
 print '----------------------------------------'
 
@@ -224,7 +225,7 @@ basics.describe_bench(string.format('create and destroy %d entities', N),
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        for i = #entities, 1, -1 do
             destroy(entities[i])
         end
     end, function()
@@ -236,7 +237,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = id()
@@ -244,9 +244,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -256,7 +254,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = id()
@@ -265,9 +262,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -277,7 +272,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = id()
@@ -287,9 +281,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -299,7 +291,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = id()
@@ -310,9 +301,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -322,7 +311,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = id()
@@ -334,9 +322,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -348,7 +334,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         evo.defer()
         for i = 1, N do
@@ -358,9 +343,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
         end
         evo.commit()
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -370,7 +353,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         evo.defer()
         for i = 1, N do
@@ -381,9 +363,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
         end
         evo.commit()
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -393,7 +373,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         evo.defer()
         for i = 1, N do
@@ -405,9 +384,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
         end
         evo.commit()
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -417,7 +394,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         evo.defer()
         for i = 1, N do
@@ -430,9 +406,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
         end
         evo.commit()
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -442,7 +416,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     function(entities)
         local id = evo.id
         local insert = evo.insert
-        local destroy = evo.destroy
 
         evo.defer()
         for i = 1, N do
@@ -456,9 +429,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
         end
         evo.commit()
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -470,16 +441,13 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     function(entities)
         local set = B.set
         local build = B.build
-        local destroy = evo.destroy
 
         for i = 1, N do
             set(B, F1)
             entities[i] = build(B)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -489,7 +457,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     function(entities)
         local set = B.set
         local build = B.build
-        local destroy = evo.destroy
 
         for i = 1, N do
             set(B, F1)
@@ -497,9 +464,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
             entities[i] = build(B)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -509,7 +474,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     function(entities)
         local set = B.set
         local build = B.build
-        local destroy = evo.destroy
 
         for i = 1, N do
             set(B, F1)
@@ -518,9 +482,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
             entities[i] = build(B)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -530,7 +492,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     function(entities)
         local set = B.set
         local build = B.build
-        local destroy = evo.destroy
 
         for i = 1, N do
             set(B, F1)
@@ -540,9 +501,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
             entities[i] = build(B)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -552,7 +511,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     function(entities)
         local set = B.set
         local build = B.build
-        local destroy = evo.destroy
 
         for i = 1, N do
             set(B, F1)
@@ -563,9 +521,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
             entities[i] = build(B)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -576,7 +532,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     ---@param entities evolved.id[]
     function(entities)
         local set = evo.multi_set
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = evo.id()
@@ -584,9 +539,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -595,7 +548,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     ---@param entities evolved.id[]
     function(entities)
         local set = evo.multi_set
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = evo.id()
@@ -603,9 +555,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -614,7 +564,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     ---@param entities evolved.id[]
     function(entities)
         local set = evo.multi_set
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = evo.id()
@@ -622,9 +571,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -633,7 +580,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     ---@param entities evolved.id[]
     function(entities)
         local set = evo.multi_set
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = evo.id()
@@ -641,9 +587,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -652,7 +596,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     ---@param entities evolved.id[]
     function(entities)
         local set = evo.multi_set
-        local destroy = evo.destroy
 
         for i = 1, N do
             local e = evo.id()
@@ -660,9 +603,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
             entities[i] = e
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -672,8 +613,8 @@ print '----------------------------------------'
 basics.describe_bench(string.format('create and destroy %d entities / spawn_at', N),
     ---@param entities evolved.id[]
     function(entities)
-        local spawn_at = evo.spawn_at
         local destroy = evo.destroy
+        local spawn_at = evo.spawn_at
 
         local fragments = {}
         local components = {}
@@ -684,7 +625,7 @@ basics.describe_bench(string.format('create and destroy %d entities / spawn_at',
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        for i = #entities, 1, -1 do
             destroy(entities[i])
         end
     end, function()
@@ -695,7 +636,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_at = evo.spawn_at
-        local destroy = evo.destroy
 
         local fragments = { F1 }
         local components = { true }
@@ -706,9 +646,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -717,7 +655,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_at = evo.spawn_at
-        local destroy = evo.destroy
 
         local fragments = { F1, F2 }
         local components = { true, true }
@@ -728,9 +665,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -739,7 +674,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_at = evo.spawn_at
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3 }
         local components = { true, true, true }
@@ -750,9 +684,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -761,7 +693,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_at = evo.spawn_at
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3, F4 }
         local components = { true, true, true, true }
@@ -772,9 +703,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -783,7 +712,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_at = evo.spawn_at
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3, F4, F5 }
         local components = { true, true, true, true, true }
@@ -794,9 +722,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
             entities[i] = spawn_at(chunk, fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -806,8 +732,8 @@ print '----------------------------------------'
 basics.describe_bench(string.format('create and destroy %d entities / spawn_with', N),
     ---@param entities evolved.id[]
     function(entities)
-        local spawn_with = evo.spawn_with
         local destroy = evo.destroy
+        local spawn_with = evo.spawn_with
 
         local fragments = {}
         local components = {}
@@ -816,7 +742,7 @@ basics.describe_bench(string.format('create and destroy %d entities / spawn_with
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        for i = #entities, 1, -1 do
             destroy(entities[i])
         end
     end, function()
@@ -827,7 +753,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_with = evo.spawn_with
-        local destroy = evo.destroy
 
         local fragments = { F1 }
         local components = { true }
@@ -836,9 +761,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 1 compo
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -847,7 +770,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_with = evo.spawn_with
-        local destroy = evo.destroy
 
         local fragments = { F1, F2 }
         local components = { true, true }
@@ -856,9 +778,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 2 compo
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -867,7 +787,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_with = evo.spawn_with
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3 }
         local components = { true, true, true }
@@ -876,9 +795,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 3 compo
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -887,7 +804,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_with = evo.spawn_with
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3, F4 }
         local components = { true, true, true, true }
@@ -896,9 +812,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 4 compo
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)
@@ -907,7 +821,6 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
     ---@param entities evolved.id[]
     function(entities)
         local spawn_with = evo.spawn_with
-        local destroy = evo.destroy
 
         local fragments = { F1, F2, F3, F4, F5 }
         local components = { true, true, true, true, true }
@@ -916,9 +829,7 @@ basics.describe_bench(string.format('create and destroy %d entities with 5 compo
             entities[i] = spawn_with(fragments, components)
         end
 
-        for i = 1, #entities do
+        evo.batch_destroy(Q1)
-            destroy(entities[i])
-        end
     end, function()
         return {}
     end)

develop/untests.lua

@@ -4957,9 +4957,14 @@ end
 
 do
     local id = evo.pack(7, 3)
-    assert(id == 0x300007)
+    local index, version = evo.unpack(id)
-    local index, version = evo.unpack(0x500004)
+    assert(index == 7 and version == 3)
-    assert(index == 4 and version == 5)
+end
+
+do
+    local id = evo.pack(0xFFFFF, 0x7FF)
+    local index, version = evo.unpack(id)
+    assert(index == 0xFFFFF and version == 0x7FF)
 end
 
 do
@@ -5120,3 +5125,450 @@ do
         assert(c4 and #c4 == 1 and c4[1] == 4)
     end
 end
+
+do
+    local f0, f1, f2, f3, f4 = evo.id(5)
+
+    evo.set(f0, evo.CONSTRUCT, function()
+        return 42
+    end)
+
+    evo.set(f1, evo.CONSTRUCT, function(a1)
+        return a1
+    end)
+
+    evo.set(f2, evo.CONSTRUCT, function(a1, a2)
+        return a1 + a2
+    end)
+
+    evo.set(f3, evo.CONSTRUCT, function(a1, a2, a3)
+        return a1 + a2 + a3
+    end)
+
+    evo.set(f4, evo.CONSTRUCT, function(a1, a2, a3, a4)
+        return a1 + a2 + a3 + a4
+    end)
+
+    do
+        local e1 = evo.id()
+        evo.set(e1, f0)
+        evo.set(e1, f1, 1)
+        evo.set(e1, f2, 1, 2)
+        evo.set(e1, f3, 1, 2, 3)
+        evo.set(e1, f4, 1, 2, 3, 4)
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1 = evo.id()
+        evo.insert(e1, f0)
+        evo.insert(e1, f1, 1)
+        evo.insert(e1, f2, 1, 2)
+        evo.insert(e1, f3, 1, 2, 3)
+        evo.insert(e1, f4, 1, 2, 3, 4)
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1 = evo.id()
+        evo.multi_insert(e1, { f0, f1, f2, f3, f4 })
+        evo.assign(e1, f0)
+        evo.assign(e1, f1, 1)
+        evo.assign(e1, f2, 1, 2)
+        evo.assign(e1, f3, 1, 2, 3)
+        evo.assign(e1, f4, 1, 2, 3, 4)
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1, e2, e3, e4 = evo.id(4)
+        evo.multi_insert(e1, { f1, f2, f3, f4 })
+        evo.multi_insert(e2, { f1, f2, f3, f4 })
+        evo.multi_insert(e3, { f1, f2, f3, f4 })
+        evo.multi_insert(e4, { f1, f2, f3, f4 })
+        evo.remove(e1, f0, f1)
+        evo.remove(e2, f0, f1, f2)
+        evo.remove(e3, f0, f1, f2, f3)
+        evo.remove(e4, f0, f1, f2, f3, f4)
+        assert(evo.get(e1, f1) == nil and evo.get(e1, f2) == true and evo.get(e1, f3) == true and evo.get(e1, f4) == true)
+        assert(evo.get(e2, f1) == nil and evo.get(e2, f2) == nil and evo.get(e2, f3) == true and evo.get(e2, f4) == true)
+        assert(evo.get(e3, f1) == nil and evo.get(e3, f2) == nil and evo.get(e3, f3) == nil and evo.get(e3, f4) == true)
+        assert(evo.get(e4, f1) == nil and evo.get(e4, f2) == nil and evo.get(e4, f3) == nil and evo.get(e4, f4) == nil)
+    end
+    do
+        local e1, e2 = evo.id(2)
+        assert(evo.defer())
+        evo.set(e1, f0)
+        evo.set(e1, f1, 1)
+        evo.set(e1, f2, 1, 2)
+        evo.set(e1, f3, 1, 2, 3)
+        evo.set(e1, f4, 1, 2, 3, 4)
+        evo.set(e2, f0)
+        evo.set(e2, f1, 1)
+        evo.set(e2, f2, 1, 2)
+        evo.set(e2, f3, 1, 2, 3)
+        evo.set(e2, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1, e2 = evo.id(2)
+        assert(evo.defer())
+        evo.insert(e1, f0)
+        evo.insert(e1, f1, 1)
+        evo.insert(e1, f2, 1, 2)
+        evo.insert(e1, f3, 1, 2, 3)
+        evo.insert(e1, f4, 1, 2, 3, 4)
+        evo.insert(e2, f0)
+        evo.insert(e2, f1, 1)
+        evo.insert(e2, f2, 1, 2)
+        evo.insert(e2, f3, 1, 2, 3)
+        evo.insert(e2, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1, e2 = evo.id(2)
+        evo.multi_insert(e1, { f0, f1, f2, f3, f4 })
+        evo.multi_insert(e2, { f0, f1, f2, f3, f4 })
+        assert(evo.defer())
+        evo.assign(e1, f0)
+        evo.assign(e1, f1, 1)
+        evo.assign(e1, f2, 1, 2)
+        evo.assign(e1, f3, 1, 2, 3)
+        evo.assign(e1, f4, 1, 2, 3, 4)
+        evo.assign(e2, f0)
+        evo.assign(e2, f1, 1)
+        evo.assign(e2, f2, 1, 2)
+        evo.assign(e2, f3, 1, 2, 3)
+        evo.assign(e2, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1, e2, e3, e4 = evo.id(4)
+        evo.multi_insert(e1, { f1, f2, f3, f4 })
+        evo.multi_insert(e2, { f1, f2, f3, f4 })
+        evo.multi_insert(e3, { f1, f2, f3, f4 })
+        evo.multi_insert(e4, { f1, f2, f3, f4 })
+        assert(evo.defer())
+        evo.remove(e1, f1)
+        evo.remove(e2, f1, f2)
+        evo.remove(e3, f1, f2, f3)
+        evo.remove(e4, f1, f2, f3, f4)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == nil and evo.get(e1, f2) == true and evo.get(e1, f3) == true and evo.get(e1, f4) == true)
+        assert(evo.get(e2, f1) == nil and evo.get(e2, f2) == nil and evo.get(e2, f3) == true and evo.get(e2, f4) == true)
+        assert(evo.get(e3, f1) == nil and evo.get(e3, f2) == nil and evo.get(e3, f3) == nil and evo.get(e3, f4) == true)
+        assert(evo.get(e4, f1) == nil and evo.get(e4, f2) == nil and evo.get(e4, f3) == nil and evo.get(e4, f4) == nil)
+    end
+end
+
+do
+    local fa, f0, f1, f2, f3, f4 = evo.id(6)
+    local q0 = evo.query():include(fa):build()
+
+    evo.set(f0, evo.CONSTRUCT, function()
+        return 42
+    end)
+
+    evo.set(f1, evo.CONSTRUCT, function(a1)
+        return a1
+    end)
+
+    evo.set(f2, evo.CONSTRUCT, function(a1, a2)
+        return a1 + a2
+    end)
+
+    evo.set(f3, evo.CONSTRUCT, function(a1, a2, a3)
+        return a1 + a2 + a3
+    end)
+
+    evo.set(f4, evo.CONSTRUCT, function(a1, a2, a3, a4)
+        return a1 + a2 + a3 + a4
+    end)
+
+    do
+        local e1 = evo.entity():set(fa):build()
+        local e2 = evo.entity():set(fa):build()
+        assert(evo.defer())
+        evo.batch_set(q0, f0)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.defer())
+        evo.batch_set(q0, f1, 1)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.defer())
+        evo.batch_set(q0, f2, 1, 2)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.defer())
+        evo.batch_set(q0, f3, 1, 2, 3)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.defer())
+        evo.batch_set(q0, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.defer())
+        evo.batch_set(q0, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1 = evo.entity():set(fa):build()
+        local e2 = evo.entity():set(fa):build()
+        assert(evo.defer())
+        evo.batch_insert(q0, f0)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.defer())
+        evo.batch_insert(q0, f1, 1)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.defer())
+        evo.batch_insert(q0, f2, 1, 2)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.defer())
+        evo.batch_insert(q0, f3, 1, 2, 3)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.defer())
+        evo.batch_insert(q0, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1 = evo.entity():set(fa):build()
+        local e2 = evo.entity():set(fa):build()
+        assert(evo.defer())
+        evo.batch_insert(q0, f0, 0)
+        evo.batch_assign(q0, f0)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.defer())
+        evo.batch_insert(q0, f1, 0)
+        evo.batch_assign(q0, f1, 1)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.defer())
+        evo.batch_insert(q0, f2, 0, 0)
+        evo.batch_assign(q0, f2, 1, 2)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.defer())
+        evo.batch_insert(q0, f3, 0, 0, 0)
+        evo.batch_assign(q0, f3, 1, 2, 3)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.defer())
+        evo.batch_insert(q0, f4, 0, 0, 0, 0)
+        evo.batch_assign(q0, f4, 1, 2, 3, 4)
+        assert(evo.commit())
+        assert(evo.get(e1, f0) == 42)
+        assert(evo.get(e2, f0) == 42)
+        assert(evo.get(e1, f1) == 1)
+        assert(evo.get(e1, f2) == 1 + 2)
+        assert(evo.get(e1, f3) == 1 + 2 + 3)
+        assert(evo.get(e1, f4) == 1 + 2 + 3 + 4)
+        assert(evo.get(e2, f1) == 1)
+        assert(evo.get(e2, f2) == 1 + 2)
+        assert(evo.get(e2, f3) == 1 + 2 + 3)
+        assert(evo.get(e2, f4) == 1 + 2 + 3 + 4)
+    end
+    do
+        local e1 = evo.entity()
+            :set(fa)
+            :build()
+        local e2 = evo.entity()
+            :set(fa)
+            :build()
+        assert(evo.defer())
+        evo.batch_remove(q0)
+        assert(evo.commit())
+        assert(evo.get(e1, fa) == true)
+        assert(evo.get(e2, fa) == true)
+    end
+    do
+        local e1 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :build()
+        local e2 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :build()
+        assert(evo.defer())
+        evo.batch_remove(q0, f1)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == nil)
+        assert(evo.get(e2, f1) == nil)
+    end
+    do
+        local e1 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :build()
+        local e2 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :build()
+        assert(evo.defer())
+        evo.batch_remove(q0, f1, f2)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == nil)
+        assert(evo.get(e2, f1) == nil)
+        assert(evo.get(e1, f2) == nil)
+        assert(evo.get(e2, f2) == nil)
+    end
+    do
+        local e1 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :set(f3, 1, 2, 3)
+            :build()
+        local e2 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :set(f3, 1, 2, 3)
+            :build()
+        assert(evo.defer())
+        evo.batch_remove(q0, f1, f2, f3)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == nil)
+        assert(evo.get(e2, f1) == nil)
+        assert(evo.get(e1, f2) == nil)
+        assert(evo.get(e2, f2) == nil)
+        assert(evo.get(e1, f3) == nil)
+        assert(evo.get(e2, f3) == nil)
+    end
+    do
+        local e1 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :set(f3, 1, 2, 3)
+            :set(f4, 1, 2, 3, 4)
+            :build()
+        local e2 = evo.entity()
+            :set(fa)
+            :set(f1, 1)
+            :set(f2, 1, 2)
+            :set(f3, 1, 2, 3)
+            :set(f4, 1, 2, 3, 4)
+            :build()
+        assert(evo.defer())
+        evo.batch_remove(q0, f1, f2, f3, f4)
+        assert(evo.commit())
+        assert(evo.get(e1, f1) == nil)
+        assert(evo.get(e2, f1) == nil)
+        assert(evo.get(e1, f2) == nil)
+        assert(evo.get(e2, f2) == nil)
+        assert(evo.get(e1, f3) == nil)
+        assert(evo.get(e2, f3) == nil)
+        assert(evo.get(e1, f4) == nil)
+        assert(evo.get(e2, f4) == nil)
+    end
+end

develop/usbench.lua

@@ -0,0 +1,374 @@
+package.loaded['evolved'] = nil
+local evo = require 'evolved'
+
+local basics = require 'develop.basics'
+local tiny = require 'develop.3rdparty.tiny'
+
+local N = 1000
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Tiny Entity Cycle: %d entities', N),
+    function(world)
+        world:update(0.016)
+    end, function()
+        local world = tiny.world()
+
+        for i = 1, N do
+            world:addEntity({ a = i })
+        end
+
+        local A = tiny.processingSystem()
+        A.filter = tiny.requireAll('a')
+        A.process = function(_, e) world:addEntity({ b = e.a }) end
+        A.postProcess = function(_) world:refresh() end
+
+        local B = tiny.processingSystem()
+        B.filter = tiny.requireAll('b')
+        B.process = function(_, e) world:removeEntity(e) end
+        B.postProcess = function(_) world:refresh() end
+
+        world:addSystem(A)
+        world:addSystem(B)
+
+        world:refresh()
+
+        return world
+    end)
+
+basics.describe_bench(string.format('Evolved Entity Cycle (Defer): %d entities', N),
+    function(a, b, A, B)
+        evo.defer()
+        do
+            for chunk, entities in evo.execute(A) do
+                local as = evo.select(chunk, a)
+                for i = 1, #entities do
+                    evo.set(evo.id(), b, as[i])
+                end
+            end
+        end
+        evo.commit()
+
+        evo.batch_destroy(B)
+    end, function()
+        local a, b = evo.id(2)
+
+        for i = 1, N do
+            evo.entity():set(a, i):build()
+        end
+
+        local A = evo.query():include(a):build()
+        local B = evo.query():include(b):build()
+
+        return a, b, A, B
+    end, function(_, _, A, _)
+        evo.batch_destroy(A)
+    end)
+
+basics.describe_bench(string.format('Evolved Entity Cycle (Manual): %d entities', N),
+    function(a, b, A, B)
+        local to_create = {}
+
+        for chunk, entities in evo.execute(A) do
+            local as = evo.select(chunk, a)
+            for i = 1, #entities do
+                to_create[#to_create + 1] = as[i]
+            end
+        end
+
+        for i = 1, #to_create do
+            local e = evo.id()
+            evo.set(e, b, to_create[i])
+        end
+
+        evo.batch_destroy(B)
+    end, function()
+        local a, b = evo.id(2)
+
+        for i = 1, N do
+            evo.entity():set(a, i):build()
+        end
+
+        local A = evo.query():include(a):build()
+        local B = evo.query():include(b):build()
+
+        return a, b, A, B
+    end, function(_, _, A, _)
+        evo.batch_destroy(A)
+    end)
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Tiny Simple Iteration: %d entities', N),
+    function(world)
+        world:update(0.016)
+    end, function()
+        local world = tiny.world()
+
+        for i = 1, N do
+            world:addEntity({ a = i, b = i })
+            world:addEntity({ a = i, b = i, c = i })
+            world:addEntity({ a = i, b = i, c = i, d = i })
+            world:addEntity({ a = i, b = i, c = i, e = i })
+        end
+
+        local AB = tiny.processingSystem()
+        AB.filter = tiny.requireAll('a', 'b')
+        AB.process = function(_, e) e.a, e.b = e.b, e.a end
+
+        local CD = tiny.processingSystem()
+        CD.filter = tiny.requireAll('c', 'd')
+        CD.process = function(_, e) e.c, e.d = e.d, e.c end
+
+        local CE = tiny.processingSystem()
+        CE.filter = tiny.requireAll('c', 'e')
+        CE.process = function(_, e) e.c, e.e = e.e, e.c end
+
+        world:addSystem(AB)
+        world:addSystem(CD)
+        world:addSystem(CE)
+
+        world:refresh()
+
+        return world
+    end)
+
+basics.describe_bench(string.format('Evolved Simple Iteration: %d entities', N),
+    ---@param a evolved.entity
+    ---@param b evolved.entity
+    ---@param c evolved.entity
+    ---@param d evolved.entity
+    ---@param e evolved.entity
+    ---@param AB evolved.query
+    ---@param CD evolved.query
+    ---@param CE evolved.query
+    function(a, b, c, d, e, AB, CD, CE)
+        for chunk, entities in evo.execute(AB) do
+            local as, bs = evo.select(chunk, a, b)
+            for i = 1, #entities do
+                as[i], bs[i] = bs[i], as[i]
+            end
+        end
+
+        for chunk, entities in evo.execute(CD) do
+            local cs, ds = evo.select(chunk, c, d)
+            for i = 1, #entities do
+                cs[i], ds[i] = ds[i], cs[i]
+            end
+        end
+
+        for chunk, entities in evo.execute(CE) do
+            local cs, es = evo.select(chunk, c, e)
+            for i = 1, #entities do
+                cs[i], es[i] = es[i], cs[i]
+            end
+        end
+    end, function()
+        local a, b, c, d, e = evo.id(5)
+
+        for i = 1, N do
+            evo.entity():set(a, i):set(b, i):build()
+            evo.entity():set(a, i):set(b, i):set(c, i):build()
+            evo.entity():set(a, i):set(b, i):set(c, i):set(d, i):build()
+            evo.entity():set(a, i):set(b, i):set(c, i):set(e, i):build()
+        end
+
+        local AB = evo.query():include(a, b):build()
+        local CD = evo.query():include(c, d):build()
+        local CE = evo.query():include(c, e):build()
+
+        return a, b, c, d, e, AB, CD, CE
+    end, function(_, _, _, _, _, AB, CD, CE)
+        evo.batch_destroy(AB)
+        evo.batch_destroy(CD)
+        evo.batch_destroy(CE)
+    end)
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Tiny Packed Iteration: %d entities', N),
+    function(world)
+        world:update(0.016)
+    end, function()
+        local world = tiny.world()
+
+        for i = 1, N do
+            world:addEntity({ a = i, b = i, c = i, d = i, e = i })
+        end
+
+        local A = tiny.processingSystem()
+        A.filter = tiny.requireAll('a')
+        A.process = function(_, e) e.a = e.a * 2 end
+
+        local B = tiny.processingSystem()
+        B.filter = tiny.requireAll('b')
+        B.process = function(_, e) e.b = e.b * 2 end
+
+        local C = tiny.processingSystem()
+        C.filter = tiny.requireAll('c')
+        C.process = function(_, e) e.c = e.c * 2 end
+
+        local D = tiny.processingSystem()
+        D.filter = tiny.requireAll('d')
+        D.process = function(_, e) e.d = e.d * 2 end
+
+        local E = tiny.processingSystem()
+        E.filter = tiny.requireAll('e')
+        E.process = function(_, e) e.e = e.e * 2 end
+
+        world:addSystem(A)
+        world:addSystem(B)
+        world:addSystem(C)
+        world:addSystem(D)
+        world:addSystem(E)
+
+        world:refresh()
+
+        return world
+    end)
+
+basics.describe_bench(string.format('Evolved Packed Iteration: %d entities', N),
+    ---@param a evolved.entity
+    ---@param b evolved.entity
+    ---@param c evolved.entity
+    ---@param d evolved.entity
+    ---@param e evolved.entity
+    ---@param A evolved.query
+    ---@param B evolved.query
+    ---@param C evolved.query
+    ---@param D evolved.query
+    ---@param E evolved.query
+    function(a, b, c, d, e, A, B, C, D, E)
+        for chunk, entities in evo.execute(A) do
+            local as = evo.select(chunk, a)
+            for i = 1, #entities do
+                as[i] = as[i] * 2
+            end
+        end
+
+        for chunk, entities in evo.execute(B) do
+            local bs = evo.select(chunk, b)
+            for i = 1, #entities do
+                bs[i] = bs[i] * 2
+            end
+        end
+
+        for chunk, entities in evo.execute(C) do
+            local cs = evo.select(chunk, c)
+            for i = 1, #entities do
+                cs[i] = cs[i] * 2
+            end
+        end
+
+        for chunk, entities in evo.execute(D) do
+            local ds = evo.select(chunk, d)
+            for i = 1, #entities do
+                ds[i] = ds[i] * 2
+            end
+        end
+
+        for chunk, entities in evo.execute(E) do
+            local es = evo.select(chunk, e)
+            for i = 1, #entities do
+                es[i] = es[i] * 2
+            end
+        end
+    end, function()
+        local a, b, c, d, e = evo.id(5)
+
+        for i = 1, N do
+            evo.entity():set(a, i):set(b, i):set(c, i):set(d, i):set(e, i):build()
+        end
+
+        local A = evo.query():include(a):build()
+        local B = evo.query():include(b):build()
+        local C = evo.query():include(c):build()
+        local D = evo.query():include(d):build()
+        local E = evo.query():include(e):build()
+
+        return a, b, c, d, e, A, B, C, D, E
+    end, function(_, _, _, _, _, A, _, _, _, _)
+        evo.batch_destroy(A)
+    end)
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Tiny Fragmented Iteration: %d entities', N),
+    function(world)
+        world:update(0.016)
+    end, function()
+        local world = tiny.world()
+
+        ---@type string[]
+        local chars = {}
+
+        for i = 1, 26 do
+            chars[i] = string.char(string.byte('a') + i - 1)
+        end
+
+        for _, char in ipairs(chars) do
+            for i = 1, N do
+                world:addEntity({ [char] = i, data = i })
+            end
+        end
+
+        local Data = tiny.processingSystem()
+        Data.filter = tiny.requireAll('data')
+        Data.process = function(_, e) e.data = e.data * 2 end
+
+        local Last = tiny.processingSystem()
+        Last.filter = tiny.requireAll('z')
+        Last.process = function(_, e) e.z = e.z * 2 end
+
+        world:addSystem(Data)
+        world:addSystem(Last)
+
+        world:refresh()
+
+        return world
+    end)
+
+basics.describe_bench(string.format('Evolved Fragmented Iteration: %d entities', N),
+    ---@param data evolved.entity
+    ---@param last evolved.entity
+    ---@param Data evolved.query
+    ---@param Last evolved.query
+    function(data, last, Data, Last)
+        for chunk, entities in evo.execute(Data) do
+            local ds = evo.select(chunk, data)
+            for i = 1, #entities do
+                ds[i] = ds[i] * 2
+            end
+        end
+
+        for chunk, entities in evo.execute(Last) do
+            local ls = evo.select(chunk, last)
+            for i = 1, #entities do
+                ls[i] = ls[i] * 2
+            end
+        end
+    end, function()
+        local data = evo.id()
+
+        ---@type evolved.fragment[]
+        local chars = {}
+
+        for i = 1, 26 do
+            chars[i] = evo.id()
+        end
+
+        for _, char in ipairs(chars) do
+            for i = 1, N do
+                evo.entity():set(char, i):set(data, i):build()
+            end
+        end
+
+        local Data = evo.query():include(data):build()
+        local Last = evo.query():include(chars[#chars]):build()
+
+        return data, chars[#chars], Data, Last
+    end, function(_, _, Data, _)
+        evo.batch_destroy(Data)
+    end)
+
+print '----------------------------------------'