From 15dfb2867af90e336bed7813f8b4f5bed3a6e8ff Mon Sep 17 00:00:00 2001 From: Ali Chraghi Date: Sun, 18 Sep 2022 19:22:03 +0430 Subject: [PATCH] all: rename setShouldClose to close Closes #550 --- examples/advanced-gen-texture-light/main.zig | 2 +- examples/cubemap/main.zig | 2 +- examples/fractal-cube/main.zig | 2 +- examples/gkurve/main.zig | 2 +- examples/instanced-cube/main.zig | 2 +- examples/map-async/main.zig | 2 +- examples/pixel-post-process/main.zig | 2 +- examples/rotating-cube/main.zig | 2 +- examples/textured-cube/main.zig | 2 +- examples/two-cubes/main.zig | 2 +- shaderexp/main.zig | 4 ++-- src/Core.zig | 4 ++-- src/platform/libmach.zig | 4 ++-- src/platform/native.zig | 4 ++-- src/platform/wasm.zig | 6 +++--- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/advanced-gen-texture-light/main.zig b/examples/advanced-gen-texture-light/main.zig index be87a562..d41fb26f 100755 --- a/examples/advanced-gen-texture-light/main.zig +++ b/examples/advanced-gen-texture-light/main.zig @@ -54,7 +54,7 @@ pub fn update(app: *App, core: *mach.Core) !void { while (core.pollEvent()) |event| { switch (event) { .key_press => |ev| switch (ev.key) { - .q, .escape, .space => core.setShouldClose(true), + .q, .escape, .space => core.close(), .w, .up => { app.keys |= Dir.up; }, diff --git a/examples/cubemap/main.zig b/examples/cubemap/main.zig index c609b242..8f883f23 100644 --- a/examples/cubemap/main.zig +++ b/examples/cubemap/main.zig @@ -248,7 +248,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/fractal-cube/main.zig b/examples/fractal-cube/main.zig index 7b8725d9..202fd949 100755 --- a/examples/fractal-cube/main.zig +++ b/examples/fractal-cube/main.zig @@ -193,7 +193,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/gkurve/main.zig b/examples/gkurve/main.zig index f7dde0d0..5f1aab0e 100644 --- a/examples/gkurve/main.zig +++ b/examples/gkurve/main.zig @@ -238,7 +238,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/instanced-cube/main.zig b/examples/instanced-cube/main.zig index 8aed3e06..bdab745c 100755 --- a/examples/instanced-cube/main.zig +++ b/examples/instanced-cube/main.zig @@ -122,7 +122,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/map-async/main.zig b/examples/map-async/main.zig index 9493d523..56c78d08 100644 --- a/examples/map-async/main.zig +++ b/examples/map-async/main.zig @@ -82,5 +82,5 @@ pub fn init(_: *App, core: *mach.Core) !void { pub fn deinit(_: *App, _: *mach.Core) void {} pub fn update(_: *App, core: *mach.Core) !void { - core.setShouldClose(true); + core.close(); } diff --git a/examples/pixel-post-process/main.zig b/examples/pixel-post-process/main.zig index 4d814de2..97a22424 100644 --- a/examples/pixel-post-process/main.zig +++ b/examples/pixel-post-process/main.zig @@ -64,7 +64,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/rotating-cube/main.zig b/examples/rotating-cube/main.zig index bd3b9cc2..317d42ef 100755 --- a/examples/rotating-cube/main.zig +++ b/examples/rotating-cube/main.zig @@ -120,7 +120,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/textured-cube/main.zig b/examples/textured-cube/main.zig index 8f14fccc..714a0c9c 100644 --- a/examples/textured-cube/main.zig +++ b/examples/textured-cube/main.zig @@ -169,7 +169,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/examples/two-cubes/main.zig b/examples/two-cubes/main.zig index a64a823c..ccc06428 100755 --- a/examples/two-cubes/main.zig +++ b/examples/two-cubes/main.zig @@ -137,7 +137,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } diff --git a/shaderexp/main.zig b/shaderexp/main.zig index 4de38ac6..3851ff8a 100755 --- a/shaderexp/main.zig +++ b/shaderexp/main.zig @@ -88,7 +88,7 @@ pub fn update(app: *App, core: *mach.Core) !void { switch (event) { .key_press => |ev| { if (ev.key == .space) - core.setShouldClose(true); + core.close(); }, else => {}, } @@ -101,7 +101,7 @@ pub fn update(app: *App, core: *mach.Core) !void { app.fragment_shader_file.seekTo(0) catch unreachable; app.fragment_shader_code = app.fragment_shader_file.readToEndAllocOptions(core.allocator, std.math.maxInt(u32), null, 1, 0) catch |err| { std.log.err("Err: {}", .{err}); - return core.setShouldClose(true); + return core.close(); }; app.pipeline = recreatePipeline(core, app.fragment_shader_code, null); } diff --git a/src/Core.zig b/src/Core.zig index 91b8aa1b..e275ceb0 100644 --- a/src/Core.zig +++ b/src/Core.zig @@ -50,8 +50,8 @@ pub fn setOptions(core: *Core, options: structs.Options) !void { } // Signals mach to stop the update loop. -pub fn setShouldClose(core: *Core, value: bool) void { - core.internal.setShouldClose(value); +pub fn close(core: *Core) void { + core.internal.close(); } // Sets seconds to wait for an event with timeout before calling update() diff --git a/src/platform/libmach.zig b/src/platform/libmach.zig index 98ade32a..28c9b269 100644 --- a/src/platform/libmach.zig +++ b/src/platform/libmach.zig @@ -22,8 +22,8 @@ pub fn update(_: *App, _: *Core) !void {} // 2. Core might need to expose more state so more API functions can be exposed (for example, the WebGPU API) // 3. Be very careful about arguments, types, memory, etc - any mismatch will result in undefined behavior -pub export fn mach_core_set_should_close(core: *Core) void { - core.setShouldClose(true); +pub export fn mach_core_close(core: *Core) void { + core.close(); } pub export fn mach_core_delta_time(core: *Core) f32 { diff --git a/src/platform/native.zig b/src/platform/native.zig index 68571fed..1b5375db 100644 --- a/src/platform/native.zig +++ b/src/platform/native.zig @@ -329,8 +329,8 @@ pub const Platform = struct { if (options.headless) platform.window.hide() catch {}; } - pub fn setShouldClose(platform: *Platform, value: bool) void { - platform.window.setShouldClose(value); + pub fn close(platform: *Platform) void { + platform.window.setShouldClose(true); } pub fn getFramebufferSize(platform: *Platform) structs.Size { diff --git a/src/platform/wasm.zig b/src/platform/wasm.zig index 703ac311..fa0cc2a2 100644 --- a/src/platform/wasm.zig +++ b/src/platform/wasm.zig @@ -95,8 +95,8 @@ pub const Platform = struct { js.machCanvasSetFullscreen(platform.id, options.fullscreen); } - pub fn setShouldClose(_: *Platform, value: bool) void { - if (value) js.machEmitCloseEvent(); + pub fn close(_: *Platform) void { + js.machEmitCloseEvent(); } pub fn setWaitEvent(_: *Platform, timeout: f64) void { @@ -297,7 +297,7 @@ export fn wasmUpdate() void { core.delta_time_ns = core.timer.lapPrecise(); core.delta_time = @intToFloat(f32, core.delta_time_ns) / @intToFloat(f32, std.time.ns_per_s); - app.update(&core) catch core.setShouldClose(true); + app.update(&core) catch core.close(); } export fn wasmDeinit() void {