master
Mike 5 years ago
parent f7e2c263ba
commit ed23befd26

@ -10,7 +10,7 @@ pub fn build(b: *Builder) void {
}; };
for (examples) |example, i| { for (examples) |example, i| {
const name = example[0]; const name = if (i == 0) "ecs" else example[0];
const source = example[1]; const source = example[1];
var exe = b.addExecutable(name, source); var exe = b.addExecutable(name, source);
@ -23,7 +23,6 @@ pub fn build(b: *Builder) void {
// first element in the list is added as "run" so "zig build run" works // first element in the list is added as "run" so "zig build run" works
if (i == 0) { if (i == 0) {
exe.name = "ecs";
exe.setOutputDir("zig-cache/bin"); exe.setOutputDir("zig-cache/bin");
const run_exe_step = b.step("run", b.fmt("run {}.zig", .{name})); const run_exe_step = b.step("run", b.fmt("run {}.zig", .{name}));
run_exe_step.dependOn(&run_cmd.step); run_exe_step.dependOn(&run_cmd.step);
@ -71,4 +70,4 @@ pub fn linkArtifact(b: *Builder, artifact: *std.build.LibExeObjStep, target: std
} }
artifact.addPackagePath("ecs", std.fs.path.join(b.allocator, &[_][]const u8{ rel_path, "ecs.zig" }) catch unreachable); artifact.addPackagePath("ecs", std.fs.path.join(b.allocator, &[_][]const u8{ rel_path, "ecs.zig" }) catch unreachable);
} }

@ -19,13 +19,13 @@ pub fn main() !void {
reg.add(e2, Position{ .x = 10, .y = 10 }); reg.add(e2, Position{ .x = 10, .y = 10 });
reg.add(e2, Velocity{ .x = 15, .y = 17 }); reg.add(e2, Velocity{ .x = 15, .y = 17 });
var view = reg.view(.{Velocity, Position}); var view = reg.view(.{ Velocity, Position });
var iter = view.iterator(); var iter = view.iterator();
while (iter.next()) |entity| { while (iter.next()) |entity| {
var pos = view.get(Position, entity); var pos = view.get(Position, entity);
const vel = view.getConst(Velocity, entity); const vel = view.getConst(Velocity, entity);
std.debug.warn("entity: {}, pos: {d}, vel: {d}\n", .{entity, pos.*, vel}); std.debug.warn("entity: {}, pos: {d}, vel: {d}\n", .{ entity, pos.*, vel });
pos.*.x += vel.x; pos.*.x += vel.x;
pos.*.y += vel.y; pos.*.y += vel.y;
} }
@ -36,6 +36,6 @@ pub fn main() !void {
while (iter.next()) |entity| { while (iter.next()) |entity| {
const pos = view.getConst(Position, entity); const pos = view.getConst(Position, entity);
const vel = view.getConst(Velocity, entity); const vel = view.getConst(Velocity, entity);
std.debug.warn("entity: {}, pos: {d}, vel: {d}\n", .{entity, pos, vel}); std.debug.warn("entity: {}, pos: {d}, vel: {d}\n", .{ entity, pos, vel });
} }
} }

@ -227,7 +227,7 @@ pub const Registry = struct {
_ = self.component_contexts.put(type_id, 0) catch unreachable; _ = self.component_contexts.put(type_id, 0) catch unreachable;
} }
/// Returns a pointer to an object in the context of the Component type /// Returns a pointer to an object in the context of the Component type
pub fn getComponentContext(self: *Registry, comptime Component: type, comptime T: type) ?*T { pub fn getComponentContext(self: *Registry, comptime Component: type, comptime T: type) ?*T {
var type_id: u8 = undefined; var type_id: u8 = undefined;
_ = self.typemap.getOrPut(Component, &type_id); _ = self.typemap.getOrPut(Component, &type_id);
@ -287,7 +287,7 @@ test "context not pointer" {
} }
test "component context get/set/unset" { test "component context get/set/unset" {
const SomeType = struct { dummy: u1}; const SomeType = struct { dummy: u1 };
var reg = Registry.init(std.testing.allocator); var reg = Registry.init(std.testing.allocator);
defer reg.deinit(); defer reg.deinit();
@ -303,4 +303,4 @@ test "component context get/set/unset" {
reg.unsetComponentContext(Position); reg.unsetComponentContext(Position);
ctx = reg.getComponentContext(Position, SomeType); ctx = reg.getComponentContext(Position, SomeType);
std.testing.expectEqual(ctx, null); std.testing.expectEqual(ctx, null);
} }

Loading…
Cancel
Save