Merge pull request #17 from RUSshy/fix_memleak_2

Added missing entity traits changes
master
prime31 3 years ago committed by GitHub
commit e079ac5808

@ -7,13 +7,13 @@ pub const EntityTraitsSize = enum { small, medium, large };
pub fn EntityTraitsType(comptime size: EntityTraitsSize) type { pub fn EntityTraitsType(comptime size: EntityTraitsSize) type {
return switch (size) { return switch (size) {
.small => EntityTraitsDefinition(u16, u12, u4), .small => EntityTraitsDefinition(u16, u12, u4, 0xFFFF, 0xFFF, 10),
.medium => EntityTraitsDefinition(u32, u20, u12), .medium => EntityTraitsDefinition(u32, u20, u12, 0xFFFFF, 0xFFF, 20),
.large => EntityTraitsDefinition(u64, u32, u32), .large => EntityTraitsDefinition(u64, u32, u32, 0xFFFFFFFF, 0xFFFFFFFF, 32),
}; };
} }
fn EntityTraitsDefinition(comptime EntityType: type, comptime IndexType: type, comptime VersionType: type) type { fn EntityTraitsDefinition(comptime EntityType: type, comptime IndexType: type, comptime VersionType: type, comptime EntityMask: EntityType, comptime VersionMask: EntityType, comptime EntityShift: EntityType) type {
std.debug.assert(@typeInfo(EntityType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(EntityType)) == EntityType); std.debug.assert(@typeInfo(EntityType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(EntityType)) == EntityType);
std.debug.assert(@typeInfo(IndexType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(IndexType)) == IndexType); std.debug.assert(@typeInfo(IndexType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(IndexType)) == IndexType);
std.debug.assert(@typeInfo(VersionType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(VersionType)) == VersionType); std.debug.assert(@typeInfo(VersionType) == .Int and std.meta.Int(.unsigned, @bitSizeOf(VersionType)) == VersionType);
@ -26,9 +26,10 @@ fn EntityTraitsDefinition(comptime EntityType: type, comptime IndexType: type, c
index_type: type = IndexType, index_type: type = IndexType,
version_type: type = VersionType, version_type: type = VersionType,
/// Mask to use to get the entity index number out of an identifier /// Mask to use to get the entity index number out of an identifier
entity_mask: EntityType = std.math.maxInt(IndexType), entity_mask: EntityType = EntityMask,
/// Mask to use to get the version out of an identifier /// Mask to use to get the version out of an identifier
version_mask: EntityType = std.math.maxInt(VersionType), version_mask: EntityType = VersionMask,
entity_shift: EntityType = EntityShift,
pub fn init() @This() { pub fn init() @This() {
return @This(){}; return @This(){};

Loading…
Cancel
Save