Merge branch 'dev'

README.md

@@ -36,6 +36,7 @@ ON_INSERT :: fragment
 ON_REMOVE :: fragment
 
 PHASE :: fragment
+GROUP :: fragment
 AFTER :: fragment
 
 QUERY :: fragment
@@ -148,6 +149,15 @@ query_builder:exclude :: fragment... -> query_builder
 query_builder:build :: query, boolean
 ```
 
+```
+group :: group_builder
+group_builder:name :: string -> group_builder
+group_builder:single :: component -> group_builder
+group_builder:phase :: phase -> group_builder
+group_builder:after :: group... -> group_builder
+group_builder:build :: group, boolean
+```
+
 ```
 phase :: phase_builder
 phase_builder:name :: string -> phase_builder
@@ -159,8 +169,7 @@ phase_builder:build :: phase, boolean
 system :: system_builder
 system_builder:name :: string -> system_builder
 system_builder:single :: component -> system_builder
-system_builder:phase :: phase -> system_builder
-system_builder:after :: system... -> system_builder
+system_builder:group :: group -> system_builder
 system_builder:query :: query -> system_builder
 system_builder:execute :: {chunk, entity[], integer} -> system_builder
 system_builder:prologue :: {} -> system_builder

ROADMAP.md

@@ -3,10 +3,13 @@
 ## Backlog
 
 - should set/assign/insert return a constructed component?
+- enable/disable systems and groups
+- should systems support multiple groups?
+- should groups support multiple phases?
 
 ## After first release
 
-- add system groups
+- cached queries
 - observers and events
 - add INDEX fragment trait
 - add REQUIRES fragment trait

develop/all.lua

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

develop/example.lua

@@ -22,6 +22,13 @@ local phases = {
     shutdown = evo.phase():build(),
 }
 
+local groups = {
+    awake = evo.group():phase(phases.awake):build(),
+    physics = evo.group():phase(phases.physics):build(),
+    graphics = evo.group():phase(phases.graphics):build(),
+    shutdown = evo.group():phase(phases.shutdown):build(),
+}
+
 local singles = {
     delta_time = evo.fragment():single(0.016):build(),
     physics_gravity = evo.fragment():single(vector2(0, 9.81)):build(),
@@ -40,7 +47,7 @@ local queries = {
 }
 
 local awake_system = evo.system()
-    :phase(phases.awake)
+    :group(groups.awake)
     :prologue(function()
         print '-= | Awake | =-'
         evo.entity()
@@ -51,7 +58,7 @@ local awake_system = evo.system()
     end):build()
 
 local integrate_forces_system = evo.system()
-    :phase(phases.physics)
+    :group(groups.physics)
     :query(queries.physics_bodies)
     :execute(function(chunk, entities, entity_count)
         ---@type number, evolved.vector2
@@ -72,8 +79,7 @@ local integrate_forces_system = evo.system()
     end):build()
 
 local integrate_velocities_system = evo.system()
-    :phase(phases.physics)
-    :after(integrate_forces_system)
+    :group(groups.physics)
     :query(queries.physics_bodies)
     :execute(function(chunk, entities, entity_count)
         ---@type number
@@ -96,7 +102,7 @@ local integrate_velocities_system = evo.system()
     end):build()
 
 local graphics_system = evo.system()
-    :phase(phases.graphics)
+    :group(groups.graphics)
     :query(queries.physics_bodies)
     :execute(function(chunk, entities, entity_count)
         ---@type evolved.vector2[]
@@ -113,7 +119,7 @@ local graphics_system = evo.system()
     end):build()
 
 local shutdown_system = evo.system()
-    :phase(phases.shutdown)
+    :group(groups.shutdown)
     :epilogue(function()
         print '-= | Shutdown | =-'
         evo.batch_destroy(queries.physics_bodies)

develop/untests.lua

@@ -6569,26 +6569,6 @@ do
     end
 end
 
-do
-    local s1 = evo.system():build()
-    do
-        local after = evo.get(s1, evo.AFTER)
-        assert(after == nil)
-    end
-
-    local s2 = evo.system():after(s1):build()
-    do
-        local after = evo.get(s2, evo.AFTER)
-        assert(#after == 1 and after[1] == s1)
-    end
-
-    local s3 = evo.system():after(s1, s2):build()
-    do
-        local after = evo.get(s3, evo.AFTER)
-        assert(#after == 2 and after[1] == s1 and after[2] == s2)
-    end
-end
-
 do
     local f1, f2 = evo.id(2)
 
@@ -8202,3 +8182,43 @@ do
     assert(not evo.is_alive_any(e1a, e1b, e12a, e12b))
     assert(evo.is_empty_all(e1a, e1b, e12a, e12b))
 end
+
+do
+    local gb = evo.group()
+
+    local g1 = gb:build()
+    local g2 = gb:name('g2'):build()
+    local g3 = gb:single(42):build()
+    local g4 = gb:name('g4'):single(43):build()
+
+    assert(not evo.has(g1, evo.NAME) and not evo.has(g1, g1))
+    assert(evo.get(g2, evo.NAME) == 'g2' and not evo.has(g2, g2))
+    assert(not evo.has(g3, evo.NAME) and evo.get(g3, g3) == 42)
+    assert(evo.get(g4, evo.NAME) == 'g4' and evo.get(g4, g4) == 43)
+end
+
+do
+    local g = evo.group():build()
+    local s = evo.system():group(g):build()
+    assert(evo.get(s, evo.GROUP) == g)
+end
+
+do
+    local s1 = evo.group():build()
+    do
+        local after = evo.get(s1, evo.AFTER)
+        assert(after == nil)
+    end
+
+    local g2 = evo.group():after(s1):build()
+    do
+        local after = evo.get(g2, evo.AFTER)
+        assert(#after == 1 and after[1] == s1)
+    end
+
+    local g3 = evo.group():after(s1, g2):build()
+    do
+        local after = evo.get(g3, evo.AFTER)
+        assert(#after == 2 and after[1] == s1 and after[2] == g2)
+    end
+end