bump wgpu 0.27

new api

Author: benmkw

Cargo.toml

@@ -9,7 +9,7 @@ categories = ["gui", "api-bindings"]
 readme = "README.md"
 
 [dependencies]
-imnodes-sys = { version = "0.5.0", path = "imnodes-sys" }
+imnodes-sys = { version = "0.6.0", path = "imnodes-sys" }
 imgui = "0.12"
 
 [features]

README.md

@@ -19,41 +19,33 @@ They are inspsired by [implot-rs](https://github.com/4bb4/implot-rs).
 ## TODO/ Ideas
 
 - add example with salsa or some other incremental computation lib
-- IO
-  - all Mouse/ Modifier helpers
-
-nice to have:
-
-- use Serde to make it possible to declare graphs and render them
-  - load and save as well using imnode_* functions
-- add comments to everything
-  - figure out good descriptions of coordinate systems
-- review types in unsafe code
-  - especially -> &mut sys::Style
 
 ## Example (see `imnodes-wgpu-examples/src/hello_world.rs`)
 
 ```rust
-fn show(ui: &imgui::Ui, context: &mut imnodes::EditorContext) {
+pub fn show<'a>(ui: &imgui::Ui, context: &mut imnodes::EditorContext<'a>) {
     let mut id_generator = context.new_identifier_generator();
 
     imnodes::editor(context, |mut editor| {
         editor.add_node(id_generator.next_node(), |mut node| {
             node.add_titlebar(|| ui.text("simple node :)"));
-
             node.add_input(
-                id_generator.next_input_pin(),
-                imnodes::PinShape::Circle,
+                &imnodes::InputAttributeDesc {
+                    id: id_generator.next_input_pin(),
+                    shape: imnodes::PinShape::Circle,
+                },
                 || ui.text("input"),
             );
-
             node.add_output(
-                id_generator.next_output_pin(),
-                imnodes::PinShape::QuadFilled,
+                &imnodes::OutputAttributeDesc {
+                    id: id_generator.next_output_pin(),
+                    shape: imnodes::PinShape::QuadFilled,
+                },
                 || ui.text("output"),
             );
         });
     });
 }
-
 ```
+
+If you are looking for a pure rust gui node editor:  <https://github.com/emilk/egui/discussions/166>

imnodes-sys-bindgen/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "imnodes-sys-bindgen"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Benedikt Mandelkow"]
 edition = "2024"
 
 [dependencies]
-bindgen = "0.71.1"
+bindgen = "0.72.1"
 imgui-sys = "0.12"

imnodes-sys-bindgen/src/main.rs

@@ -3,8 +3,11 @@
 // to git so people don't have to install clang just to use imnodes-rs.
 
 fn main() {
-    let cwd = std::env::current_dir().expect("Could not read current directory");
-    let sys_crate_path = cwd
+    // Use CARGO_MANIFEST_DIR to find the workspace root reliably
+    let manifest_dir = std::path::PathBuf::from(
+        std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"),
+    );
+    let sys_crate_path = manifest_dir
         .join("..")
         .join("imnodes-sys")
         .canonicalize()
@@ -14,23 +17,19 @@ fn main() {
         std::env::var_os("DEP_IMGUI_THIRD_PARTY").expect("DEP_IMGUI_THIRD_PARTY not defined"),
     );
 
+    let cimnodes_include_path = sys_crate_path.join("third-party").join("cimnodes");
+
+    let imvec2_c_path = sys_crate_path.join("third-party").join("imvec2_c.h");
+
     let bindings = bindgen::Builder::default()
-        .header(
-            cimgui_include_path
-                .join("cimgui.h")
-                .to_str()
-                .expect("Could not convert cimgui.h path to string"),
-        )
-        .header(
-            sys_crate_path
-                .join("third-party")
-                .join("cimnodes")
-                .join("cimnodes.h")
-                .to_str()
-                .expect("Could not turn cimnodes.h path into string"),
-        )
         // https://github.com/rust-lang/rust-bindgen/issues/1533
         .clang_arg(format!("-I{}", cimgui_include_path.to_str().unwrap()))
+        .clang_arg(format!("-I{}", cimnodes_include_path.to_str().unwrap()))
+        // Force-include ImVec2_c definition before any cimnodes headers.
+        // The cimnodes generator expects cimgui to define ImVec2_c, but imgui-sys's
+        // cimgui uses ImVec2 instead. This header bridges the gap.
+        .clang_arg(format!("-include{}", imvec2_c_path.to_str().unwrap()))
+        .header(cimnodes_include_path.join("cimnodes.h").to_str().unwrap())
         .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         .clang_arg("-DCIMGUI_DEFINE_ENUMS_AND_STRUCTS=1")
         .allowlist_function("imnodes_.*")

imnodes-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "imnodes-sys"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2024"
 authors = ["Benedikt Mandelkow", "imnodes-rs contributors"]
 description = "Raw FFI bindings to imnodes"
@@ -13,4 +13,4 @@ links = "imnodes"
 imgui-sys = "0.12"
 
 [build-dependencies]
-cc = "1.2.19"
+cc = "1.2.49"

imnodes-sys/build.rs

@@ -47,6 +47,12 @@ fn main() -> io::Result<()> {
         .include(&cimgui_include_path)
         .include(&imgui_include_path)
         .include("third-party/cimnodes/imnodes/")
+        .include("third-party/")
+        // Force-include ImVec2_c definition before any cimnodes headers.
+        // The cimnodes generator expects cimgui to define ImVec2_c, but imgui-sys's
+        // cimgui uses ImVec2 instead. This header bridges the gap.
+        .flag("-include")
+        .flag("third-party/imvec2_c.h")
         .warnings(false)
         .cpp(true)
         .flag("-std=c++11")

imnodes-sys/src/bindings.rs

@@ -1,25 +1,25 @@
-/* automatically generated by rust-bindgen 0.71.1 */
+/* automatically generated by rust-bindgen 0.72.1 */
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct ImGuiContext {
-    _unused: [u8; 0],
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct ImVec2 {
+pub struct ImVec2_c {
     pub x: f32,
     pub y: f32,
 }
 #[allow(clippy::unnecessary_operation, clippy::identity_op)]
 const _: () = {
-    ["Size of ImVec2"][::std::mem::size_of::<ImVec2>() - 8usize];
-    ["Alignment of ImVec2"][::std::mem::align_of::<ImVec2>() - 4usize];
-    ["Offset of field: ImVec2::x"][::std::mem::offset_of!(ImVec2, x) - 0usize];
-    ["Offset of field: ImVec2::y"][::std::mem::offset_of!(ImVec2, y) - 4usize];
+    ["Size of ImVec2_c"][::std::mem::size_of::<ImVec2_c>() - 8usize];
+    ["Alignment of ImVec2_c"][::std::mem::align_of::<ImVec2_c>() - 4usize];
+    ["Offset of field: ImVec2_c::x"][::std::mem::offset_of!(ImVec2_c, x) - 0usize];
+    ["Offset of field: ImVec2_c::y"][::std::mem::offset_of!(ImVec2_c, y) - 4usize];
 };
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
+pub struct ImGuiContext {
+    _unused: [u8; 0],
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
 pub struct ImNodesContext {
     _unused: [u8; 0],
 }
@@ -170,7 +170,7 @@ const _: () = {
 pub struct ImNodesStyle {
     pub GridSpacing: f32,
     pub NodeCornerRounding: f32,
-    pub NodePadding: ImVec2,
+    pub NodePadding: ImVec2_c,
     pub NodeBorderThickness: f32,
     pub LinkThickness: f32,
     pub LinkLineSegmentsPerLength: f32,
@@ -181,8 +181,8 @@ pub struct ImNodesStyle {
     pub PinLineThickness: f32,
     pub PinHoverRadius: f32,
     pub PinOffset: f32,
-    pub MiniMapPadding: ImVec2,
-    pub MiniMapOffset: ImVec2,
+    pub MiniMapPadding: ImVec2_c,
+    pub MiniMapOffset: ImVec2_c,
     pub Flags: ImNodesStyleFlags,
     pub Colors: [::std::os::raw::c_uint; 29usize],
 }
@@ -270,10 +270,10 @@ unsafe extern "C" {
     pub fn imnodes_EditorContextSet(noname1: *mut ImNodesEditorContext);
 }
 unsafe extern "C" {
-    pub fn imnodes_EditorContextGetPanning(pOut: *mut ImVec2);
+    pub fn imnodes_EditorContextGetPanning() -> ImVec2_c;
 }
 unsafe extern "C" {
-    pub fn imnodes_EditorContextResetPanning(pos: ImVec2);
+    pub fn imnodes_EditorContextResetPanning(pos: ImVec2_c);
 }
 unsafe extern "C" {
     pub fn imnodes_EditorContextMoveToNode(node_id: ::std::os::raw::c_int);
@@ -317,7 +317,7 @@ unsafe extern "C" {
     pub fn imnodes_PushStyleVar_Float(style_item: ImNodesStyleVar, value: f32);
 }
 unsafe extern "C" {
-    pub fn imnodes_PushStyleVar_Vec2(style_item: ImNodesStyleVar, value: ImVec2);
+    pub fn imnodes_PushStyleVar_Vec2(style_item: ImNodesStyleVar, value: ImVec2_c);
 }
 unsafe extern "C" {
     pub fn imnodes_PopStyleVar(count: ::std::os::raw::c_int);
@@ -329,7 +329,7 @@ unsafe extern "C" {
     pub fn imnodes_EndNode();
 }
 unsafe extern "C" {
-    pub fn imnodes_GetNodeDimensions(pOut: *mut ImVec2, id: ::std::os::raw::c_int);
+    pub fn imnodes_GetNodeDimensions(id: ::std::os::raw::c_int) -> ImVec2_c;
 }
 unsafe extern "C" {
     pub fn imnodes_BeginNodeTitleBar();
@@ -372,22 +372,28 @@ unsafe extern "C" {
     pub fn imnodes_SetNodeDraggable(node_id: ::std::os::raw::c_int, draggable: bool);
 }
 unsafe extern "C" {
-    pub fn imnodes_SetNodeScreenSpacePos(node_id: ::std::os::raw::c_int, screen_space_pos: ImVec2);
+    pub fn imnodes_SetNodeScreenSpacePos(
+        node_id: ::std::os::raw::c_int,
+        screen_space_pos: ImVec2_c,
+    );
 }
 unsafe extern "C" {
-    pub fn imnodes_SetNodeEditorSpacePos(node_id: ::std::os::raw::c_int, editor_space_pos: ImVec2);
+    pub fn imnodes_SetNodeEditorSpacePos(
+        node_id: ::std::os::raw::c_int,
+        editor_space_pos: ImVec2_c,
+    );
 }
 unsafe extern "C" {
-    pub fn imnodes_SetNodeGridSpacePos(node_id: ::std::os::raw::c_int, grid_pos: ImVec2);
+    pub fn imnodes_SetNodeGridSpacePos(node_id: ::std::os::raw::c_int, grid_pos: ImVec2_c);
 }
 unsafe extern "C" {
-    pub fn imnodes_GetNodeScreenSpacePos(pOut: *mut ImVec2, node_id: ::std::os::raw::c_int);
+    pub fn imnodes_GetNodeScreenSpacePos(node_id: ::std::os::raw::c_int) -> ImVec2_c;
 }
 unsafe extern "C" {
-    pub fn imnodes_GetNodeEditorSpacePos(pOut: *mut ImVec2, node_id: ::std::os::raw::c_int);
+    pub fn imnodes_GetNodeEditorSpacePos(node_id: ::std::os::raw::c_int) -> ImVec2_c;
 }
 unsafe extern "C" {
-    pub fn imnodes_GetNodeGridSpacePos(pOut: *mut ImVec2, node_id: ::std::os::raw::c_int);
+    pub fn imnodes_GetNodeGridSpacePos(node_id: ::std::os::raw::c_int) -> ImVec2_c;
 }
 unsafe extern "C" {
     pub fn imnodes_SnapNodeToGrid(node_id: ::std::os::raw::c_int);

imnodes-sys/third-party/cimnodes

@@ -0,0 +1,26 @@
+// ImVec2_c definition for cimnodes compatibility
+//
+// The cimnodes generator expects cimgui to be a sibling folder and uses
+// its `ImVec2_c` type. When using standalone with imgui-sys (which uses
+// a different cimgui version that defines ImVec2 instead), we need to
+// provide this definition.
+//
+// This header should be included before cimnodes.h
+
+#ifndef IMVEC2_C_H
+#define IMVEC2_C_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ImVec2_c {
+    float x;
+    float y;
+} ImVec2_c;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // IMVEC2_C_H

imnodes-sys/third-party/imvec2_c.h

@@ -1,6 +1,6 @@
 [package]
 name = "imnodes-wgpu-examples"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
     "Benedikt Mandelkow <benedikt.mandelkow@rwth-aachen.de>",
     "imgui-wgpu contributors",
@@ -10,9 +10,10 @@ edition = "2024"
 [dependencies]
 imnodes = { path = "../" }
 
-wgpu = "25.0.0"
+wgpu = "27.0.1"
 winit = "0.30"
 futures = "0.3.31"
 imgui = "0.12"
 imgui-winit-support = "0.13"
-imgui-wgpu = "0.25"
+# imgui-wgpu = "0.25"
+imgui-wgpu = { git = "https://github.com/Yatekii/imgui-wgpu-rs", rev = "3db5c5ad6a63f46428d836e34b1f4557ded0b6b4" }