BlackMATov/evolved.lua
1
0
Fork 0
mirror of https://github.com/BlackMATov/evolved.lua.git synced 2026-01-04 17:20:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

little tweaks

Browse Source
This commit is contained in:
BlackMATov
2024-12-04 01:05:04 +07:00
parent c745063e0d
commit b6643584f0
1 changed files with 102 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
evolved/registry.lua
View File

@@ -64,29 +64,33 @@ evolved_chunk_mt.__index = evolved_chunk_mt
---@param entity evolved.entity ---@param entity evolved.entity
local function __detach_entity(entity) local function __detach_entity(entity)
local chunk = assert(entity.__chunk) local chunk = assert(entity.__chunk)
local chunk_entities = chunk.__entities
local chunk_entity_count = #chunk_entities
local index_in_chunk = entity.__index_in_chunk local index_in_chunk = entity.__index_in_chunk
__structural_changes = __structural_changes + 1 if index_in_chunk == chunk_entity_count then
chunk_entities[index_in_chunk] = nil
if index_in_chunk == #chunk.__entities then
chunk.__entities[index_in_chunk] = nil
for _, cs in pairs(chunk.__components) do for _, cs in pairs(chunk.__components) do
cs[index_in_chunk] = nil cs[index_in_chunk] = nil
end end
else else
chunk.__entities[index_in_chunk] = chunk.__entities[#chunk.__entities] chunk_entities[index_in_chunk] = chunk_entities[chunk_entity_count]
chunk.__entities[index_in_chunk].__index_in_chunk = index_in_chunk chunk_entities[index_in_chunk].__index_in_chunk = index_in_chunk
chunk.__entities[#chunk.__entities] = nil chunk_entities[chunk_entity_count] = nil
for _, cs in pairs(chunk.__components) do for _, cs in pairs(chunk.__components) do
cs[index_in_chunk] = cs[#cs] cs[index_in_chunk] = cs[chunk_entity_count]
cs[#cs] = nil cs[chunk_entity_count] = nil
end end
end end
entity.__chunk = nil entity.__chunk = nil
entity.__index_in_chunk = 0 entity.__index_in_chunk = 0
__structural_changes = __structural_changes + 1
end end
---@param chunk evolved.chunk ---@param chunk evolved.chunk
@@ -191,9 +195,9 @@ local function __root_chunk(fragment)
local fragment_chunks = __chunks[fragment] or {} local fragment_chunks = __chunks[fragment] or {}
fragment_chunks[#fragment_chunks + 1] = root_chunk fragment_chunks[#fragment_chunks + 1] = root_chunk
__chunks[fragment] = fragment_chunks __chunks[fragment] = fragment_chunks
__structural_changes = __structural_changes + 1
end end
__structural_changes = __structural_changes + 1
return root_chunk return root_chunk
end end
@@ -261,9 +265,9 @@ local function __chunk_with_fragment(chunk, fragment)
local fragment_chunks = __chunks[fragment] or {} local fragment_chunks = __chunks[fragment] or {}
fragment_chunks[#fragment_chunks + 1] = child_chunk fragment_chunks[#fragment_chunks + 1] = child_chunk
__chunks[fragment] = fragment_chunks __chunks[fragment] = fragment_chunks
__structural_changes = __structural_changes + 1
end end
__structural_changes = __structural_changes + 1
return child_chunk return child_chunk
end end
@@ -382,34 +386,39 @@ local function __batch_insert(chunks, fragment, component)
local new_chunk = __chunk_with_fragment(old_chunk, fragment) local new_chunk = __chunk_with_fragment(old_chunk, fragment)
assert(old_chunk ~= new_chunk) assert(old_chunk ~= new_chunk)
local old_entities = old_chunk.__entities local old_chunk_entities = old_chunk.__entities
local old_entity_count = #old_entities local old_chunk_entity_count = #old_chunk_entities
inserted_count = inserted_count + old_entity_count local old_chunk_components = old_chunk.__components
inserted_count = inserted_count + old_chunk_entity_count
if new_chunk ~= nil then if new_chunk ~= nil then
for old_index_in_chunk = 1, old_entity_count do local new_chunk_entities = new_chunk.__entities
local entity = old_entities[old_index_in_chunk] local new_chunk_components = new_chunk.__components
local new_index_in_chunk = #new_chunk.__entities + 1
new_chunk.__entities[new_index_in_chunk] = entity for old_index_in_chunk = 1, old_chunk_entity_count do
new_chunk.__components[fragment][new_index_in_chunk] = component local entity = old_chunk_entities[old_index_in_chunk]
local new_index_in_chunk = #new_chunk_entities + 1
new_chunk_entities[new_index_in_chunk] = entity
new_chunk_components[fragment][new_index_in_chunk] = component
entity.__chunk = new_chunk entity.__chunk = new_chunk
entity.__index_in_chunk = new_index_in_chunk entity.__index_in_chunk = new_index_in_chunk
end end
for old_f, old_cs in pairs(old_chunk.__components) do for old_f, old_cs in pairs(old_chunk_components) do
local new_cs = new_chunk.__components[old_f] local new_cs = new_chunk_components[old_f]
if #new_cs == 0 then if #new_cs == 0 then
new_chunk.__components[old_f] = old_cs new_chunk_components[old_f] = old_cs
else else
compat.move(old_cs, 1, #old_cs, #new_cs + 1, new_cs) compat.move(old_cs, 1, #old_cs, #new_cs + 1, new_cs)
end end
end end
else else
for old_index_in_chunk = 1, old_entity_count do for old_index_in_chunk = 1, old_chunk_entity_count do
local entity = old_entities[old_index_in_chunk] local entity = old_chunk_entities[old_index_in_chunk]
entity.__chunk = nil entity.__chunk = nil
entity.__index_in_chunk = 0 entity.__index_in_chunk = 0
end end
@@ -417,8 +426,8 @@ local function __batch_insert(chunks, fragment, component)
old_chunk.__entities = {} old_chunk.__entities = {}
for old_f, _ in pairs(old_chunk.__components) do for old_f, _ in pairs(old_chunk_components) do
old_chunk.__components[old_f] = {} old_chunk_components[old_f] = {}
end end
end end
@@ -437,33 +446,38 @@ local function __batch_remove(chunks, ...)
local new_chunk = __chunk_without_fragments(old_chunk, ...) local new_chunk = __chunk_without_fragments(old_chunk, ...)
assert(old_chunk ~= new_chunk) assert(old_chunk ~= new_chunk)
local old_entities = old_chunk.__entities local old_chunk_entities = old_chunk.__entities
local old_entity_count = #old_entities local old_chunk_entity_count = #old_chunk_entities
removed_count = removed_count + old_entity_count local old_chunk_components = old_chunk.__components
removed_count = removed_count + old_chunk_entity_count
if new_chunk ~= nil then if new_chunk ~= nil then
for old_index_in_chunk = 1, old_entity_count do local new_chunk_entities = new_chunk.__entities
local entity = old_entities[old_index_in_chunk] local new_chunk_components = new_chunk.__components
local new_index_in_chunk = #new_chunk.__entities + 1
new_chunk.__entities[new_index_in_chunk] = entity for old_index_in_chunk = 1, old_chunk_entity_count do
local entity = old_chunk_entities[old_index_in_chunk]
local new_index_in_chunk = #new_chunk_entities + 1
new_chunk_entities[new_index_in_chunk] = entity
entity.__chunk = new_chunk entity.__chunk = new_chunk
entity.__index_in_chunk = new_index_in_chunk entity.__index_in_chunk = new_index_in_chunk
end end
for new_f, new_cs in pairs(new_chunk.__components) do for new_f, new_cs in pairs(new_chunk_components) do
local old_cs = old_chunk.__components[new_f] local old_cs = old_chunk_components[new_f]
if #new_cs == 0 then if #new_cs == 0 then
new_chunk.__components[new_f] = old_cs new_chunk_components[new_f] = old_cs
else else
compat.move(old_cs, 1, #old_cs, #new_cs + 1, new_cs) compat.move(old_cs, 1, #old_cs, #new_cs + 1, new_cs)
end end
end end
else else
for old_index_in_chunk = 1, old_entity_count do for old_index_in_chunk = 1, old_chunk_entity_count do
local entity = old_entities[old_index_in_chunk] local entity = old_chunk_entities[old_index_in_chunk]
entity.__chunk = nil entity.__chunk = nil
entity.__index_in_chunk = 0 entity.__index_in_chunk = 0
end end
@@ -471,8 +485,8 @@ local function __batch_remove(chunks, ...)
old_chunk.__entities = {} old_chunk.__entities = {}
for old_f, _ in pairs(old_chunk.__components) do for old_f, _ in pairs(old_chunk_components) do
old_chunk.__components[old_f] = {} old_chunk_components[old_f] = {}
end end
end end
@@ -487,21 +501,23 @@ local function __batch_detach(chunks)
local detached_count = 0 local detached_count = 0
for _, old_chunk in ipairs(chunks) do for _, old_chunk in ipairs(chunks) do
local old_entities = old_chunk.__entities local old_chunk_entities = old_chunk.__entities
local old_entity_count = #old_entities local old_chunk_entity_count = #old_chunk_entities
detached_count = detached_count + old_entity_count local old_chunk_components = old_chunk.__components
for old_index_in_chunk = 1, old_entity_count do detached_count = detached_count + old_chunk_entity_count
local entity = old_entities[old_index_in_chunk]
for old_index_in_chunk = 1, old_chunk_entity_count do
local entity = old_chunk_entities[old_index_in_chunk]
entity.__chunk = nil entity.__chunk = nil
entity.__index_in_chunk = 0 entity.__index_in_chunk = 0
end end
old_chunk.__entities = {} old_chunk.__entities = {}
for old_f, _ in pairs(old_chunk.__components) do for old_f, _ in pairs(old_chunk_components) do
old_chunk.__components[old_f] = {} old_chunk_components[old_f] = {}
end end
end end
@@ -516,13 +532,15 @@ local function __batch_destroy(chunks)
local destroyed_count = 0 local destroyed_count = 0
for _, old_chunk in ipairs(chunks) do for _, old_chunk in ipairs(chunks) do
local old_entities = old_chunk.__entities local old_chunk_entities = old_chunk.__entities
local old_entity_count = #old_entities local old_chunk_entity_count = #old_chunk_entities
destroyed_count = destroyed_count + old_entity_count local old_chunk_components = old_chunk.__components
for old_index_in_chunk = 1, old_entity_count do destroyed_count = destroyed_count + old_chunk_entity_count
local entity = old_entities[old_index_in_chunk]
for old_index_in_chunk = 1, old_chunk_entity_count do
local entity = old_chunk_entities[old_index_in_chunk]
entity.__chunk = nil entity.__chunk = nil
entity.__index_in_chunk = 0 entity.__index_in_chunk = 0
idpools.release(__guids, entity.__guid) idpools.release(__guids, entity.__guid)
@@ -530,8 +548,8 @@ local function __batch_destroy(chunks)
old_chunk.__entities = {} old_chunk.__entities = {}
for old_f, _ in pairs(old_chunk.__components) do for old_f, _ in pairs(old_chunk_components) do
old_chunk.__components[old_f] = {} old_chunk_components[old_f] = {}
end end
end end
@@ -672,17 +690,19 @@ function registry.set(entity, fragment, component)
end end
if new_chunk ~= nil then if new_chunk ~= nil then
local new_chunk_entities = new_chunk.__entities
local new_chunk_components = new_chunk.__components
local old_index_in_chunk = entity.__index_in_chunk local old_index_in_chunk = entity.__index_in_chunk
local new_index_in_chunk = #new_chunk.__entities + 1 local new_index_in_chunk = #new_chunk_entities + 1
__structural_changes = __structural_changes + 1 new_chunk_entities[new_index_in_chunk] = entity
new_chunk_components[fragment][new_index_in_chunk] = component
new_chunk.__entities[new_index_in_chunk] = entity
new_chunk.__components[fragment][new_index_in_chunk] = component
if old_chunk ~= nil then if old_chunk ~= nil then
for old_f, old_cs in pairs(old_chunk.__components) do local old_chunk_components = old_chunk.__components
local new_cs = new_chunk.__components[old_f] for old_f, old_cs in pairs(old_chunk_components) do
local new_cs = new_chunk_components[old_f]
new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk] new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk]
end end
__detach_entity(entity) __detach_entity(entity)
@@ -690,6 +710,8 @@ function registry.set(entity, fragment, component)
entity.__chunk = new_chunk entity.__chunk = new_chunk
entity.__index_in_chunk = new_index_in_chunk entity.__index_in_chunk = new_index_in_chunk
__structural_changes = __structural_changes + 1
else else
__detach_entity(entity) __detach_entity(entity)
end end
@@ -898,17 +920,19 @@ function registry.insert(entity, fragment, component)
end end
if new_chunk ~= nil then if new_chunk ~= nil then
local new_chunk_entities = new_chunk.__entities
local new_chunk_components = new_chunk.__components
local old_index_in_chunk = entity.__index_in_chunk local old_index_in_chunk = entity.__index_in_chunk
local new_index_in_chunk = #new_chunk.__entities + 1 local new_index_in_chunk = #new_chunk.__entities + 1
__structural_changes = __structural_changes + 1 new_chunk_entities[new_index_in_chunk] = entity
new_chunk_components[fragment][new_index_in_chunk] = component
new_chunk.__entities[new_index_in_chunk] = entity
new_chunk.__components[fragment][new_index_in_chunk] = component
if old_chunk ~= nil then if old_chunk ~= nil then
for old_f, old_cs in pairs(old_chunk.__components) do local old_chunk_components = old_chunk.__components
local new_cs = new_chunk.__components[old_f] for old_f, old_cs in pairs(old_chunk_components) do
local new_cs = new_chunk_components[old_f]
new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk] new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk]
end end
__detach_entity(entity) __detach_entity(entity)
@@ -916,6 +940,8 @@ function registry.insert(entity, fragment, component)
entity.__chunk = new_chunk entity.__chunk = new_chunk
entity.__index_in_chunk = new_index_in_chunk entity.__index_in_chunk = new_index_in_chunk
__structural_changes = __structural_changes + 1
else else
__detach_entity(entity) __detach_entity(entity)
end end
@@ -960,16 +986,18 @@ function registry.remove(entity, ...)
end end
if new_chunk ~= nil then if new_chunk ~= nil then
local new_chunk_entities = new_chunk.__entities
local new_chunk_components = new_chunk.__components
local old_index_in_chunk = entity.__index_in_chunk local old_index_in_chunk = entity.__index_in_chunk
local new_index_in_chunk = #new_chunk.__entities + 1 local new_index_in_chunk = #new_chunk.__entities + 1
__structural_changes = __structural_changes + 1 new_chunk_entities[new_index_in_chunk] = entity
new_chunk.__entities[new_index_in_chunk] = entity
if old_chunk ~= nil then if old_chunk ~= nil then
for new_f, new_cs in pairs(new_chunk.__components) do local old_chunk_components = old_chunk.__components
local old_cs = old_chunk.__components[new_f] for new_f, new_cs in pairs(new_chunk_components) do
local old_cs = old_chunk_components[new_f]
new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk] new_cs[new_index_in_chunk] = old_cs[old_index_in_chunk]
end end
__detach_entity(entity) __detach_entity(entity)
@@ -977,6 +1005,8 @@ function registry.remove(entity, ...)
entity.__chunk = new_chunk entity.__chunk = new_chunk
entity.__index_in_chunk = new_index_in_chunk entity.__index_in_chunk = new_index_in_chunk
__structural_changes = __structural_changes + 1
else else
__detach_entity(entity) __detach_entity(entity)
end end