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

{mach,examples}: followups to getWindowSize / getFramebufferSize (#322)

Browse source 
* followup to window size saving, getWindowSize and getFramebufferSize no longer return errors
* updated the examples
This commit is contained in:
David Vanderson 2022-05-31 14:39:53 -04:00 • committed by GitHub
parent 6bfb16554a
commit 3961073084
Failed to generate hash of commit
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/advanced-gen-texture-light/main.zig
View file

@ -38,7 +38,7 @@ pub fn init(app: *App, engine: *mach.Engine) !void {
const eye = vec3(5.0, 7.0, 5.0); const eye = vec3(5.0, 7.0, 5.0);
const target = vec3(0.0, 0.0, 0.0); const target = vec3(0.0, 0.0, 0.0);
const size = try engine.core.getFramebufferSize(); const size = engine.core.getFramebufferSize();
const aspect_ratio = @intToFloat(f32, size.width) / @intToFloat(f32, size.height); const aspect_ratio = @intToFloat(f32, size.width) / @intToFloat(f32, size.height);
app.queue = engine.gpu_driver.device.getQueue(); app.queue = engine.gpu_driver.device.getQueue();

4
examples/gkurve/main.zig
View file

@ -99,7 +99,7 @@ pub fn init(app: *App, engine: *mach.Engine) !void {
app.texture_atlas_data.data, app.texture_atlas_data.data,
); );
const wsize = try engine.core.getWindowSize(); const wsize = engine.core.getWindowSize();
const window_width = @intToFloat(f32, wsize.width); const window_width = @intToFloat(f32, wsize.width);
const window_height = @intToFloat(f32, wsize.height); const window_height = @intToFloat(f32, wsize.height);
const triangle_scale = 250; const triangle_scale = 250;
@ -324,7 +324,7 @@ pub fn getVertexUniformBufferObject(engine: *mach.Engine) !draw.VertexUniform {
// On e.g. macOS, window size may be 640x480 while framebuffer size may be // On e.g. macOS, window size may be 640x480 while framebuffer size may be
// 1280x960 (subpixels.) Doing this lets us use a pixel, not subpixel, // 1280x960 (subpixels.) Doing this lets us use a pixel, not subpixel,
// coordinate system. // coordinate system.
const window_size = try engine.core.getWindowSize(); const window_size = engine.core.getWindowSize();
const proj = zm.orthographicRh( const proj = zm.orthographicRh(
@intToFloat(f32, window_size.width), @intToFloat(f32, window_size.width),
@intToFloat(f32, window_size.height), @intToFloat(f32, window_size.height),

6
src/Engine.zig
View file

@ -39,14 +39,14 @@ pub const Core = struct {
// Returns the framebuffer size, in subpixel units. // Returns the framebuffer size, in subpixel units.
// //
// e.g. returns 1280x960 on macOS for a window that is 640x480 // e.g. returns 1280x960 on macOS for a window that is 640x480
pub fn getFramebufferSize(core: *Core) !structs.Size { pub fn getFramebufferSize(core: *Core) structs.Size {
return core.internal.getFramebufferSize(); return core.internal.getFramebufferSize();
} }
// Returns the widow size, in pixel units. // Returns the widow size, in pixel units.
// //
// e.g. returns 1280x960 on macOS for a window that is 640x480 // e.g. returns 640x480 on macOS for a window that is 640x480
pub fn getWindowSize(core: *Core) !structs.Size { pub fn getWindowSize(core: *Core) structs.Size {
return core.internal.getWindowSize(); return core.internal.getWindowSize();
} }

4
src/platform/native.zig
View file

@ -349,7 +349,7 @@ pub const GpuDriver = struct {
}, },
}; };
var framebuffer_size = try engine.core.getFramebufferSize(); var framebuffer_size = engine.core.getFramebufferSize();
// If targeting OpenGL, we can't use the newer WGPUSurface API. Instead, we need to use the // If targeting OpenGL, we can't use the newer WGPUSurface API. Instead, we need to use the
// older Dawn-specific API. https://bugs.chromium.org/p/dawn/issues/detail?id=269&q=surface&can=2 // older Dawn-specific API. https://bugs.chromium.org/p/dawn/issues/detail?id=269&q=surface&can=2
@ -440,7 +440,7 @@ pub fn main() !void {
engine.delta_time_ns = engine.timer.lapPrecise(); engine.delta_time_ns = engine.timer.lapPrecise();
engine.delta_time = @intToFloat(f32, engine.delta_time_ns) / @intToFloat(f32, std.time.ns_per_s); engine.delta_time = @intToFloat(f32, engine.delta_time_ns) / @intToFloat(f32, std.time.ns_per_s);
var framebuffer_size = try engine.core.getFramebufferSize(); var framebuffer_size = engine.core.getFramebufferSize();
engine.gpu_driver.target_desc.width = framebuffer_size.width; engine.gpu_driver.target_desc.width = framebuffer_size.width;
engine.gpu_driver.target_desc.height = framebuffer_size.height; engine.gpu_driver.target_desc.height = framebuffer_size.height;

4
src/platform/wasm.zig
View file

@ -44,14 +44,14 @@ pub const Core = struct {
pub fn setShouldClose(_: *Core, _: bool) void {} pub fn setShouldClose(_: *Core, _: bool) void {}
pub fn getFramebufferSize(core: *Core) !structs.Size { pub fn getFramebufferSize(core: *Core) structs.Size {
return structs.Size{ return structs.Size{
.width = js.machCanvasGetFramebufferWidth(core.id), .width = js.machCanvasGetFramebufferWidth(core.id),
.height = js.machCanvasGetFramebufferHeight(core.id), .height = js.machCanvasGetFramebufferHeight(core.id),
}; };
} }
pub fn getWindowSize(core: *Core) !structs.Size { pub fn getWindowSize(core: *Core) structs.Size {
return structs.Size{ return structs.Size{
.width = js.machCanvasGetWindowWidth(core.id), .width = js.machCanvasGetWindowWidth(core.id),
.height = js.machCanvasGetWindowHeight(core.id), .height = js.machCanvasGetWindowHeight(core.id),