{module,ecs}: Mach ECS becomes the Mach' module system
This moves the bulk of the ECS code into `src/module`. It also makes types like `mach.ecs.EntityID` accessible at the top-level `mach.EntityID` instead. The motivation of this change is to make the Mach module system a first-class property of Mach. Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
parent
679a05faf4
commit
f578e1f5e2
15 changed files with 23 additions and 52 deletions
|
|
@ -1,301 +0,0 @@
|
|||
//! Represents a single archetype. i.e., entities which have a specific set of components. When a
|
||||
//! component is added or removed from an entity, it's archetype changes because the archetype is
|
||||
//! the set of components an entity has.
|
||||
//!
|
||||
//! Database equivalent: a table where rows are entities and columns are components (dense storage).
|
||||
|
||||
const std = @import("std");
|
||||
const Allocator = std.mem.Allocator;
|
||||
const testing = std.testing;
|
||||
const assert = std.debug.assert;
|
||||
const builtin = @import("builtin");
|
||||
const StringTable = @import("StringTable.zig");
|
||||
|
||||
const Archetype = @This();
|
||||
|
||||
/// Describes a single column of the archetype (table); i.e. a single type of component
|
||||
pub const Column = struct {
|
||||
/// The unique name of the component this column stores.
|
||||
name: StringTable.Index,
|
||||
|
||||
/// A unique identifier for the programming-language type this column stores. In the case of Zig
|
||||
/// this is a comptime type identifier. For other languages, it may be something else or simply
|
||||
/// zero if unused.
|
||||
///
|
||||
/// This value need only uniquely identify the column type for the duration of a single build of
|
||||
/// the program.
|
||||
type_id: u32,
|
||||
|
||||
/// The size of the component this column stores.
|
||||
size: u32,
|
||||
|
||||
/// The alignment of the component type this column stores.
|
||||
alignment: u16,
|
||||
|
||||
/// The actual memory where the values are stored. The length/capacity is Archetype.len and
|
||||
/// Archetype.capacity, as all columns in an Archetype have identical lengths/capacities.
|
||||
values: []u8,
|
||||
};
|
||||
|
||||
/// The length of the table (in-use number of rows)
|
||||
len: u32,
|
||||
|
||||
/// The capacity of the table (total allocated number of rows)
|
||||
capacity: u32,
|
||||
|
||||
/// Describes the columns in this table. Each column stores all rows for that column.
|
||||
columns: []Column,
|
||||
|
||||
/// A reference to the string table that can be used to identify Column.name's
|
||||
component_names: *StringTable,
|
||||
|
||||
/// A hash composed of all Column.name's, effectively acting as the unique name of this table.
|
||||
hash: u64,
|
||||
|
||||
/// An index to Entities.archetypes, used in the event of a *bucket* hash collision (not a collision
|
||||
/// of the .hash field) - see Entities.archetypeOrPut for details.
|
||||
next: ?u32 = null,
|
||||
|
||||
pub fn deinit(storage: *Archetype, gpa: Allocator) void {
|
||||
if (storage.capacity > 0) {
|
||||
for (storage.columns) |column| gpa.free(column.values);
|
||||
}
|
||||
gpa.free(storage.columns);
|
||||
}
|
||||
|
||||
/// appends a new row to this table, with all undefined values.
|
||||
pub fn appendUndefined(storage: *Archetype, gpa: Allocator) !u32 {
|
||||
try storage.ensureUnusedCapacity(gpa, 1);
|
||||
assert(storage.len < storage.capacity);
|
||||
const row_index = storage.len;
|
||||
storage.len += 1;
|
||||
return row_index;
|
||||
}
|
||||
|
||||
// TODO: comptime: missing a runtime variant of this function
|
||||
pub fn append(storage: *Archetype, gpa: Allocator, row: anytype) !u32 {
|
||||
debugAssertRowType(storage, row);
|
||||
|
||||
try storage.ensureUnusedCapacity(gpa, 1);
|
||||
assert(storage.len < storage.capacity);
|
||||
storage.len += 1;
|
||||
|
||||
storage.setRow(storage.len - 1, row);
|
||||
return storage.len;
|
||||
}
|
||||
|
||||
pub fn undoAppend(storage: *Archetype) void {
|
||||
storage.len -= 1;
|
||||
}
|
||||
|
||||
/// Ensures there is enough unused capacity to store `num_rows`.
|
||||
pub fn ensureUnusedCapacity(storage: *Archetype, gpa: Allocator, num_rows: usize) !void {
|
||||
return storage.ensureTotalCapacity(gpa, storage.len + num_rows);
|
||||
}
|
||||
|
||||
/// Ensures the total capacity is enough to store `new_capacity` rows total.
|
||||
pub fn ensureTotalCapacity(storage: *Archetype, gpa: Allocator, new_capacity: usize) !void {
|
||||
var better_capacity = storage.capacity;
|
||||
if (better_capacity >= new_capacity) return;
|
||||
|
||||
while (true) {
|
||||
better_capacity +|= better_capacity / 2 + 8;
|
||||
if (better_capacity >= new_capacity) break;
|
||||
}
|
||||
|
||||
return storage.setCapacity(gpa, better_capacity);
|
||||
}
|
||||
|
||||
/// Sets the capacity to exactly `new_capacity` rows total
|
||||
///
|
||||
/// Asserts `new_capacity >= storage.len`, if you want to shrink capacity then change the len
|
||||
/// yourself first.
|
||||
pub fn setCapacity(storage: *Archetype, gpa: Allocator, new_capacity: usize) !void {
|
||||
assert(new_capacity >= storage.len);
|
||||
|
||||
// TODO: ensure columns are sorted by type_id
|
||||
for (storage.columns) |*column| {
|
||||
const old_values = column.values;
|
||||
const new_values = try gpa.alloc(u8, new_capacity * column.size);
|
||||
if (storage.capacity > 0) {
|
||||
@memcpy(new_values[0..old_values.len], old_values);
|
||||
gpa.free(old_values);
|
||||
}
|
||||
column.values = new_values;
|
||||
}
|
||||
storage.capacity = @as(u32, @intCast(new_capacity));
|
||||
}
|
||||
|
||||
// TODO: comptime: missing a runtime variant of this function
|
||||
/// Sets the entire row's values in the table.
|
||||
pub fn setRow(storage: *Archetype, row_index: u32, row: anytype) void {
|
||||
debugAssertRowType(storage, row);
|
||||
|
||||
const fields = std.meta.fields(@TypeOf(row));
|
||||
inline for (fields, 0..) |field, index| {
|
||||
const ColumnType = field.type;
|
||||
if (@sizeOf(ColumnType) == 0) continue;
|
||||
|
||||
const column = storage.columns[index];
|
||||
const column_values = @as([*]ColumnType, @ptrCast(@alignCast(column.values.ptr)));
|
||||
column_values[row_index] = @field(row, field.name);
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets the value of the named components (columns) for the given row in the table.
|
||||
pub fn set(storage: *Archetype, row_index: u32, name: StringTable.Index, component: anytype) void {
|
||||
const ColumnType = @TypeOf(component);
|
||||
if (@sizeOf(ColumnType) == 0) return;
|
||||
if (is_debug) debugAssertColumnType(storage, storage.columnByName(name).?, @TypeOf(component));
|
||||
storage.setDynamic(
|
||||
row_index,
|
||||
name,
|
||||
std.mem.asBytes(&component),
|
||||
@alignOf(@TypeOf(component)),
|
||||
typeId(@TypeOf(component)),
|
||||
);
|
||||
}
|
||||
|
||||
pub fn setDynamic(storage: *Archetype, row_index: u32, name: StringTable.Index, component: []const u8, alignment: u16, type_id: u32) void {
|
||||
if (is_debug) {
|
||||
// TODO: improve error messages
|
||||
assert(storage.len != 0 and storage.len >= row_index);
|
||||
assert(storage.columnByName(name).?.type_id == type_id);
|
||||
assert(storage.columnByName(name).?.size == component.len);
|
||||
assert(storage.columnByName(name).?.alignment == alignment);
|
||||
}
|
||||
|
||||
const values = storage.getColumnValuesRaw(name) orelse @panic("no such component");
|
||||
const start = component.len * row_index;
|
||||
@memcpy(values[start .. start + component.len], component);
|
||||
}
|
||||
|
||||
pub fn get(storage: *Archetype, row_index: u32, name: StringTable.Index, comptime ColumnType: type) ?ColumnType {
|
||||
if (@sizeOf(ColumnType) == 0) return {};
|
||||
if (is_debug) debugAssertColumnType(storage, storage.columnByName(name) orelse return null, ColumnType);
|
||||
|
||||
const bytes = storage.getDynamic(row_index, name, @sizeOf(ColumnType), @alignOf(ColumnType), typeId(ColumnType)) orelse return null;
|
||||
return @as(*ColumnType, @alignCast(@ptrCast(bytes.ptr))).*;
|
||||
}
|
||||
|
||||
pub fn getDynamic(storage: *Archetype, row_index: u32, name: StringTable.Index, size: u32, alignment: u16, type_id: u32) ?[]u8 {
|
||||
const values = storage.getColumnValuesRaw(name) orelse return null;
|
||||
if (is_debug) {
|
||||
// TODO: improve error messages
|
||||
assert(storage.columnByName(name).?.size == size);
|
||||
assert(storage.columnByName(name).?.alignment == alignment);
|
||||
assert(storage.columnByName(name).?.type_id == type_id);
|
||||
}
|
||||
|
||||
const start = size * row_index;
|
||||
const end = start + size;
|
||||
return values[start..end];
|
||||
}
|
||||
|
||||
/// Swap-removes the specified row with the last row in the table.
|
||||
pub fn remove(storage: *Archetype, row_index: u32) void {
|
||||
if (storage.len > 1 and row_index != storage.len - 1) {
|
||||
for (storage.columns) |column| {
|
||||
const dstStart = column.size * row_index;
|
||||
const dst = column.values[dstStart .. dstStart + column.size];
|
||||
const srcStart = column.size * (storage.len - 1);
|
||||
const src = column.values[srcStart .. srcStart + column.size];
|
||||
@memcpy(dst, src);
|
||||
}
|
||||
}
|
||||
storage.len -= 1;
|
||||
}
|
||||
|
||||
/// Tells if this archetype has every one of the given components.
|
||||
pub fn hasComponents(storage: *Archetype, names: []const u32) bool {
|
||||
for (names) |name| {
|
||||
if (!storage.hasComponent(name)) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Tells if this archetype has a component with the specified name.
|
||||
pub fn hasComponent(storage: *Archetype, name: StringTable.Index) bool {
|
||||
return storage.columnByName(name) != null;
|
||||
}
|
||||
|
||||
pub fn getColumnValues(storage: *Archetype, name: StringTable.Index, comptime ColumnType: type) ?[]ColumnType {
|
||||
const values = storage.getColumnValuesRaw(name) orelse return null;
|
||||
if (is_debug) debugAssertColumnType(storage, storage.columnByName(name).?, ColumnType);
|
||||
var ptr = @as([*]ColumnType, @ptrCast(@alignCast(values.ptr)));
|
||||
const column_values = ptr[0..storage.capacity];
|
||||
return column_values;
|
||||
}
|
||||
|
||||
pub fn getColumnValuesRaw(storage: *Archetype, name: StringTable.Index) ?[]u8 {
|
||||
const column = storage.columnByName(name) orelse return null;
|
||||
return column.values;
|
||||
}
|
||||
|
||||
pub inline fn columnByName(storage: *Archetype, name: StringTable.Index) ?*Column {
|
||||
for (storage.columns) |*column| {
|
||||
if (column.name == name) return column;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
pub const is_debug = builtin.mode == .Debug;
|
||||
|
||||
/// Returns a unique comptime usize integer representing the type T. Value will change across
|
||||
/// different compilations.
|
||||
pub fn typeId(comptime T: type) u32 {
|
||||
_ = T;
|
||||
return @truncate(@intFromPtr(&struct {
|
||||
var x: u8 = 0;
|
||||
}.x));
|
||||
}
|
||||
|
||||
/// Asserts that T matches the type of the column.
|
||||
pub inline fn debugAssertColumnType(storage: *Archetype, column: *Archetype.Column, comptime T: type) void {
|
||||
if (is_debug) {
|
||||
if (typeId(T) != column.type_id) std.debug.panic("unexpected type: {s} expected: {s}", .{
|
||||
@typeName(T),
|
||||
storage.component_names.string(column.name),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Asserts that a tuple `row` to be e.g. appended to an archetype has values that actually match
|
||||
/// all of the columns of the archetype table.
|
||||
pub inline fn debugAssertRowType(storage: *Archetype, row: anytype) void {
|
||||
if (is_debug) {
|
||||
inline for (std.meta.fields(@TypeOf(row)), 0..) |field, index| {
|
||||
debugAssertColumnType(storage, &storage.columns[index], field.type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: comptime refactor
|
||||
pub fn Slicer(comptime all_components: anytype) type {
|
||||
return struct {
|
||||
archetype: *Archetype,
|
||||
|
||||
pub fn slice(
|
||||
slicer: @This(),
|
||||
// TODO: cleanup comptime
|
||||
comptime namespace_name: std.meta.FieldEnum(@TypeOf(all_components)),
|
||||
comptime component_name: std.meta.FieldEnum(@TypeOf(@field(all_components, @tagName(namespace_name)))),
|
||||
) []@field(
|
||||
@field(all_components, @tagName(namespace_name)),
|
||||
@tagName(component_name),
|
||||
).type {
|
||||
// TODO: cleanup comptime
|
||||
const Type = @field(
|
||||
@field(all_components, @tagName(namespace_name)),
|
||||
@tagName(component_name),
|
||||
).type;
|
||||
if (namespace_name == .entity and component_name == .id) {
|
||||
const name_id = slicer.archetype.component_names.index("id").?;
|
||||
return slicer.archetype.getColumnValues(name_id, Type).?[0..slicer.archetype.len];
|
||||
}
|
||||
const name = @tagName(namespace_name) ++ "." ++ @tagName(component_name);
|
||||
const name_id = slicer.archetype.component_names.index(name).?;
|
||||
return slicer.archetype.getColumnValues(name_id, Type).?[0..slicer.archetype.len];
|
||||
}
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue