diff --git a/zig-ecs/examples/view_vs_group.zig b/zig-ecs/examples/view_vs_group.zig index 59a753a..ec52e5c 100644 --- a/zig-ecs/examples/view_vs_group.zig +++ b/zig-ecs/examples/view_vs_group.zig @@ -7,12 +7,21 @@ pub const EntityTraits = ecs.EntityTraitsType(.medium); pub const Velocity = struct { x: f32, y: f32 }; pub const Position = struct { x: f32, y: f32 }; -/// logs the timing for views vs groups with 1,000,000 entities +/// logs the timing for views vs non-owning groups vs owning groups with 1,000,000 entities pub fn main() !void { var reg = ecs.Registry.init(std.heap.c_allocator); defer reg.deinit(); var timer = try std.time.Timer.start(); + + createEntities(®); + iterateView(®); + nonOwningGroup(®); + owningGroup(®); +} + +fn createEntities(reg: *ecs.Registry) void { + var timer = std.time.Timer.start() catch unreachable; var i: usize = 0; while (i < 1000000) : (i += 1) { var e1 = reg.create(); @@ -20,11 +29,14 @@ pub fn main() !void { reg.add(e1, Velocity{ .x = 1, .y = 1 }); } var end = timer.lap(); - std.debug.warn("create: \t{d}\n", .{@intToFloat(f64, end) / 1000000000}); + std.debug.warn("create entities: \t{d}\n", .{@intToFloat(f64, end) / 1000000000}); +} +fn iterateView(reg: *ecs.Registry) void { + std.debug.warn("--- multi-view ---\n", .{}); var view = reg.view(.{ Velocity, Position }, .{}); - timer.reset(); + var timer = std.time.Timer.start() catch unreachable; var iter = view.iterator(); while (iter.next()) |entity| { var pos = view.get(Position, entity); @@ -34,11 +46,36 @@ pub fn main() !void { pos.*.y += vel.y; } - end = timer.lap(); + var end = timer.lap(); std.debug.warn("view (iter): \t{d}\n", .{@intToFloat(f64, end) / 1000000000}); +} + +fn nonOwningGroup(reg: *ecs.Registry) void { + std.debug.warn("--- non-owning ---\n", .{}); + var timer = std.time.Timer.start() catch unreachable; + var group = reg.group(.{}, .{Velocity, Position}, .{}); + var end = timer.lap(); + std.debug.warn("group (create): {d}\n", .{@intToFloat(f64, end) / 1000000000}); + + timer.reset(); + var group_iter = group.iterator(); + while (group_iter.next()) |entity| { + var pos = group.get(Position, entity); + const vel = group.getConst(Velocity, entity); + + pos.*.x += vel.x; + pos.*.y += vel.y; + } - var group = reg.group(.{ Velocity, Position }, .{}, .{}); end = timer.lap(); + std.debug.warn("group (iter): \t{d}\n", .{@intToFloat(f64, end) / 1000000000}); +} + +fn owningGroup(reg: *ecs.Registry) void { + std.debug.warn("--- owning ---\n", .{}); + var timer = std.time.Timer.start() catch unreachable; + var group = reg.group(.{ Velocity, Position }, .{}, .{}); + var end = timer.lap(); std.debug.warn("group (create): {d}\n", .{@intToFloat(f64, end) / 1000000000}); timer.reset(); diff --git a/zig-ecs/src/ecs/registry.zig b/zig-ecs/src/ecs/registry.zig index 58ed069..dbadfb7 100644 --- a/zig-ecs/src/ecs/registry.zig +++ b/zig-ecs/src/ecs/registry.zig @@ -176,6 +176,7 @@ pub const Registry = struct { } if (overlapping > 0) return i; + if (i == 0) return null; } return null; @@ -615,6 +616,8 @@ pub const Registry = struct { /// expects a tuple of types. Convertes them to type names, sorts them then concatenates and returns the string. inline fn concatTypes(comptime types: var) []const u8 { comptime { + if (types.len == 0) return "_"; + const impl = struct { fn asc(context: void, lhs: []const u8, rhs: []const u8) bool { return std.mem.lessThan(u8, lhs, rhs);