diff --git a/README.md b/README.md index 289f2e1..a894e09 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,14 @@ This project aims to simply and easily build [Dear ImGui](https://github.com/oco [(CImGui)](https://github.com/cimgui/cimgui) / [ImPlot](https://github.com/epezent/implot) [(CImPlot)](https://github.com/cimgui/cimplot) examples in Zig language with less external dependencies. -ImGui/CimGui version **1.91.3dock** (2024/10) +ImGui / CImGui version **1.91.4dock** (2024/10) - Features - Included [Font Awesome](https://fontawesome.com/search?m=free&o=r) Icon fonts. ![alt](img/icon_font.png) - - Included GLFW 3.3.9 static library - - Included SDL2/SDL3 libraries - - Inlcuded STB libraries (only stb_image) + - Included GLFW 3.3.9 static library (for Windows) + - Included SDL2/SDL3 libraries (for Windows) + - Included STB libraries (only stb_image) - Available [ImPlot](https://github.com/epezent/implot) [(CImPlot)](https://github.com/cimgui/cimplot) with `ImDrawIdx="unsigned int"` - Enabled Input method \(IME\) flag with `IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS` @@ -56,8 +56,8 @@ ImGui/CimGui version **1.91.3dock** (2024/10) --- -- Zig version -Now using zig-windows-x86_64-0.14.0-dev.1743 +- Zig version, now using +Zig: 0.14.0-dev.1954+2d888a8e6 Probably [zig-windows-x86_64-0.14.0-dev.xxxx+yyyy...](https://ziglang.org/download/) might be ok. (-:) - WindowsOS - Windows10 or later diff --git a/examples/glfw_opengl3_image_load/src/main.zig b/examples/glfw_opengl3_image_load/src/main.zig index 431e879..5771c3a 100644 --- a/examples/glfw_opengl3_image_load/src/main.zig +++ b/examples/glfw_opengl3_image_load/src/main.zig @@ -281,7 +281,7 @@ pub fn main () !void { const uv1 = ig.ImVec2 {.x = 1, .y = 1}; const tint_col = ig.ImVec4 {.x = 1, .y = 1, .z = 1, .w = 1}; const border_col = ig.ImVec4 {.x = 0, .y = 0, .z = 0, .w = 0}; - ig.igImage(@ptrFromInt(textureId), size, uv0, uv1, tint_col, border_col); + ig.igImage(@intCast(textureId), size, uv0, uv1, tint_col, border_col); } //----------- diff --git a/examples/imPlotDemo/src/demoAll.zig b/examples/imPlotDemo/src/demoAll.zig index 64a928d..b12ca80 100644 --- a/examples/imPlotDemo/src/demoAll.zig +++ b/examples/imPlotDemo/src/demoAll.zig @@ -1059,7 +1059,7 @@ fn demo_Images() !void { if (ip.ImPlot_BeginPlot("##image", .{ .x = -1, .y = 0 }, 0)) { //ip.ImPlot_PlotImage("my image",ig.igGetIO().*.Fonts.*.TexID, st.bmin, st.bmax, st.uv0, st.uv1, st.tint, 0); // TODO - ip.ImPlot_PlotImage("my image", @ptrFromInt(st.textureId) + ip.ImPlot_PlotImage("my image", @intCast(st.textureId) , .{.x = st.bmin.x, .y = st.bmin.y} //st.bmin , .{.x = st.bmax.x, .y = st.bmax.y} //st.bmin , .{.x = st.uv0.x, .y = st.uv0.y} //st.bmin diff --git a/libs/cimgui b/libs/cimgui index 8268b67..7640b00 160000 --- a/libs/cimgui +++ b/libs/cimgui @@ -1 +1 @@ -Subproject commit 8268b6748b40d38d08df75c15af46024f90cd7d9 +Subproject commit 7640b00d27e8f7970b496b0cb68a536390d762d9 diff --git a/libs/cimplot b/libs/cimplot index 439f705..408a20b 160000 --- a/libs/cimplot +++ b/libs/cimplot @@ -1 +1 @@ -Subproject commit 439f705b1cfae0e9fbe42c13ab5b45becc47d404 +Subproject commit 408a20b58c490a291a64c96192382f59ef474d7e