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

mod(registry.zig): rename singletons field, return pointer *TypeStore.

Browse Source 
Renaming the field `singletons` to `type_store` fixes the following
error in Zig master (0.10.0-dev.193+1d55e4cae):

`error: type '.ecs.type_store.TypeStore' not a function`

Returning a pointer makes the API a bit more ergonomic to consume,
allowing multiple calls to add and get to the singletons. For example:

```zig
var singletons = registry.singletons();
singletons.add(State.init(allocator));
var state = singletons.get(State);
```
This commit is contained in:
Victor carvalho 2022-01-06 16:21:08 +00:00
parent 6852f38a83
commit a294babecc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zig-ecs/src/ecs/registry.zig
View File

@ -34,7 +34,7 @@ pub const Registry = struct {
components: std.AutoHashMap(u32, usize), components: std.AutoHashMap(u32, usize),
contexts: std.AutoHashMap(u32, usize), contexts: std.AutoHashMap(u32, usize),
groups: std.ArrayList(*GroupData), groups: std.ArrayList(*GroupData),
singletons: TypeStore, type_store: TypeStore,
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
/// internal, persistant data structure to manage the entities in a group /// internal, persistant data structure to manage the entities in a group
@ -190,7 +190,7 @@ pub const Registry = struct {
.components = std.AutoHashMap(u32, usize).init(allocator), .components = std.AutoHashMap(u32, usize).init(allocator),
.contexts = std.AutoHashMap(u32, usize).init(allocator), .contexts = std.AutoHashMap(u32, usize).init(allocator),
.groups = std.ArrayList(*GroupData).init(allocator), .groups = std.ArrayList(*GroupData).init(allocator),
.singletons = TypeStore.init(allocator), .type_store = TypeStore.init(allocator),
.allocator = allocator, .allocator = allocator,
}; };
} }
@ -210,7 +210,7 @@ pub const Registry = struct {
self.components.deinit(); self.components.deinit();
self.contexts.deinit(); self.contexts.deinit();
self.groups.deinit(); self.groups.deinit();
self.singletons.deinit(); self.type_store.deinit();
self.handles.deinit(); self.handles.deinit();
} }
@ -418,8 +418,8 @@ pub const Registry = struct {
} }
/// provides access to a TypeStore letting you add singleton components to the registry /// provides access to a TypeStore letting you add singleton components to the registry
pub fn singletons(self: Registry) TypeStore { pub fn singletons(self: *Registry) *TypeStore {
return self.singletons; return &self.type_store;
} }
pub fn sort(self: *Registry, comptime T: type, comptime lessThan: fn (void, T, T) bool) void { pub fn sort(self: *Registry, comptime T: type, comptime lessThan: fn (void, T, T) bool) void {