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

all: fix pointless discards; typo; fix libmach compilation on Linux (#541)

Browse source
This commit is contained in:
praschke 2022-09-15 14:41:05 +00:00 • committed by GitHub
parent 38c4fc5b01
commit b0cd4ec1a0
Failed to generate hash of commit
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.zig
View file

@ -165,6 +165,10 @@ pub fn build(b: *std.build.Builder) void {
lib.addPackage(gpu.pkg); lib.addPackage(gpu.pkg);
lib.addPackage(glfw.pkg); lib.addPackage(glfw.pkg);
lib.addPackage(sysaudio.pkg); lib.addPackage(sysaudio.pkg);
if (target.toTarget().os.tag == .linux) {
// TODO: add gamemode.pkg instead of using addPackagePath
lib.addPackagePath("gamemode", (comptime thisDir()) ++ "/libs/gamemode/gamemode.zig");
}
glfw.link(b, lib, options.glfw_options); glfw.link(b, lib, options.glfw_options);
gpu.link(b, lib, options.gpuOptions()); gpu.link(b, lib, options.gpuOptions());
lib.setOutputDir("./libmach/build"); lib.setOutputDir("./libmach/build");

1
examples/ecs-app/main.zig
View file

@ -47,7 +47,6 @@ pub fn init(engine: *ecs.World(modules)) !void {
const player = try engine.entities.new(); const player = try engine.entities.new();
try engine.entities.setComponent(player, .renderer, .location, .{ .x = 0, .y = 0, .z = 0 }); try engine.entities.setComponent(player, .renderer, .location, .{ .x = 0, .y = 0, .z = 0 });
try engine.entities.setComponent(player, .physics2d, .location, .{ .x = 0, .y = 0 }); try engine.entities.setComponent(player, .physics2d, .location, .{ .x = 0, .y = 0 });
_ = player;
// TODO: there could be an entities wrapper to interact with a single namespace so you don't // TODO: there could be an entities wrapper to interact with a single namespace so you don't
// have to pass it in as a parameter always? // have to pass it in as a parameter always?

1
examples/gkurve/main.zig
View file

@ -115,7 +115,6 @@ pub fn init(app: *App, core: *mach.Core) !void {
_ = window_height; _ = window_height;
_ = triangle_scale; _ = triangle_scale;
_ = img_uv_data; _ = img_uv_data;
_ = white_texture_uv_data;
// try draw.equilateralTriangle(app, .{ window_width / 2, window_height / 2 }, triangle_scale, .{}, img_uv_data); // try draw.equilateralTriangle(app, .{ window_width / 2, window_height / 2 }, triangle_scale, .{}, img_uv_data);
// try draw.equilateralTriangle(app, .{ window_width / 2, window_height / 2 - triangle_scale }, triangle_scale, .{ .type = .concave }, img_uv_data); // try draw.equilateralTriangle(app, .{ window_width / 2, window_height / 2 - triangle_scale }, triangle_scale, .{ .type = .concave }, img_uv_data);
// try draw.equilateralTriangle(app, .{ window_width / 2 - triangle_scale, window_height / 2 - triangle_scale / 2 }, triangle_scale, .{ .type = .convex }, white_texture_uv_data); // try draw.equilateralTriangle(app, .{ window_width / 2 - triangle_scale, window_height / 2 - triangle_scale / 2 }, triangle_scale, .{ .type = .convex }, white_texture_uv_data);

2
src/Core.zig
View file

@ -76,7 +76,7 @@ pub fn getFramebufferSize(core: *Core) structs.Size {
return core.internal.getFramebufferSize(); return core.internal.getFramebufferSize();
} }
// Returns the widow size, in pixel units. // Returns the window size, in pixel 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 getWindowSize(core: *Core) structs.Size { pub fn getWindowSize(core: *Core) structs.Size {