Merge pull request #1755 from mitchellh/imgui

update Dear Imgui for Inspector to 1.90.6
This commit is contained in:
Mitchell Hashimoto
2024-05-10 10:25:28 -07:00
committed by GitHub
6 changed files with 10381 additions and 8015 deletions

View File

@ -1,3 +1,3 @@
# This file is auto-generated! check build-support/check-zig-cache-hash.sh for # This file is auto-generated! check build-support/check-zig-cache-hash.sh for
# more details. # more details.
"sha256-7V+aNCAxC+9GCSJAKOtQN+ho+gVsheLmzbQPNlNzbp4=" "sha256-JfFdQlfgaoreHmSbyujDFVPPgbAIL1VktGvs/woUgKk="

View File

@ -6,8 +6,8 @@
// This should be kept in sync with the submodule in the cimgui source // This should be kept in sync with the submodule in the cimgui source
// code to be safe that they're compatible. // code to be safe that they're compatible.
.imgui = .{ .imgui = .{
.url = "https://github.com/ocornut/imgui/archive/1d8e48c161370c37628c4f37f3f87cb19fbcb723.tar.gz", .url = "https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz",
.hash = "12205e93e208aada4c835acdc3e2c1fac95b3ad92b47abe6412ab043f9f13817ad9b", .hash = "1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402",
}, },
.apple_sdk = .{ .path = "../apple-sdk" }, .apple_sdk = .{ .path = "../apple-sdk" },

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1116,7 +1116,7 @@ pub const Inspector = struct {
}; };
pub fn init(surface: *Surface) !Inspector { pub fn init(surface: *Surface) !Inspector {
const ig_ctx = cimgui.c.igCreateContext(null); const ig_ctx = cimgui.c.igCreateContext(null) orelse return error.OutOfMemory;
errdefer cimgui.c.igDestroyContext(ig_ctx); errdefer cimgui.c.igDestroyContext(ig_ctx);
cimgui.c.igSetCurrentContext(ig_ctx); cimgui.c.igSetCurrentContext(ig_ctx);
const io: *cimgui.c.ImGuiIO = cimgui.c.igGetIO(); const io: *cimgui.c.ImGuiIO = cimgui.c.igGetIO();

View File

@ -29,7 +29,7 @@ instant: ?std.time.Instant = null,
pub fn init(self: *ImguiWidget) !void { pub fn init(self: *ImguiWidget) !void {
// Each widget gets its own imgui context so we can have multiple // Each widget gets its own imgui context so we can have multiple
// imgui views in the same application. // imgui views in the same application.
const ig_ctx = cimgui.c.igCreateContext(null); const ig_ctx = cimgui.c.igCreateContext(null) orelse return error.OutOfMemory;
errdefer cimgui.c.igDestroyContext(ig_ctx); errdefer cimgui.c.igDestroyContext(ig_ctx);
cimgui.c.igSetCurrentContext(ig_ctx); cimgui.c.igSetCurrentContext(ig_ctx);
const io: *cimgui.c.ImGuiIO = cimgui.c.igGetIO(); const io: *cimgui.c.ImGuiIO = cimgui.c.igGetIO();