Skip to content

Commit 3fb1467

Browse files
BlackMATovBlackMATov
committed
style fixes
1 parent 513bf21 commit 3fb1467

2 files changed

Lines changed: 115 additions & 132 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ unpack :: id -> integer, integer
6767
defer :: boolean
6868
commit :: boolean
6969
70+
spawn :: <fragment, component>? -> entity
71+
clone :: entity -> <fragment, component>? -> entity
72+
7073
is_alive :: entity -> boolean
7174
is_alive_all :: entity... -> boolean
7275
is_alive_any :: entity... -> boolean
@@ -96,9 +99,6 @@ execute :: query -> {execute_state? -> chunk?, entity[]?, integer?}, execute_sta
9699
97100
process :: system... -> ()
98101
99-
spawn :: <fragment, component>? -> entity
100-
clone :: entity -> <fragment, component>? -> entity
101-
102102
debug_mode :: boolean -> ()
103103
collect_garbage :: ()
104104
```
@@ -125,6 +125,9 @@ chunk:components :: fragment... -> component[]...
125125
```
126126
builder :: builder
127127
128+
builder:spawn :: entity
129+
builder:clone :: entity -> entity
130+
128131
builder:has :: fragment -> boolean
129132
builder:has_all :: fragment... -> boolean
130133
builder:has_any :: fragment... -> boolean
@@ -160,9 +163,6 @@ builder:epilogue :: {} -> builder
160163
builder:disabled :: builder
161164
162165
builder:destroy_policy :: id -> builder
163-
164-
builder:spawn :: entity
165-
builder:clone :: entity -> entity
166166
```
167167

168168
## [License (MIT)](./LICENSE.md)

‎evolved.lua‎

Lines changed: 109 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,9 @@ local __evolved_unpack
694694
local __evolved_defer
695695
local __evolved_commit
696696

697+
local __evolved_spawn
698+
local __evolved_clone
699+
697700
local __evolved_is_alive
698701
local __evolved_is_alive_all
699702
local __evolved_is_alive_any
@@ -723,9 +726,6 @@ local __evolved_execute
723726

724727
local __evolved_process
725728

726-
local __evolved_spawn
727-
local __evolved_clone
728-
729729
local __evolved_debug_mode
730730
local __evolved_collect_garbage
731731

@@ -3431,6 +3431,60 @@ function __evolved_commit()
34313431
return true
34323432
end
34333433

3434+
---@param components? table<evolved.fragment, evolved.component>
3435+
---@return evolved.entity
3436+
function __evolved_spawn(components)
3437+
if not components then
3438+
components = __safe_tbls.__EMPTY_COMPONENT_MAP
3439+
end
3440+
3441+
if __debug_mode then
3442+
__debug_fns.validate_component_map(components)
3443+
end
3444+
3445+
local entity = __acquire_id()
3446+
3447+
if __defer_depth > 0 then
3448+
__defer_spawn_entity(entity, components)
3449+
else
3450+
__evolved_defer()
3451+
do
3452+
__spawn_entity(entity, components)
3453+
end
3454+
__evolved_commit()
3455+
end
3456+
3457+
return entity
3458+
end
3459+
3460+
---@param prefab evolved.entity
3461+
---@param components? table<evolved.fragment, evolved.component>
3462+
---@return evolved.entity
3463+
function __evolved_clone(prefab, components)
3464+
if not components then
3465+
components = __safe_tbls.__EMPTY_COMPONENT_MAP
3466+
end
3467+
3468+
if __debug_mode then
3469+
__debug_fns.validate_prefab(prefab)
3470+
__debug_fns.validate_component_map(components)
3471+
end
3472+
3473+
local entity = __acquire_id()
3474+
3475+
if __defer_depth > 0 then
3476+
__defer_clone_entity(entity, prefab, components)
3477+
else
3478+
__evolved_defer()
3479+
do
3480+
__clone_entity(entity, prefab, components)
3481+
end
3482+
__evolved_commit()
3483+
end
3484+
3485+
return entity
3486+
end
3487+
34343488
---@param entity evolved.entity
34353489
---@return boolean
34363490
---@nodiscard
@@ -4218,12 +4272,6 @@ function __evolved_batch_destroy(...)
42184272
__evolved_commit()
42194273
end
42204274

4221-
---
4222-
---
4223-
---
4224-
---
4225-
---
4226-
42274275
---@param entity evolved.entity
42284276
---@return evolved.each_iterator iterator
42294277
---@return evolved.each_state? iterator_state
@@ -4341,72 +4389,6 @@ function __evolved_process(...)
43414389
end
43424390
end
43434391

4344-
---
4345-
---
4346-
---
4347-
---
4348-
---
4349-
4350-
---@param components? table<evolved.fragment, evolved.component>
4351-
---@return evolved.entity
4352-
function __evolved_spawn(components)
4353-
if not components then
4354-
components = __safe_tbls.__EMPTY_COMPONENT_MAP
4355-
end
4356-
4357-
if __debug_mode then
4358-
__debug_fns.validate_component_map(components)
4359-
end
4360-
4361-
local entity = __acquire_id()
4362-
4363-
if __defer_depth > 0 then
4364-
__defer_spawn_entity(entity, components)
4365-
else
4366-
__evolved_defer()
4367-
do
4368-
__spawn_entity(entity, components)
4369-
end
4370-
__evolved_commit()
4371-
end
4372-
4373-
return entity
4374-
end
4375-
4376-
---@param prefab evolved.entity
4377-
---@param components? table<evolved.fragment, evolved.component>
4378-
---@return evolved.entity
4379-
function __evolved_clone(prefab, components)
4380-
if not components then
4381-
components = __safe_tbls.__EMPTY_COMPONENT_MAP
4382-
end
4383-
4384-
if __debug_mode then
4385-
__debug_fns.validate_prefab(prefab)
4386-
__debug_fns.validate_component_map(components)
4387-
end
4388-
4389-
local entity = __acquire_id()
4390-
4391-
if __defer_depth > 0 then
4392-
__defer_clone_entity(entity, prefab, components)
4393-
else
4394-
__evolved_defer()
4395-
do
4396-
__clone_entity(entity, prefab, components)
4397-
end
4398-
__evolved_commit()
4399-
end
4400-
4401-
return entity
4402-
end
4403-
4404-
---
4405-
---
4406-
---
4407-
---
4408-
---
4409-
44104392
---@param yesno boolean
44114393
function __evolved_debug_mode(yesno)
44124394
__debug_mode = yesno
@@ -4617,6 +4599,54 @@ function __evolved_builder()
46174599
}, __debug_fns.builder_mt)
46184600
end
46194601

4602+
---@return evolved.entity
4603+
function __debug_fns.builder_mt:spawn()
4604+
local components = self.__components
4605+
4606+
if __debug_mode then
4607+
__debug_fns.validate_component_map(components)
4608+
end
4609+
4610+
local entity = __acquire_id()
4611+
4612+
if __defer_depth > 0 then
4613+
__defer_spawn_entity(entity, components)
4614+
else
4615+
__evolved_defer()
4616+
do
4617+
__spawn_entity(entity, components)
4618+
end
4619+
__evolved_commit()
4620+
end
4621+
4622+
return entity
4623+
end
4624+
4625+
---@param prefab evolved.entity
4626+
---@return evolved.entity
4627+
function __debug_fns.builder_mt:clone(prefab)
4628+
local components = self.__components
4629+
4630+
if __debug_mode then
4631+
__debug_fns.validate_prefab(prefab)
4632+
__debug_fns.validate_component_map(components)
4633+
end
4634+
4635+
local entity = __acquire_id()
4636+
4637+
if __defer_depth > 0 then
4638+
__defer_clone_entity(entity, prefab, components)
4639+
else
4640+
__evolved_defer()
4641+
do
4642+
__clone_entity(entity, prefab, components)
4643+
end
4644+
__evolved_commit()
4645+
end
4646+
4647+
return entity
4648+
end
4649+
46204650
---@param fragment evolved.fragment
46214651
---@return boolean
46224652
---@nodiscard
@@ -4958,54 +4988,6 @@ function __debug_fns.builder_mt:destroy_policy(destroy_policy)
49584988
return self:set(__DESTROY_POLICY, destroy_policy)
49594989
end
49604990

4961-
---@return evolved.entity
4962-
function __debug_fns.builder_mt:spawn()
4963-
local components = self.__components
4964-
4965-
if __debug_mode then
4966-
__debug_fns.validate_component_map(components)
4967-
end
4968-
4969-
local entity = __acquire_id()
4970-
4971-
if __defer_depth > 0 then
4972-
__defer_spawn_entity(entity, components)
4973-
else
4974-
__evolved_defer()
4975-
do
4976-
__spawn_entity(entity, components)
4977-
end
4978-
__evolved_commit()
4979-
end
4980-
4981-
return entity
4982-
end
4983-
4984-
---@param prefab evolved.entity
4985-
---@return evolved.entity
4986-
function __debug_fns.builder_mt:clone(prefab)
4987-
local components = self.__components
4988-
4989-
if __debug_mode then
4990-
__debug_fns.validate_prefab(prefab)
4991-
__debug_fns.validate_component_map(components)
4992-
end
4993-
4994-
local entity = __acquire_id()
4995-
4996-
if __defer_depth > 0 then
4997-
__defer_clone_entity(entity, prefab, components)
4998-
else
4999-
__evolved_defer()
5000-
do
5001-
__clone_entity(entity, prefab, components)
5002-
end
5003-
__evolved_commit()
5004-
end
5005-
5006-
return entity
5007-
end
5008-
50094991
---
50104992
---
50114993
---
@@ -5313,6 +5295,7 @@ end)
53135295

53145296
evolved.TAG = __TAG
53155297
evolved.NAME = __NAME
5298+
53165299
evolved.DEFAULT = __DEFAULT
53175300
evolved.DUPLICATE = __DUPLICATE
53185301

@@ -5346,6 +5329,9 @@ evolved.unpack = __evolved_unpack
53465329
evolved.defer = __evolved_defer
53475330
evolved.commit = __evolved_commit
53485331

5332+
evolved.spawn = __evolved_spawn
5333+
evolved.clone = __evolved_clone
5334+
53495335
evolved.is_alive = __evolved_is_alive
53505336
evolved.is_alive_all = __evolved_is_alive_all
53515337
evolved.is_alive_any = __evolved_is_alive_any
@@ -5375,9 +5361,6 @@ evolved.execute = __evolved_execute
53755361

53765362
evolved.process = __evolved_process
53775363

5378-
evolved.spawn = __evolved_spawn
5379-
evolved.clone = __evolved_clone
5380-
53815364
evolved.debug_mode = __evolved_debug_mode
53825365
evolved.collect_garbage = __evolved_collect_garbage
53835366

0 commit comments

Comments
 (0)