core: refactor

examples/text/App.zig

@@ -38,7 +38,7 @@ pub const systems = .{
     .init = .{ .handler = init },
     .deinit = .{ .handler = deinit },
     .after_init = .{ .handler = afterInit },
-    .tick = .{ .handler = tick },
+    .update = .{ .handler = update },
     .end_frame = .{ .handler = endFrame },
 };
 
@@ -52,21 +52,15 @@ const text1: []const []const u8 = &.{
 
 const text2: []const []const u8 = &.{"$!?"};
 
-fn deinit(
-    core: *mach.Core.Mod,
-    text_pipeline: *gfx.TextPipeline.Mod,
-) !void {
+fn deinit(text_pipeline: *gfx.TextPipeline.Mod) !void {
     text_pipeline.schedule(.deinit);
-    core.schedule(.deinit);
 }
 
 fn init(
-    core: *mach.Core.Mod,
     text: *gfx.Text.Mod,
     text_pipeline: *gfx.TextPipeline.Mod,
     game: *Mod,
 ) !void {
-    core.schedule(.init);
     text.schedule(.init);
     text_pipeline.schedule(.init);
     game.schedule(.after_init);
@@ -74,7 +68,6 @@ fn init(
 
 fn afterInit(
     entities: *mach.Entities.Mod,
-    core: *mach.Core.Mod,
     text: *gfx.Text.Mod,
     text_pipeline: *gfx.TextPipeline.Mod,
     text_style: *gfx.TextStyle.Mod,
@@ -112,11 +105,9 @@ fn afterInit(
         .style1 = style1,
         .pipeline = pipeline,
     });
-
-    core.schedule(.start);
 }
 
-fn tick(
+fn update(
     entities: *mach.Entities.Mod,
     core: *mach.Core.Mod,
     text: *gfx.Text.Mod,
@@ -125,7 +116,7 @@ fn tick(
 ) !void {
     // TODO(important): event polling should occur in mach.Core module and get fired as ECS events.
     // TODO(Core)
-    var iter = mach.core.pollEvents();
+    var iter = core.state().pollEvents();
     var direction = game.state().direction;
     var spawning = game.state().spawning;
     while (iter.next()) |event| {
@@ -214,7 +205,7 @@ fn tick(
 
     // Grab the back buffer of the swapchain
     // TODO(Core)
-    const back_buffer_view = mach.core.swap_chain.getCurrentTextureView().?;
+    const back_buffer_view = core.state().swap_chain.getCurrentTextureView().?;
     defer back_buffer_view.release();
 
     // Begin render pass
@@ -272,13 +263,11 @@ fn endFrame(
             }
         }
 
-        try mach.Core.printTitle(
-            core,
+        try core.state().printTitle(
             core.state().main_window,
             "text [ FPS: {d} ] [ Texts: {d} ] [ Glyphs: {d} ]",
             .{ game.state().frame_count, num_texts, num_glyphs },
         );
-        core.schedule(.update);
         game.state().fps_timer.reset();
         game.state().frame_count = 0;
     }