Move the frame into draw.zig and the transitions out of layout.zig

Pure moves, no behaviour change. draw.zig holds the whole core frame in
order: render, the pane, tag, header and notice painters it calls, and the
character-effect composition (Pardes.render stays a declaration alias).
Presentation.zig is the panel presentation state as a file struct, and
animation.zig the easing curves, transition kinds, tracks and boxes, the
character effects' sources and the generic displayed-value transition, all
of which lived in layout.zig. layout.zig keeps only layout.

1 files changed, 23 insertions, 22 deletions

diff --git a/src/macos.zig b/src/macos.zig
index 62858887..854b24f8 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -12,6 +12,7 @@ const colors = @import("colors.zig");
 const look = @import("look.zig");
 const message = pardes.Messages.Message;
 const layout = @import("layout.zig");
+const animation = @import("animation.zig");
 const file_watch = @import("file_watch.zig");
 const image = if (pardes.pdf_enabled) @import("image.zig") else struct {};
 const host_io = @import("host_io.zig");
@@ -72,8 +73,8 @@ pub const Scene = extern struct {
     frame: u32 = 0,
 };
 
-pub const PanelBox = layout.Box;
-pub const PanelTrack = layout.Track;
+pub const PanelBox = animation.Box;
+pub const PanelTrack = animation.Track;
 
 pub const Image = extern struct {
     serial: u32,
@@ -117,7 +118,7 @@ const scene_frame_hz: u32 = 60;
 
 const scene_wrap_ns: u64 = 4096 * std.time.ns_per_s;
 
-const max_tick_catch_up_ns: u64 = 4 * pardes.layout.Animation.frame_ns;
+const max_tick_catch_up_ns: u64 = 4 * pardes.animation.Animation.frame_ns;
 const theme_watch_pane: u8 = @intCast(pardes.MAX_PANES);
 const watch_slot_count = pardes.MAX_PANES + 1;
 
@@ -849,7 +850,7 @@ export fn pardes_should_quit() bool {
     return st.core.quit;
 }
 
-fn encodeSceneEffects(effects: layout.SceneEffect) u32 {
+fn encodeSceneEffects(effects: animation.SceneEffect) u32 {
     var flags: u32 = 0;
     if (effects.crt) flags |= scene_flag_crt;
     if (effects.ripple) flags |= scene_flag_ripple;
@@ -869,18 +870,18 @@ const TickSpend = struct { elapsed_ns: u64, steps: u32, bank_ns: u64 };
 
 fn spendTickTime(previous_ns: u64, now_ns: u64, bank_ns: u64) TickSpend {
     const measured = if (previous_ns == 0 or now_ns <= previous_ns)
-        pardes.layout.Animation.frame_ns
+        pardes.animation.Animation.frame_ns
     else
         now_ns - previous_ns;
     const elapsed = @min(measured, max_tick_catch_up_ns);
     var bank = bank_ns +| elapsed;
     var steps: u32 = 0;
-    while (bank >= pardes.layout.Animation.frame_ns) : (steps += 1) bank -= pardes.layout.Animation.frame_ns;
+    while (bank >= pardes.animation.Animation.frame_ns) : (steps += 1) bank -= pardes.animation.Animation.frame_ns;
     return .{ .elapsed_ns = elapsed, .steps = steps, .bank_ns = bank };
 }
 
 test "the animation clock spends real time, not callbacks" {
-    const frame = pardes.layout.Animation.frame_ns;
+    const frame = pardes.animation.Animation.frame_ns;
     const expectEqual = std.testing.expectEqual;
 
     const first = spendTickTime(0, 999 * std.time.ns_per_s, 0);
@@ -2844,21 +2845,21 @@ test "pardes.h matches the Zig boundary" {
     try expectEqual(@as(u32, c.PARDES_SCENE_CRT), scene_flag_crt);
     try expectEqual(@as(u32, c.PARDES_SCENE_RIPPLE), scene_flag_ripple);
     try expectEqual(@as(u32, c.PARDES_SCENE_GLITCH), scene_flag_glitch);
-    try expectEqual(@as(u8, c.PARDES_PANEL_OPENING), @intFromEnum(layout.Phase.opening));
-    try expectEqual(@as(u8, c.PARDES_PANEL_MOVING), @intFromEnum(layout.Phase.moving));
-    try expectEqual(@as(u8, c.PARDES_PANEL_CLOSING), @intFromEnum(layout.Phase.closing));
-    try expectEqual(@as(u8, c.PARDES_PANEL_OFF), @intFromEnum(layout.Transition.off));
-    try expectEqual(@as(u8, c.PARDES_PANEL_SLIDE), @intFromEnum(layout.Transition.slide));
-    try expectEqual(@as(u8, c.PARDES_PANEL_ZOOM), @intFromEnum(layout.Transition.zoom));
-    try expectEqual(@as(u8, c.PARDES_PANEL_DISSOLVE), @intFromEnum(layout.Transition.dissolve));
-    try expectEqual(@as(u8, c.PARDES_PANEL_ASCII), @intFromEnum(layout.Transition.ascii));
-    try expectEqual(@as(u8, c.PARDES_PANEL_VERTICAL), @intFromEnum(layout.Transition.vertical));
-    try expectEqual(@as(u8, c.PARDES_PANEL_EDGES), @intFromEnum(layout.Transition.edges));
-    try expectEqual(@as(u8, c.PARDES_PANEL_FALL), @intFromEnum(layout.Transition.fall));
-    try expectEqual(@as(u8, c.PARDES_PANEL_WAVE), @intFromEnum(layout.Transition.wave));
-    try expectEqual(@as(u8, c.PARDES_PANEL_CURTAIN), @intFromEnum(layout.Transition.curtain));
-    try expectEqual(@as(u8, c.PARDES_PANEL_SCRAMBLE), @intFromEnum(layout.Transition.scramble));
-    try expectEqual(@as(u8, c.PARDES_PANEL_TYPEWRITER), @intFromEnum(layout.Transition.typewriter));
+    try expectEqual(@as(u8, c.PARDES_PANEL_OPENING), @intFromEnum(animation.Phase.opening));
+    try expectEqual(@as(u8, c.PARDES_PANEL_MOVING), @intFromEnum(animation.Phase.moving));
+    try expectEqual(@as(u8, c.PARDES_PANEL_CLOSING), @intFromEnum(animation.Phase.closing));
+    try expectEqual(@as(u8, c.PARDES_PANEL_OFF), @intFromEnum(animation.Transition.off));
+    try expectEqual(@as(u8, c.PARDES_PANEL_SLIDE), @intFromEnum(animation.Transition.slide));
+    try expectEqual(@as(u8, c.PARDES_PANEL_ZOOM), @intFromEnum(animation.Transition.zoom));
+    try expectEqual(@as(u8, c.PARDES_PANEL_DISSOLVE), @intFromEnum(animation.Transition.dissolve));
+    try expectEqual(@as(u8, c.PARDES_PANEL_ASCII), @intFromEnum(animation.Transition.ascii));
+    try expectEqual(@as(u8, c.PARDES_PANEL_VERTICAL), @intFromEnum(animation.Transition.vertical));
+    try expectEqual(@as(u8, c.PARDES_PANEL_EDGES), @intFromEnum(animation.Transition.edges));
+    try expectEqual(@as(u8, c.PARDES_PANEL_FALL), @intFromEnum(animation.Transition.fall));
+    try expectEqual(@as(u8, c.PARDES_PANEL_WAVE), @intFromEnum(animation.Transition.wave));
+    try expectEqual(@as(u8, c.PARDES_PANEL_CURTAIN), @intFromEnum(animation.Transition.curtain));
+    try expectEqual(@as(u8, c.PARDES_PANEL_SCRAMBLE), @intFromEnum(animation.Transition.scramble));
+    try expectEqual(@as(u8, c.PARDES_PANEL_TYPEWRITER), @intFromEnum(animation.Transition.typewriter));
 
     try expectEqual(@as(u21, c.PARDES_KEY_ENTER), pardes.Key.enter);
     try expectEqual(@as(u21, c.PARDES_KEY_ESCAPE), pardes.Key.escape);