Skip to content

Commit b2c3672

Browse files
committed
remove legacy spawn_at / spawn_as
1 parent 72979b4 commit b2c3672

9 files changed

Lines changed: 725 additions & 2338 deletions

File tree

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
```
3030
TAG :: fragment
3131
NAME :: fragment
32+
3233
DEFAULT :: fragment
3334
DUPLICATE :: fragment
3435
@@ -98,8 +99,8 @@ process :: system... -> ()
9899
spawn :: <fragment, component>? -> entity
99100
clone :: entity -> <fragment, component>? -> entity
100101
101-
spawn_at :: chunk?, fragment[]?, component[]? -> entity
102-
spawn_as :: entity?, fragment[]?, component[]? -> entity
102+
spawn_single :: component, <fragment, component>? -> entity
103+
clone_single :: entity -> component -> <fragment, component>? -> entity
103104
104105
debug_mode :: boolean -> ()
105106
collect_garbage :: ()
@@ -140,9 +141,6 @@ builder:clear :: builder
140141
builder:tag :: builder
141142
builder:name :: string -> builder
142143
143-
builder:prefab :: entity -> builder
144-
builder:single :: component -> builder
145-
146144
builder:default :: component -> builder
147145
builder:duplicate :: {component -> component} -> builder
148146
@@ -166,7 +164,11 @@ builder:disabled :: builder
166164
167165
builder:destroy_policy :: id -> builder
168166
169-
builder:build :: boolean -> entity
167+
builder:spawn :: entity
168+
builder:clone :: entity -> entity
169+
170+
builder:spawn_single :: component -> entity
171+
builder:clone_single :: entity -> component -> entity
170172
```
171173

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

develop/all.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ require 'develop.usbench'
55

66
local basics = require 'develop.basics'
77

8+
print '----------------------------------------'
89
basics.describe_fuzz 'develop.fuzzing.destroy_fuzz'
10+
print '----------------------------------------'
911
basics.describe_fuzz 'develop.fuzzing.batch_destroy_fuzz'

develop/example.lua

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ local function vector2(x, y)
1818
end
1919

2020
local groups = {
21-
awake = evo.builder():build(),
22-
physics = evo.builder():build(),
23-
graphics = evo.builder():build(),
24-
shutdown = evo.builder():build(),
21+
awake = evo.spawn(),
22+
physics = evo.spawn(),
23+
graphics = evo.spawn(),
24+
shutdown = evo.spawn(),
2525
}
2626

2727
local singles = {
28-
delta_time = evo.builder():single(0.016):build(),
29-
physics_gravity = evo.builder():single(vector2(0, 9.81)):build(),
28+
delta_time = evo.spawn_single(0.016),
29+
physics_gravity = evo.spawn_single(vector2(0, 9.81)),
3030
}
3131

3232
local fragments = {
33-
force = evo.builder():build(),
34-
position = evo.builder():build(),
35-
velocity = evo.builder():build(),
33+
force = evo.spawn(),
34+
position = evo.spawn(),
35+
velocity = evo.spawn(),
3636
}
3737

3838
local queries = {
3939
physics_bodies = evo.builder()
4040
:include(fragments.force, fragments.position, fragments.velocity)
41-
:build(),
41+
:spawn(),
4242
}
4343

4444
local awake_system = evo.builder()
@@ -49,8 +49,8 @@ local awake_system = evo.builder()
4949
:set(fragments.force, vector2(0, 0))
5050
:set(fragments.position, vector2(0, 0))
5151
:set(fragments.velocity, vector2(0, 0))
52-
:build()
53-
end):build()
52+
:spawn()
53+
end):spawn()
5454

5555
local integrate_forces_system = evo.builder()
5656
:group(groups.physics)
@@ -71,7 +71,7 @@ local integrate_forces_system = evo.builder()
7171
velocity.x = velocity.x + (physics_gravity.x + force.x) * delta_time
7272
velocity.y = velocity.y + (physics_gravity.y + force.y) * delta_time
7373
end
74-
end):build()
74+
end):spawn()
7575

7676
local integrate_velocities_system = evo.builder()
7777
:group(groups.physics)
@@ -94,7 +94,7 @@ local integrate_velocities_system = evo.builder()
9494
force.x = 0
9595
force.y = 0
9696
end
97-
end):build()
97+
end):spawn()
9898

9999
local graphics_system = evo.builder()
100100
:group(groups.graphics)
@@ -111,14 +111,14 @@ local graphics_system = evo.builder()
111111
'|-> {entity %d} at {%.4f, %.4f}',
112112
entity, position.x, position.y))
113113
end
114-
end):build()
114+
end):spawn()
115115

116116
local shutdown_system = evo.builder()
117117
:group(groups.shutdown)
118118
:epilogue(function()
119119
print '-= | Shutdown | =-'
120120
evo.batch_destroy(queries.physics_bodies)
121-
end):build()
121+
end):spawn()
122122

123123
do
124124
evo.process(groups.awake)

develop/fuzzing/batch_destroy_fuzz.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ end
8181

8282
do
8383
local r = math.random(1, 2)
84-
local q = evo.builder():include(__table_unpack(destroying_include_list)):build()
84+
local q = evo.builder():include(__table_unpack(destroying_include_list)):spawn()
8585

8686
if r == 1 then
8787
evo.batch_destroy(q)
@@ -98,7 +98,7 @@ end
9898
---
9999
---
100100

101-
local all_chunk_query = evo.builder():build()
101+
local all_chunk_query = evo.spawn()
102102

103103
for chunk in evo.execute(all_chunk_query) do
104104
assert(not chunk:has_any(__table_unpack(should_be_destroyed_entity_list)))

develop/fuzzing/destroy_fuzz.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ end
102102
---
103103
---
104104

105-
local all_chunk_query = evo.builder():build()
105+
local all_chunk_query = evo.spawn()
106106

107107
for chunk in evo.execute(all_chunk_query) do
108108
assert(not chunk:has_any(__table_unpack(destroying_entity_list)))

0 commit comments

Comments
 (0)