Merge pull request #62 from setzer22/fix/incompatible_port_snap

Fix/incompatible port snap
setzer22 · Sep 15, 2022 · 0395039 · 0395039
2 parents d540805 + 234d377
commit 0395039
Showing 1 changed file with 42 additions and 11 deletions.
diff --git a/egui_node_graph/src/editor_ui.rs b/egui_node_graph/src/editor_ui.rs
@@ -178,31 +178,62 @@ where
             let start_pos = port_locations[locator];
 
             // Find a port to connect to
-            fn snap_to_ports<Key: slotmap::Key + Into<AnyParameterId>, Value>(
+            fn snap_to_ports<
+                NodeData,
+                UserState,
+                DataType: DataTypeTrait<UserState>,
+                ValueType,
+                Key: slotmap::Key + Into<AnyParameterId>,
+                Value,
+            >(
+                graph: &Graph<NodeData, DataType, ValueType>,
+                port_type: &DataType,
                 ports: &SlotMap<Key, Value>,
                 port_locations: &PortLocations,
                 cursor_pos: Pos2,
             ) -> Pos2 {
                 ports
                     .iter()
                     .find_map(|(port_id, _)| {
-                        port_locations.get(&port_id.into()).and_then(|port_pos| {
-                            if port_pos.distance(cursor_pos) < DISTANCE_TO_CONNECT {
-                                Some(*port_pos)
-                            } else {
-                                None
-                            }
-                        })
+                        let compatible_ports = graph
+                            .any_param_type(port_id.into())
+                            .map(|other| other == port_type)
+                            .unwrap_or(false);
+
+                        if compatible_ports {
+                            port_locations.get(&port_id.into()).and_then(|port_pos| {
+                                if port_pos.distance(cursor_pos) < DISTANCE_TO_CONNECT {
+                                    Some(*port_pos)
+                                } else {
+                                    None
+                                }
+                            })
+                        } else {
+                            None
+                        }
                     })
                     .unwrap_or(cursor_pos)
             }
+
             let (src_pos, dst_pos) = match locator {
                 AnyParameterId::Output(_) => (
                     start_pos,
-                    snap_to_ports(&self.graph.inputs, &port_locations, cursor_pos),
+                    snap_to_ports(
+                        &self.graph,
+                        port_type,
+                        &self.graph.inputs,
+                        &port_locations,
+                        cursor_pos,
+                    ),
                 ),
                 AnyParameterId::Input(_) => (
-                    snap_to_ports(&self.graph.outputs, &port_locations, cursor_pos),
+                    snap_to_ports(
+                        &self.graph,
+                        port_type,
+                        &self.graph.outputs,
+                        &port_locations,
+                        cursor_pos,
+                    ),
                     start_pos,
                 ),
             };
@@ -263,7 +294,7 @@ where
                     self.node_order.retain(|id| *id != *node_id);
                 }
                 NodeResponse::DisconnectEvent { input, output } => {
-                    let other_node = self.graph.get_input(*input).node();
+                    let other_node = self.graph.get_output(*output).node;
                     self.graph.remove_connection(*input);
                     self.connection_in_progress =
                         Some((other_node, AnyParameterId::Output(*output)));