zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mach: merge and remove the extra layer of indirection caused by Core and

Browse source 
GpuDriver

Core and GpuDriver both are merged into one type called Platform. Also
previously the fields and methods which were called as
``engine.core.field`` will now be ``engine.field`` i.e an extra layer is
removed.
This commit is contained in:
iddev5 2022-05-31 23:13:58 +05:30 • committed by Stephen Gutekanst
parent 3961073084
commit 50fe649ab1
4 changed files with 225 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/platform/wasm.zig
View file

@ -24,11 +24,11 @@ const js = struct {
pub const CanvasId = u32;
pub const Core = struct {
pub const Platform = struct {
id: CanvasId,
selector_id: []const u8,
pub fn init(allocator: std.mem.Allocator, eng: *Engine) !Core {
pub fn init(allocator: std.mem.Allocator, eng: *Engine) !Platform {
const options = eng.options;
var selector = [1]u8{0} ** 15;
const id = js.machCanvasInit(options.width, options.height, &selector[0]);
@ -36,31 +36,31 @@ pub const Core = struct {
const title = std.mem.span(options.title);
js.machCanvasSetTitle(id, title.ptr, title.len);
return Core{
return Platform{
.id = id,
.selector_id = try allocator.dupe(u8, selector[0 .. selector.len - @as(u32, if (selector[selector.len - 1] == 0) 1 else 0)]),
};
}
pub fn setShouldClose(_: *Core, _: bool) void {}
pub fn setShouldClose(_: *Platform, _: bool) void {}
pub fn getFramebufferSize(core: *Core) structs.Size {
pub fn getFramebufferSize(platform: *Platform) structs.Size {
return structs.Size{
.width = js.machCanvasGetFramebufferWidth(core.id),
.height = js.machCanvasGetFramebufferHeight(core.id),
.width = js.machCanvasGetFramebufferWidth(platform.id),
.height = js.machCanvasGetFramebufferHeight(platform.id),
};
}
pub fn getWindowSize(core: *Core) structs.Size {
pub fn getWindowSize(platform: *Platform) structs.Size {
return structs.Size{
.width = js.machCanvasGetWindowWidth(core.id),
.height = js.machCanvasGetWindowHeight(core.id),
.width = js.machCanvasGetWindowWidth(platform.id),
.height = js.machCanvasGetWindowHeight(platform.id),
};
}
pub fn setSizeLimits(_: *Core, _: structs.SizeOptional, _: structs.SizeOptional) !void {}
pub fn setSizeLimits(_: *Platform, _: structs.SizeOptional, _: structs.SizeOptional) !void {}
pub fn pollEvent(_: *Core) ?structs.Event {
pub fn pollEvent(_: *Platform) ?structs.Event {
const event_type = js.machEventShift();
return switch (event_type) {
@ -75,12 +75,6 @@ pub const Core = struct {
}
};
pub const GpuDriver = struct {
pub fn init(_: std.mem.Allocator, _: *Engine) !GpuDriver {
return GpuDriver{};
}
};
pub const BackingTimer = struct {
initial: f64 = undefined,