Merge branch 'hexops:main' into vulkan-clear-fix

Author: platypro

.github/FUNDING.yml

@@ -1 +1 @@
-github: slimsag
+github: emidoots

.github/ISSUE_TEMPLATE/dev_release.md

@@ -3,7 +3,7 @@ name: (dev) Release checklist
 about: The checklist we follow to perform a Mach release
 title: 'all: Mach 0.3 release checklist'
 labels: all, zig-update
-assignees: 'slimsag'
+assignees: 'emidoots'
 
 ---
 

.github/ISSUE_TEMPLATE/dev_zig_nomination.md

@@ -3,7 +3,7 @@ name: (dev) Zig version update
 about: The process we follow to perform a Zig version update
 title: 'all: nominate Zig YYYY.MM.0-mach'
 labels: all, zig-update
-assignees: 'slimsag'
+assignees: 'emidoots'
 
 ---
 
@@ -29,7 +29,7 @@ You may have been linked to this issue because you sent a pull request to update
 * [ ] https://machengine.org/docs/zig-version has been updated
 * [ ] In `machengine.org` repository `static/zig` folder, `wrench script nominate-zig-index-update finalize 2024.1.0-mach-wip` has been ran and the [`index.json`](https://machengine.org/zig/index.json) has had `-wip` removed and the `mach-latest` entry has been updated.
 * [ ] The `**IN-PROGRESS**` warning in the _Nomination history_ has been removed.
-* [ ] A [new issue](https://github.com/hexops/mach/issues/new?assignees=slimsag&labels=all%2C+zig-update&projects=&template=dev_zig_nomination.md&title=all%3A+nominate+Zig+YYYY.MM) has been filed for the next nomination.
+* [ ] A [new issue](https://github.com/hexops/mach/issues/new?assignees=emidoots&labels=all%2C+zig-update&projects=&template=dev_zig_nomination.md&title=all%3A+nominate+Zig+YYYY.MM) has been filed for the next nomination.
 * [ ] A #progress announcement has been made:
 
 > We've just finalized nominating and updating to Zig 2024.1.0-mach. We encourage you to update your projects to that Zig version now. :)

build.zig

@@ -389,6 +389,34 @@ const Example = struct {
     run_step: *std.Build.Step = undefined,
 };
 
+pub fn addExecutable(
+    mach_builder: *std.Build,
+    options: struct {
+        name: []const u8,
+        app: *std.Build.Module,
+        target: std.Build.ResolvedTarget,
+        optimize: std.builtin.OptimizeMode,
+    },
+) *std.Build.Step.Compile {
+    const entrypoint_mod = mach_builder.addModule(
+        mach_builder.fmt("{s}-entrypoint", .{options.name}),
+        .{
+            .root_source_file = mach_builder.path("src/entrypoint/main.zig"),
+            .optimize = options.optimize,
+            .target = options.target,
+        },
+    );
+    entrypoint_mod.addImport("app", options.app);
+
+    return mach_builder.addExecutable(.{
+        .name = options.name,
+        .root_module = entrypoint_mod,
+
+        // Win32 manifest file for DPI-awareness configuration
+        .win32_manifest = mach_builder.path("src/core/windows/win32.manifest"),
+    });
+}
+
 fn buildExamples(
     b: *std.Build,
     optimize: std.builtin.OptimizeMode,
@@ -397,34 +425,36 @@ fn buildExamples(
     examples: []Example,
 ) void {
     for (examples) |*example| {
-        const exe = b.addExecutable(.{
+        const app_mod = b.addModule(example.name, .{
+            .root_source_file = b.path(b.fmt("examples/{s}/App.zig", .{example.name})),
+        });
+        app_mod.addImport("mach", mach_mod);
+        const exe = addExecutable(b, .{
             .name = example.name,
-            .root_source_file = b.path(b.fmt("examples/{s}/main.zig", .{example.name})),
+            .app = app_mod,
             .target = target,
             .optimize = optimize,
-            .win32_manifest = b.path("src/core/windows/win32.manifest"),
         });
-        exe.root_module.addImport("mach", mach_mod);
 
         for (example.deps) |d| {
             switch (d) {
                 .assets => {
                     if (b.lazyDependency("mach_example_assets", .{
                         .target = target,
                         .optimize = optimize,
-                    })) |dep| exe.root_module.addImport("assets", dep.module("mach-example-assets"));
+                    })) |dep| app_mod.addImport("assets", dep.module("mach-example-assets"));
                 },
                 .freetype => {
                     if (b.lazyDependency("mach_freetype", .{
                         .target = target,
                         .optimize = optimize,
-                    })) |dep| exe.root_module.addImport("freetype", dep.module("mach-freetype"));
+                    })) |dep| app_mod.addImport("freetype", dep.module("mach-freetype"));
                 },
                 .zigimg => {
                     if (b.lazyDependency("zigimg", .{
                         .target = target,
                         .optimize = optimize,
-                    })) |dep| exe.root_module.addImport("zigimg", dep.module("zigimg"));
+                    })) |dep| app_mod.addImport("zigimg", dep.module("zigimg"));
                 },
             }
         }

examples/core-transparent-window/App.zig

@@ -4,6 +4,12 @@ const gpu = mach.gpu;
 
 const App = @This();
 
+// The set of Mach modules our application may use.
+pub const Modules = mach.Modules(.{
+    mach.Core,
+    @This(),
+});
+
 pub const mach_module = .app;
 
 pub const mach_systems = .{ .main, .init, .tick, .deinit };

examples/core-triangle/App.zig

@@ -4,6 +4,12 @@ const gpu = mach.gpu;
 
 const App = @This();
 
+// The set of Mach modules our application may use.
+pub const Modules = mach.Modules(.{
+    mach.Core,
+    App,
+});
+
 pub const mach_module = .app;
 
 pub const mach_systems = .{ .main, .init, .tick, .deinit };

examples/core-triangle/main.zig

@@ -9,6 +9,13 @@ const Vec3 = math.Vec3;
 
 const App = @This();
 
+// The set of Mach modules our application may use.
+pub const Modules = mach.Modules(.{
+    mach.Core,
+    App,
+    @import("Renderer.zig"),
+});
+
 pub const mach_module = .app;
 
 pub const mach_systems = .{ .main, .init, .deinit, .tick };

examples/custom-renderer/App.zig

@@ -16,6 +16,13 @@ const Mat4x4 = math.Mat4x4;
 
 const App = @This();
 
+// The set of Mach modules our application may use.
+pub const Modules = mach.Modules(.{
+    mach.Core,
+    mach.gfx.Sprite,
+    App,
+});
+
 pub const mach_module = .app;
 
 pub const mach_systems = .{ .main, .init, .deinit, .tick };