Skip to content

Commit

Permalink
[update #103] Screenshot Imgui widget: in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiawl
tiawl committed Jul 29, 2023
1 parent 6c64b44 commit a332fd6
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 42 deletions.
7 changes: 5 additions & 2 deletions src/glfw/context.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ pub const context_glfw = struct
self.?.framebuffer_resized = true;
}

const MIN_WINDOW_WIDTH = 800;
const MIN_WINDOW_HEIGHT = 600;

pub fn init (imgui: *context_imgui, options: opts) !Self
{
var self = Self {};
Expand Down Expand Up @@ -77,8 +80,8 @@ pub const context_glfw = struct

const min = glfw.Window.SizeOptional
{
.width = options.window.width.?,
.height = options.window.height.?,
.width = MIN_WINDOW_WIDTH,
.height = MIN_WINDOW_HEIGHT,
};
const max = glfw.Window.SizeOptional
{
Expand Down
120 changes: 103 additions & 17 deletions src/imgui/context.zig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const std = @import ("std");
const build = @import ("build_options");
const glfw = @import ("glfw");
const vk = @import ("vulkan");
const std = @import ("std");
const build = @import ("build_options");
const glfw = @import ("glfw");
const vk = @import ("vulkan");
const datetime = @import ("datetime").datetime;

const utils = @import ("../utils.zig");
const log_app = utils.log_app;
Expand Down Expand Up @@ -58,6 +59,7 @@ pub const context_imgui = struct
InitVulkanFailure,
CreateFontsTextureFailure,
BeginFailure,
NoAvailableFilename,
};

glfw_win_pos: glfw.Window.Pos = undefined,
Expand Down Expand Up @@ -180,12 +182,8 @@ pub const context_imgui = struct
try log_app ("init Imgui Vulkan OK", severity.DEBUG, .{});
}

pub fn prepare (self: *Self, last_displayed_fps: *?std.time.Instant, fps: *f32, framebuffer: struct { width: u32, height: u32, }, tweak_me: anytype) !void
fn prepare_pane (self: *Self, framebuffer: struct { width: u32, height: u32, }) !void
{
imgui.igImGui_ImplVulkan_NewFrame ();
imgui.igImGui_ImplGlfw_NewFrame ();
imgui.igNewFrame ();

if (framebuffer.height != self.glfw_win_size.height)
{
self.glfw_win_size.height = framebuffer.height;
Expand All @@ -208,13 +206,11 @@ pub const context_imgui = struct

self.init_window = true;
}
}

const window_flags = imgui.ImGuiWindowFlags_NoTitleBar | imgui.ImGuiWindowFlags_NoCollapse | imgui.ImGuiWindowFlags_NoResize | imgui.ImGuiWindowFlags_NoMove;

if (!imgui.igBegin ("Tweaker", null, window_flags))
{
return ImguiContextError.BeginFailure;
}
fn prepare_fps (self: Self, last_displayed_fps: *?std.time.Instant, fps: *f32) !void
{
_ = self;

if (last_displayed_fps.* == null or (try std.time.Instant.now ()).since (last_displayed_fps.*.?) > std.time.ns_per_s)
{
Expand All @@ -223,9 +219,11 @@ pub const context_imgui = struct
}

imgui.igText ("Average %.3f ms/frame (%.1f FPS)", 1000.0 / fps.*, fps.*);
}

// Return a boolean depending on the fact that the value of the variable changed or not
//_ = imgui.igSliderFloat ("Float", tweak_me.f, 0.0, 1.0, "%.3f", 0);
fn prepare_seed (self: Self, tweak_me: anytype) void
{
_ = self;

const button_size = imgui.ImVec2 { .x = 0, .y = 0, };

Expand All @@ -235,6 +233,94 @@ pub const context_imgui = struct
imgui.igSameLine (0.0, -1.0);
imgui.igText ("%u", tweak_me.seed.*);
}
}

fn find_available_filename (self: Self, allocator: std.mem.Allocator) ![] const u8
{
_ = self;

var screenshots_dir = std.fs.cwd ().openDir ("screenshots", .{}) catch |err| blk:
{
if (err == std.fs.Dir.OpenError.FileNotFound)
{
try std.fs.cwd ().makeDir ("screenshots");
break :blk try std.fs.cwd ().openDir ("screenshots", .{});
} else {
return err;
}
};
defer screenshots_dir.close ();

const now = datetime.Datetime.now ();
const date = try now.formatISO8601 (allocator, true);
var id: u32 = 0;
var filename: [] const u8 = undefined;
var file: std.fs.File = undefined;
var available = false;

while (id < std.math.maxInt (u32))
{
filename = try std.fmt.allocPrint (allocator, "{s}-{d}", .{ date, id, });
file = screenshots_dir.openFile (filename, .{}) catch |err|
{
if (err == std.fs.File.OpenError.FileNotFound)
{
available = true;
break;
} else {
return err;
}
};
file.close ();
id += 1;
}

if (!available)
{
return ImguiContextError.NoAvailableFilename;
}

return filename;
}

fn prepare_screenshot (self: Self, allocator: std.mem.Allocator) !void
{
const button_size = imgui.ImVec2 { .x = 0, .y = 0, };

// TODO: display window size
if (imgui.igButton ("Take a screenshot", button_size))
{
const filename = try self.find_available_filename (allocator);
std.debug.print ("FILE = {s}\n", .{ filename });
// TODO: 2023-07-29T15:50:52.362000+00:00-0

// TODO: make the screenshot
}
}

pub fn prepare (self: *Self, allocator: std.mem.Allocator, last_displayed_fps: *?std.time.Instant, fps: *f32, framebuffer: struct { width: u32, height: u32, }, tweak_me: anytype) !void
{
imgui.igImGui_ImplVulkan_NewFrame ();
imgui.igImGui_ImplGlfw_NewFrame ();
imgui.igNewFrame ();

try self.prepare_pane (.{ .width = framebuffer.width, .height = framebuffer.height, });

const window_flags = imgui.ImGuiWindowFlags_NoTitleBar | imgui.ImGuiWindowFlags_NoCollapse | imgui.ImGuiWindowFlags_NoResize | imgui.ImGuiWindowFlags_NoMove;

if (!imgui.igBegin ("Tweaker", null, window_flags))
{
return ImguiContextError.BeginFailure;
}

try self.prepare_fps (last_displayed_fps, fps);
self.prepare_seed (tweak_me);
try self.prepare_screenshot (allocator);

// Return a boolean depending on the fact that the value of the variable changed or not
//_ = imgui.igSliderFloat ("Float", tweak_me.f, 0.0, 1.0, "%.3f", 0);


imgui.igEnd ();

imgui.igRender ();
Expand Down
42 changes: 21 additions & 21 deletions src/main.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@ fn init_logfile () !void
if (build.LOG_LEVEL > @intFromEnum (profile.TURBO) and build.LOG_DIR.len > 0)
{
var dir = std.fs.cwd ().openDir (LOG_DIR, .{}) catch |err|
{
if (err == std.fs.File.OpenError.FileNotFound)
{
try log_app ("{s} does not exist, impossible to log execution.", severity.ERROR, .{ LOG_DIR });
}
return err;
};
{
if (err == std.fs.File.OpenError.FileNotFound)
{
try log_app ("{s} does not exist, impossible to log execution.", severity.ERROR, .{ LOG_DIR });
}
return err;
};

defer dir.close ();

const file = std.fs.cwd ().openFile (log_file, .{}) catch |open_err| blk:
{
if (open_err != std.fs.File.OpenError.FileNotFound)
{
try log_app ("failed to open log file", severity.ERROR, .{});
return open_err;
} else {
const cfile = std.fs.cwd ().createFile (log_file, .{}) catch |create_err|
{
try log_app ("failed to create log file", severity.ERROR, .{});
return create_err;
};
break :blk cfile;
}
};
{
if (open_err != std.fs.File.OpenError.FileNotFound)
{
try log_app ("failed to open log file", severity.ERROR, .{});
return open_err;
} else {
const cfile = std.fs.cwd ().createFile (log_file, .{}) catch |create_err|
{
try log_app ("failed to create log file", severity.ERROR, .{});
return create_err;
};
break :blk cfile;
}
};

defer file.close ();
}
Expand Down
5 changes: 3 additions & 2 deletions src/vk/context.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,8 @@ pub const context_vk = struct
.image_usage = vk.ImageUsageFlags
{
.color_attachment_bit = true,
.transfer_dst_bit = true
.transfer_src_bit = true,
.transfer_dst_bit = true,
},
.image_sharing_mode = if (self.candidate.graphics_family != self.candidate.present_family) .concurrent else .exclusive,
.queue_family_index_count = if (self.candidate.graphics_family != self.candidate.present_family) queue_family_indices.len else 0,
Expand Down Expand Up @@ -1852,7 +1853,7 @@ pub const context_vk = struct
_ = try self.device_dispatch.waitForFences (self.logical_device, 1, &[_] vk.Fence { self.in_flight_fences [self.current_frame] }, vk.TRUE, std.math.maxInt (u64));

const seed_before = options.seed;
try imgui.prepare (&(self.last_displayed_fps), &(self.fps), .{ .width = framebuffer.width, .height = framebuffer.height, },
try imgui.prepare (allocator.*, &(self.last_displayed_fps), &(self.fps), .{ .width = framebuffer.width, .height = framebuffer.height, },
.{
.seed = &(options.seed),
});
Expand Down

0 comments on commit a332fd6

Please sign in to comment.