elias/egui_node_graph
1
0
Fork 0
mirror of https://github.com/eliasstepanik/egui_node_graph.git synced 2026-01-11 05:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts and update to latest main

Browse Source
This commit is contained in:
Setzer22 2022-05-24 11:48:19 +02:00
commit 84884f05a9
6 changed files with 97 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
egui_node_graph/Cargo.toml
View File

@ -15,7 +15,7 @@ workspace = ".."
persistence = ["serde", "slotmap/serde", "smallvec/serde", "egui/persistence"]
[dependencies]
egui = { version = "0.16" }
egui = { version = "0.18" }
slotmap = { version = "1.0" }
smallvec = { version = "1.7.0" }
serde = { version = "1.0", optional = true, features = ["derive"] }

104
egui_node_graph/src/editor_ui.rs
View File

@ -60,11 +60,17 @@ where
#[must_use]
pub fn draw_graph_editor(
&mut self,
ctx: &CtxRef,
ui: &mut Ui,
all_kinds: impl NodeTemplateIter<Item = NodeTemplate>,
) -> GraphResponse<UserResponse> {
let mouse = &ctx.input().pointer;
let cursor_pos = mouse.hover_pos().unwrap_or(Pos2::ZERO);
// This causes the graph editor to use as much free space as it can.
// (so for windows it will use up to the resizeably set limit
// and for a Panel it will fill it completely)
let editor_rect = ui.max_rect();
ui.allocate_rect(editor_rect, Sense::hover());
let cursor_pos = ui.ctx().input().pointer.hover_pos().unwrap_or(Pos2::ZERO);
let mut cursor_in_editor = editor_rect.contains(cursor_pos);
// Gets filled with the port locations as nodes are drawn
let mut port_locations = PortLocations::new();
@ -83,32 +89,30 @@ where
inconsistent self. It has either more or less values than the graph."
);
CentralPanel::default().show(ctx, |ui| {
/* Draw nodes */
for node_id in self.node_order.iter().copied() {
let responses = GraphNodeWidget {
position: self.node_positions.get_mut(node_id).unwrap(),
graph: &mut self.graph,
port_locations: &mut port_locations,
node_id,
ongoing_drag: self.connection_in_progress,
selected: self
.selected_node
.map(|selected| selected == node_id)
.unwrap_or(false),
pan: self.pan_zoom.pan,
}
/* Draw nodes */
for node_id in self.node_order.iter().copied() {
let responses = GraphNodeWidget {
position: self.node_positions.get_mut(node_id).unwrap(),
graph: &mut self.graph,
port_locations: &mut port_locations,
node_id,
ongoing_drag: self.connection_in_progress,
selected: self
.selected_node
.map(|selected| selected == node_id)
.unwrap_or(false),
pan: self.pan_zoom.pan + editor_rect.min.to_vec2(),
}
.show(ui, &self.user_state);
// Actions executed later
delayed_responses.extend(responses);
}
// Actions executed later
delayed_responses.extend(responses);
}
let r = ui.allocate_rect(ui.min_rect(), Sense::click());
if r.clicked() {
click_on_background = true;
}
});
let r = ui.allocate_rect(ui.min_rect(), Sense::click());
if r.clicked() {
click_on_background = true;
}
/* Draw the node finder, if open */
let mut should_close_node_finder = false;
@ -117,20 +121,28 @@ where
if let Some(pos) = node_finder.position {
node_finder_area = node_finder_area.current_pos(pos);
}
node_finder_area.show(ctx, |ui| {
node_finder_area.show(ui.ctx(), |ui| {
if let Some(node_kind) = node_finder.show(ui, all_kinds) {
let new_node = self.graph.add_node(
node_kind.node_graph_label(),
node_kind.user_data(),
|graph, node_id| node_kind.build_node(graph, node_id),
);
self.node_positions
.insert(new_node, cursor_pos - self.pan_zoom.pan);
self.node_positions.insert(
new_node,
cursor_pos - self.pan_zoom.pan - editor_rect.min.to_vec2()
);
self.node_order.push(new_node);
should_close_node_finder = true;
delayed_responses.push(NodeResponse::CreatedNode(new_node));
}
let finder_rect = ui.max_rect();
// If the cursor is not in the main editor, check if the cursor *is* in the finder
// if the cursor is in the finder, then we can consider that also in the editor.
if !cursor_in_editor && finder_rect.contains(cursor_pos){
cursor_in_editor = true;
}
});
}
if should_close_node_finder {
@ -144,16 +156,14 @@ where
};
if let Some((_, ref locator)) = self.connection_in_progress {
let painter = ctx.layer_painter(LayerId::background());
let start_pos = port_locations[locator];
painter.line_segment([start_pos, cursor_pos], connection_stroke)
ui.painter().line_segment([start_pos, cursor_pos], connection_stroke)
}
for (input, output) in self.graph.iter_connections() {
let painter = ctx.layer_painter(LayerId::background());
let src_pos = port_locations[&AnyParameterId::Output(output)];
let dst_pos = port_locations[&AnyParameterId::Input(input)];
painter.line_segment([src_pos, dst_pos], connection_stroke);
ui.painter().line_segment([src_pos, dst_pos], connection_stroke);
}
/* Handle responses from drawing nodes */
@ -224,22 +234,27 @@ where
/* Mouse input handling */
// This locks the context, so don't hold on to it for too long.
let mouse = &ui.ctx().input().pointer;
if mouse.any_released() && self.connection_in_progress.is_some() {
self.connection_in_progress = None;
}
if mouse.button_down(PointerButton::Secondary) {
if mouse.button_down(PointerButton::Secondary) && cursor_in_editor{
self.node_finder = Some(NodeFinder::new_at(cursor_pos));
}
if ctx.input().key_pressed(Key::Escape) {
if ui.ctx().input().key_pressed(Key::Escape) {
self.node_finder = None;
}
if ctx.input().pointer.middle_down() {
self.pan_zoom.pan += ctx.input().pointer.delta();
if ui.ctx().input().pointer.middle_down() {
self.pan_zoom.pan += ui.ctx().input().pointer.delta();
}
if click_on_background {
// Deselect and deactivate finder if the editor backround is clicked,
// *or* if the the mouse clicks off the ui
if click_on_background || (mouse.any_click() && !cursor_in_editor){
self.selected_node = None;
self.node_finder = None;
}
@ -467,25 +482,26 @@ where
// does not support drawing rectangles with asymmetrical round corners.
let (shape, outline) = {
let corner_radius = 4.0;
let rounding_radius = 4.0;
let rounding = Rounding::same(rounding_radius);
let titlebar_height = title_height + margin.y;
let titlebar_rect =
Rect::from_min_size(outer_rect.min, vec2(outer_rect.width(), titlebar_height));
let titlebar = Shape::Rect(RectShape {
rect: titlebar_rect,
corner_radius,
rounding,
fill: titlebar_color,
stroke: Stroke::none(),
});
let body_rect = Rect::from_min_size(
outer_rect.min + vec2(0.0, titlebar_height - corner_radius),
outer_rect.min + vec2(0.0, titlebar_height - rounding_radius),
vec2(outer_rect.width(), outer_rect.height() - titlebar_height),
);
let body = Shape::Rect(RectShape {
rect: body_rect,
corner_radius: 0.0,
rounding: Rounding::none(),
fill: background_color,
stroke: Stroke::none(),
});
@ -496,7 +512,7 @@ where
);
let bottom_body = Shape::Rect(RectShape {
rect: bottom_body_rect,
corner_radius,
rounding,
fill: background_color,
stroke: Stroke::none(),
});
@ -507,7 +523,7 @@ where
.union(body_rect)
.union(bottom_body_rect)
.expand(1.0),
corner_radius: 4.0,
rounding,
fill: Color32::WHITE.lighten(0.8),
stroke: Stroke::none(),
})

26
egui_node_graph/src/node_finder.rs
View File

@ -41,7 +41,7 @@ where
let frame = Frame::dark_canvas(ui.style())
.fill(background_color)
.margin(vec2(5.0, 5.0));
.inner_margin(vec2(5.0, 5.0));
// The archetype that will be returned.
let mut submitted_archetype = None;
@ -55,19 +55,21 @@ where
let mut query_submit = resp.lost_focus() && ui.input().key_down(Key::Enter);
Frame::default().margin(vec2(10.0, 10.0)).show(ui, |ui| {
for kind in all_kinds.all_kinds() {
let kind_name = kind.node_finder_label().to_string();
if kind_name.contains(self.query.as_str()) {
if ui.selectable_label(false, kind_name).clicked() {
submitted_archetype = Some(kind);
} else if query_submit {
submitted_archetype = Some(kind);
query_submit = false;
Frame::default()
.inner_margin(vec2(10.0, 10.0))
.show(ui, |ui| {
for kind in all_kinds.all_kinds() {
let kind_name = kind.node_finder_label().to_string();
if kind_name.contains(self.query.as_str()) {
if ui.selectable_label(false, kind_name).clicked() {
submitted_archetype = Some(kind);
} else if query_submit {
submitted_archetype = Some(kind);
query_submit = false;
}
}
}
}
});
});
});
});

2
egui_node_graph_example/Cargo.toml
View File

@ -9,7 +9,7 @@ rust-version = "1.56"
crate-type = ["cdylib", "rlib"]
[dependencies]
eframe = "0.16.0"
eframe = "0.18.0"
egui_node_graph = { path = "../egui_node_graph" }
anyhow = "1.0"

23
egui_node_graph_example/src/app.rs
View File

@ -1,9 +1,6 @@
use std::collections::HashMap;
use eframe::{
egui::{self, DragValue},
epi,
};
use eframe::egui::{self, DragValue, TextStyle};
use egui_node_graph::*;
// ========= First, define your user data types =============
@ -352,15 +349,17 @@ impl Default for NodeGraphExample {
}
}
impl epi::App for NodeGraphExample {
fn name(&self) -> &str {
"Egui node graph example"
}
impl eframe::App for NodeGraphExample {
/// Called each time the UI needs repainting, which may be many times per second.
/// Put your widgets into a `SidePanel`, `TopPanel`, `CentralPanel`, `Window` or `Area`.
fn update(&mut self, ctx: &egui::CtxRef, _frame: &epi::Frame) {
let graph_response = self.state.draw_graph_editor(ctx, AllMyNodeTemplates);
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
let graph_response = egui::Window::new("Graph")
.show(ctx, |ui| {
self.state.draw_graph_editor(ui, AllMyNodeTemplates)
})
.unwrap()
.inner
.unwrap();
for node_response in graph_response.node_responses {
// Here, we ignore all other graph events. But you may find
// some use for them. For example, by playing a sound when a new
@ -385,7 +384,7 @@ impl epi::App for NodeGraphExample {
egui::pos2(10.0, 10.0),
egui::Align2::LEFT_TOP,
text,
egui::TextStyle::Button,
TextStyle::Button.resolve(&ctx.style()),
egui::Color32::WHITE,
);
} else {

13
egui_node_graph_example/src/main.rs
View File

@ -5,7 +5,14 @@
// When compiling natively:
#[cfg(not(target_arch = "wasm32"))]
fn main() {
let app = egui_node_graph_example::NodeGraphExample::default();
let native_options = eframe::NativeOptions::default();
eframe::run_native(Box::new(app), native_options);
use eframe::egui::Visuals;
eframe::run_native(
"Egui node graph example",
eframe::NativeOptions::default(),
Box::new(|cc| {
cc.egui_ctx.set_visuals(Visuals::dark());
Box::new(egui_node_graph_example::NodeGraphExample::default())
}),
);
}