RedStealthDev/zig-raylib-engine
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update sparse_set.zig

Browse Source
This commit is contained in:
RUSshy 2021-07-17 14:05:30 +02:00 committed by GitHub
parent b900dfde2d
commit e488cc384f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zig-ecs/src/ecs/sparse_set.zig
View File

@ -1,14 +1,14 @@
const std = @import("std"); const std = @import("std");
const warn = std.debug.warn; const warn = std.debug.warn;
const utils = @import("utils.zig"); const utils = @import("utils.zig");
const registry = @import("registry.zig");
const ReverseSliceIterator = @import("utils.zig").ReverseSliceIterator; const ReverseSliceIterator = @import("utils.zig").ReverseSliceIterator;
// TODO: fix entity_mask. it should come from EntityTraitsDefinition. // TODO: fix entity_mask. it should come from EntityTraitsDefinition.
pub fn SparseSet(comptime SparseT: type) type { pub fn SparseSet(comptime SparseT: type) type {
return struct { return struct {
const Self = @This(); const Self = @This();
const page_size: usize = 32768; const page_size: usize = 4096;
const entity_per_page = page_size / @sizeOf(SparseT);
sparse: std.ArrayList(?[]SparseT), sparse: std.ArrayList(?[]SparseT),
dense: std.ArrayList(SparseT), dense: std.ArrayList(SparseT),
@ -17,9 +17,9 @@ pub fn SparseSet(comptime SparseT: type) type {
pub fn initPtr(allocator: *std.mem.Allocator) *Self { pub fn initPtr(allocator: *std.mem.Allocator) *Self {
var set = allocator.create(Self) catch unreachable; var set = allocator.create(Self) catch unreachable;
set.sparse = std.ArrayList(?[]SparseT).init(allocator); set.sparse = std.ArrayList(?[]SparseT).initCapacity(allocator, 16) catch unreachable;
set.dense = std.ArrayList(SparseT).init(allocator); set.dense = std.ArrayList(SparseT).initCapacity(allocator, 16) catch unreachable;
set.entity_mask = std.math.maxInt(SparseT); set.entity_mask = registry.entity_traits.entity_mask;
set.allocator = allocator; set.allocator = allocator;
return set; return set;
} }
@ -28,7 +28,7 @@ pub fn SparseSet(comptime SparseT: type) type {
return Self{ return Self{
.sparse = std.ArrayList(?[]SparseT).init(allocator), .sparse = std.ArrayList(?[]SparseT).init(allocator),
.dense = std.ArrayList(SparseT).init(allocator), .dense = std.ArrayList(SparseT).init(allocator),
.entity_mask = std.math.maxInt(SparseT), .entity_mask = registry.entity_traits.entity_mask,
.allocator = null, .allocator = null,
}; };
} }
@ -50,11 +50,11 @@ pub fn SparseSet(comptime SparseT: type) type {
} }
pub fn page(self: Self, sparse: SparseT) usize { pub fn page(self: Self, sparse: SparseT) usize {
return (sparse & self.entity_mask) / entity_per_page; return (sparse & self.entity_mask) / page_size;
} }
fn offset(_: Self, sparse: SparseT) usize { fn offset(_: Self, sparse: SparseT) usize {
return sparse & (entity_per_page - 1); return sparse & (page_size - 1);
} }
fn assure(self: *Self, pos: usize) []SparseT { fn assure(self: *Self, pos: usize) []SparseT {
@ -65,13 +65,11 @@ pub fn SparseSet(comptime SparseT: type) type {
std.mem.set(?[]SparseT, self.sparse.items[start_pos..], null); std.mem.set(?[]SparseT, self.sparse.items[start_pos..], null);
} }
if (self.sparse.items[pos]) |arr| { if (self.sparse.items[pos] == null) {
return arr; var new_page = self.sparse.allocator.alloc(SparseT, page_size) catch unreachable;
}
var new_page = self.sparse.allocator.alloc(SparseT, entity_per_page) catch unreachable;
std.mem.set(SparseT, new_page, std.math.maxInt(SparseT)); std.mem.set(SparseT, new_page, std.math.maxInt(SparseT));
self.sparse.items[pos] = new_page; self.sparse.items[pos] = new_page;
}
return self.sparse.items[pos].?; return self.sparse.items[pos].?;
} }
@ -105,7 +103,9 @@ pub fn SparseSet(comptime SparseT: type) type {
pub fn contains(self: Self, sparse: SparseT) bool { pub fn contains(self: Self, sparse: SparseT) bool {
const curr = self.page(sparse); const curr = self.page(sparse);
return curr < self.sparse.items.len and self.sparse.items[curr] != null and self.sparse.items[curr].?[self.offset(sparse)] != std.math.maxInt(SparseT); return curr < self.sparse.items.len and
self.sparse.items[curr] != null and
self.sparse.items[curr].?[self.offset(sparse)] != std.math.maxInt(SparseT);
} }
/// Returns the position of an entity in a sparse set /// Returns the position of an entity in a sparse set