Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/foxnne/pixi
Browse files Browse the repository at this point in the history
  • Loading branch information
foxnne committed Jan 9, 2025
2 parents cc424ec + f764a94 commit 4ec1215
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/Pixi.zig
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ pub fn tick(app_mod: mach.Mod(App), editor_mod: mach.Mod(Editor)) !void {
}
}

// Process events
while (core.nextEvent()) |event| {
switch (event) {
.window_open => {
Expand Down Expand Up @@ -331,15 +332,19 @@ pub fn tick(app_mod: mach.Mod(App), editor_mod: mach.Mod(Editor)) !void {
}
var window = core.windows.getValue(app.window);

// New imgui frame
try imgui_mach.newFrame();
imgui.newFrame();
app.delta_time = app.timer.lap();
app.total_time += app.delta_time;

// Process input
try input.process();

// Process editor tick
editor_mod.call(.tick);

// Render imgui
imgui.render();

// TODO: Fix title when mach supports it
Expand Down Expand Up @@ -406,7 +411,6 @@ pub fn tick(app_mod: mach.Mod(App), editor_mod: mach.Mod(Editor)) !void {
if (file.transform_texture) |*transform_texture| {
if (transform_texture.confirm) {
// Blit temp layer to selected layer

if (file.transform_staging_buffer) |staging_buffer| {
const buffer_size: usize = @as(usize, @intCast(file.width * file.height));

Expand Down

0 comments on commit 4ec1215

Please sign in to comment.