Skip to content

Commit

Permalink
Update to ImGui / CImGui 1.91.4dock
Browse files Browse the repository at this point in the history
  • Loading branch information
dinau committed Oct 23, 2024
1 parent 75416cc commit b13d3b2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/glfw_opengl3_image_load/src/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

//-----------
Expand Down
2 changes: 1 addition & 1 deletion examples/imPlotDemo/src/demoAll.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/cimplot
Submodule cimplot updated 1 files
+0 −2 cimplot.h

0 comments on commit b13d3b2

Please sign in to comment.