zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

{mach,ecs}: pass World to ECS event handlers

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-03-26 12:34:23 -07:00 • committed by Stephen Gutekanst
parent 15e6f81df8
commit f153133c30
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ecs/src/main.zig
View file

@ -21,6 +21,7 @@ pub const Modules = @import("systems.zig").Modules;
pub const Messages = @import("systems.zig").Messages; pub const Messages = @import("systems.zig").Messages;
pub const MessagesTag = @import("systems.zig").MessagesTag; pub const MessagesTag = @import("systems.zig").MessagesTag;
pub const World = @import("systems.zig").World; pub const World = @import("systems.zig").World;
pub const View = @import("systems.zig").View;
// TODO: // TODO:
// * Iteration // * Iteration
@ -83,5 +84,5 @@ test "example" {
try world.entities.setComponent(player2, .physics, .id, 1234); try world.entities.setComponent(player2, .physics, .id, 1234);
try world.entities.setComponent(player3, .physics, .id, 1234); try world.entities.setComponent(player3, .physics, .id, 1234);
world.send(.tick); try world.send(.tick);
} }

5
libs/ecs/src/systems.zig
View file

@ -269,12 +269,11 @@ pub fn World(comptime modules: anytype) type {
} }
/// Broadcasts a global message to all modules that are subscribed to it. /// Broadcasts a global message to all modules that are subscribed to it.
pub fn send(world: *Self, comptime msg_tag: anytype) void { pub fn send(world: *Self, comptime msg_tag: anytype) !void {
_ = world;
inline for (std.meta.fields(@TypeOf(modules))) |module_field| { inline for (std.meta.fields(@TypeOf(modules))) |module_field| {
const module = @field(modules, module_field.name); const module = @field(modules, module_field.name);
if (@hasField(@TypeOf(module), "messages")) { if (@hasField(@TypeOf(module), "messages")) {
if (@hasField(module.messages, @tagName(msg_tag))) module.update(msg_tag); if (@hasField(module.messages, @tagName(msg_tag))) try module.update(world, msg_tag);
} }
} }
} }

4
src/engine.zig
View file

@ -32,7 +32,7 @@ pub fn App(comptime modules: anytype) type {
}; };
app.engine.set(.mach, .core, &app.core); app.engine.set(.mach, .core, &app.core);
app.engine.set(.mach, .device, app.core.device()); app.engine.set(.mach, .device, app.core.device());
app.engine.send(.init); try app.engine.send(.init);
} }
pub fn deinit(app: *@This()) void { pub fn deinit(app: *@This()) void {
@ -44,7 +44,7 @@ pub fn App(comptime modules: anytype) type {
} }
pub fn update(app: *@This()) !bool { pub fn update(app: *@This()) !bool {
app.engine.send(.tick); try app.engine.send(.tick);
return false; return false;
} }
}; };