BlackMATov/evolved.lua
1
0
Fork 0
mirror of https://github.com/BlackMATov/evolved.lua.git synced 2025-12-13 03:29:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

ON_REMOVE hooks are now invoked before the fragment is actually removed from the entity

Browse Source 
issue: https://github.com/BlackMATov/evolved.lua/issues/26
This commit is contained in:
BlackMATov
2025-10-12 06:29:26 +07:00
parent 24933e6a04
commit d298be4188
4 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -1304,6 +1304,7 @@ builder_mt:destruction_policy :: id -> builder
- Improved query execution performance by caching some internal calculations
- Added the universal [`builder.build`](#evolvedbuilder_mtbuild) and [`builder.multi_build`](#evolvedbuilder_mtmulti_build) methods that can be used to spawn or clone entities depending on the method arguments
- [`evolved.ON_REMOVE`](#evolvedon_remove) hooks are now invoked before the fragment is actually removed from the entity
### v1.3.0

1
ROADMAP.md
View File

@@ -14,3 +14,4 @@
## Known Issues
- Required fragments are slower than they should be
- Errors in hooks are cannot be handled properly right now

9
develop/untests.lua
View File

@@ -2530,7 +2530,7 @@ do
end)
:on_remove(function(e, f, c)
f2_remove_count = f2_remove_count + 1
assert(evo.get(e, f) == nil)
assert(evo.get(e, f) == c)
assert(evo.alive(f))
assert(c == 82)
end)
@@ -3321,7 +3321,7 @@ do
remove_count = remove_count + 1
assert(f == f1)
assert(c == 51)
assert(evo.get(e, f1) == nil)
assert(evo.get(e, f1) == c)
do
evo.remove(e, f2)
@@ -3348,7 +3348,7 @@ do
remove_count = remove_count + 1
assert(f == f2)
assert(c == 51)
assert(evo.get(e, f2) == nil)
assert(evo.get(e, f2) == c)
end)
end
@@ -3518,8 +3518,7 @@ do
assert(e == e1 or e == e2)
assert(f == f1)
assert(c == 51)
assert(evo.get(e1, f1) == nil)
assert(evo.get(e2, f1) == nil)
assert(evo.get(e, f) == c)
end)
do

58
evolved.lua
View File

@@ -1347,7 +1347,11 @@ end
---@param major evolved.fragment
function __update_major_chunks(major)
__trace_major_chunks(major, __update_major_chunks_trace)
if __defer_depth > 0 then
__defer_call_hook(__update_major_chunks, major)
else
__trace_major_chunks(major, __update_major_chunks_trace)
end
end
---@param chunk evolved.chunk
@@ -2157,19 +2161,19 @@ function __spawn_entity(chunk, entity, components)
local new_component = component_storage[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment, new_component)
fragment_on_set(entity, fragment, new_component)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment, new_component)
fragment_on_insert(entity, fragment, new_component)
end
else
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment)
fragment_on_set(entity, fragment)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment)
fragment_on_insert(entity, fragment)
end
end
end
@@ -2368,11 +2372,11 @@ function __multi_spawn_entity(chunk, entity_list, entity_count, components)
local new_component = component_storage[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment, new_component)
fragment_on_set(entity, fragment, new_component)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment, new_component)
fragment_on_insert(entity, fragment, new_component)
end
end
else
@@ -2384,11 +2388,11 @@ function __multi_spawn_entity(chunk, entity_list, entity_count, components)
local entity = chunk_entity_list[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment)
fragment_on_set(entity, fragment)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment)
fragment_on_insert(entity, fragment)
end
end
else
@@ -2631,19 +2635,19 @@ function __clone_entity(prefab, entity, components)
local new_component = component_storage[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment, new_component)
fragment_on_set(entity, fragment, new_component)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment, new_component)
fragment_on_insert(entity, fragment, new_component)
end
else
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment)
fragment_on_set(entity, fragment)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment)
fragment_on_insert(entity, fragment)
end
end
end
@@ -2905,11 +2909,11 @@ function __multi_clone_entity(prefab, entity_list, entity_count, components)
local new_component = component_storage[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment, new_component)
fragment_on_set(entity, fragment, new_component)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment, new_component)
fragment_on_insert(entity, fragment, new_component)
end
end
else
@@ -2921,11 +2925,11 @@ function __multi_clone_entity(prefab, entity_list, entity_count, components)
local entity = chunk_entity_list[place]
if fragment_on_set then
__defer_call_hook(fragment_on_set, entity, fragment)
fragment_on_set(entity, fragment)
end
if fragment_on_insert then
__defer_call_hook(fragment_on_insert, entity, fragment)
fragment_on_insert(entity, fragment)
end
end
else
@@ -3064,9 +3068,9 @@ function __destroy_entity_list(entity_list, entity_count)
if component_index then
local component_storage = chunk_component_storages[component_index]
local old_component = component_storage[place]
__defer_call_hook(fragment_on_remove, entity, fragment, old_component)
fragment_on_remove(entity, fragment, old_component)
else
__defer_call_hook(fragment_on_remove, entity, fragment)
fragment_on_remove(entity, fragment)
end
end
end
@@ -3643,12 +3647,12 @@ function __chunk_remove(old_chunk, ...)
for old_place = 1, old_entity_count do
local entity = old_entity_list[old_place]
local old_component = old_component_storage[old_place]
__defer_call_hook(fragment_on_remove, entity, fragment, old_component)
fragment_on_remove(entity, fragment, old_component)
end
else
for old_place = 1, old_entity_count do
local entity = old_entity_list[old_place]
__defer_call_hook(fragment_on_remove, entity, fragment)
fragment_on_remove(entity, fragment)
end
end
end
@@ -3766,12 +3770,12 @@ function __chunk_clear(chunk)
for place = 1, chunk_entity_count do
local entity = chunk_entity_list[place]
local old_component = component_storage[place]
__defer_call_hook(fragment_on_remove, entity, fragment, old_component)
fragment_on_remove(entity, fragment, old_component)
end
else
for place = 1, chunk_entity_count do
local entity = chunk_entity_list[place]
__defer_call_hook(fragment_on_remove, entity, fragment)
fragment_on_remove(entity, fragment)
end
end
end
@@ -5511,9 +5515,9 @@ function __evolved_remove(entity, ...)
if old_component_index then
local old_component_storage = old_component_storages[old_component_index]
local old_component = old_component_storage[old_place]
__defer_call_hook(fragment_on_remove, entity, fragment, old_component)
fragment_on_remove(entity, fragment, old_component)
else
__defer_call_hook(fragment_on_remove, entity, fragment)
fragment_on_remove(entity, fragment)
end
end
end
@@ -5605,9 +5609,9 @@ function __evolved_clear(...)
if component_index then
local component_storage = chunk_component_storages[component_index]
local old_component = component_storage[place]
__defer_call_hook(fragment_on_remove, entity, fragment, old_component)
fragment_on_remove(entity, fragment, old_component)
else
__defer_call_hook(fragment_on_remove, entity, fragment)
fragment_on_remove(entity, fragment)
end
end
end