examples: Do not return bool on update()
Also replaced all ``return false;`` usages with Engine.setShouldClose(true).
This commit is contained in:
parent
40c0659cc9
commit
2d53b8bdfd
10 changed files with 11 additions and 31 deletions
|
|
@ -54,7 +54,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.depth.?.release();
|
app.depth.?.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| switch (ev.key) {
|
.key_press => |ev| switch (ev.key) {
|
||||||
|
|
@ -172,8 +172,6 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
|
|
||||||
app.queue.submit(&.{command});
|
app.queue.submit(&.{command});
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ pub fn init(app: *App, engine: *mach.Engine) !void {
|
||||||
|
|
||||||
pub fn deinit(_: *App, _: *mach.Engine) void {}
|
pub fn deinit(_: *App, _: *mach.Engine) void {}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
const back_buffer_view = engine.swap_chain.?.getCurrentTextureView();
|
const back_buffer_view = engine.swap_chain.?.getCurrentTextureView();
|
||||||
const color_attachment = gpu.RenderPassColorAttachment{
|
const color_attachment = gpu.RenderPassColorAttachment{
|
||||||
.view = back_buffer_view,
|
.view = back_buffer_view,
|
||||||
|
|
@ -205,6 +205,4 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
|
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.depth_texture_view.release();
|
app.depth_texture_view.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -321,8 +321,6 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
||||||
|
|
|
||||||
|
|
@ -248,7 +248,7 @@ pub fn deinit(app: *App, engine: *mach.Engine) void {
|
||||||
app.texture_atlas_data.deinit(engine.allocator);
|
app.texture_atlas_data.deinit(engine.allocator);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -303,8 +303,6 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resize(app: *App, _: *mach.Engine, _: u32, _: u32) !void {
|
pub fn resize(app: *App, _: *mach.Engine, _: u32, _: u32) !void {
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.uniform_buffer.release();
|
app.uniform_buffer.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -209,6 +209,4 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.bind_group.release();
|
app.bind_group.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -209,6 +209,4 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.depth_texture_view.release();
|
app.depth_texture_view.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -243,8 +243,6 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
pub fn resize(app: *App, engine: *mach.Engine, width: u32, height: u32) !void {
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ pub fn init(app: *App, engine: *mach.Engine) !void {
|
||||||
|
|
||||||
pub fn deinit(_: *App, _: *mach.Engine) void {}
|
pub fn deinit(_: *App, _: *mach.Engine) void {}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
const back_buffer_view = engine.swap_chain.?.getCurrentTextureView();
|
const back_buffer_view = engine.swap_chain.?.getCurrentTextureView();
|
||||||
const color_attachment = gpu.RenderPassColorAttachment{
|
const color_attachment = gpu.RenderPassColorAttachment{
|
||||||
.view = back_buffer_view,
|
.view = back_buffer_view,
|
||||||
|
|
@ -101,6 +101,4 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@ pub fn deinit(app: *App, _: *mach.Engine) void {
|
||||||
app.bind_group2.release();
|
app.bind_group2.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -241,6 +241,4 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ pub fn deinit(app: *App, engine: *mach.Engine) void {
|
||||||
app.bind_group.release();
|
app.bind_group.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(app: *App, engine: *mach.Engine) !bool {
|
pub fn update(app: *App, engine: *mach.Engine) !void {
|
||||||
while (engine.pollEvent()) |event| {
|
while (engine.pollEvent()) |event| {
|
||||||
switch (event) {
|
switch (event) {
|
||||||
.key_press => |ev| {
|
.key_press => |ev| {
|
||||||
|
|
@ -143,7 +143,7 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
app.fragment_shader_file.seekTo(0) catch unreachable;
|
app.fragment_shader_file.seekTo(0) catch unreachable;
|
||||||
app.fragment_shader_code = app.fragment_shader_file.readToEndAllocOptions(engine.allocator, std.math.maxInt(u32), null, 1, 0) catch |err| {
|
app.fragment_shader_code = app.fragment_shader_file.readToEndAllocOptions(engine.allocator, std.math.maxInt(u32), null, 1, 0) catch |err| {
|
||||||
std.log.err("Err: {}", .{err});
|
std.log.err("Err: {}", .{err});
|
||||||
return false;
|
return engine.setShouldClose(true);
|
||||||
};
|
};
|
||||||
app.pipeline = recreatePipeline(engine, app.fragment_shader_code, null);
|
app.pipeline = recreatePipeline(engine, app.fragment_shader_code, null);
|
||||||
}
|
}
|
||||||
|
|
@ -189,8 +189,6 @@ pub fn update(app: *App, engine: *mach.Engine) !bool {
|
||||||
command.release();
|
command.release();
|
||||||
engine.swap_chain.?.present();
|
engine.swap_chain.?.present();
|
||||||
back_buffer_view.release();
|
back_buffer_view.release();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn recreatePipeline(engine: *mach.Engine, fragment_shader_code: [:0]const u8, bgl: ?*gpu.BindGroupLayout) gpu.RenderPipeline {
|
fn recreatePipeline(engine: *mach.Engine, fragment_shader_code: [:0]const u8, bgl: ?*gpu.BindGroupLayout) gpu.RenderPipeline {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue