typed handles in link_nodes+remove_node+unlink_node+isolate_node

Author: mrDIMAS

fyrox-graph/src/lib.rs

@@ -670,9 +670,7 @@ impl<N> Default for LinkScheme<N> {
     }
 }
 
-/// SceneGraph is a non-dyn-compatible trait for all scene graphs to implement.
-/// To use a scene graph as a dyn object, use `dyn SceneGraph` because
-/// [`SceneGraph`] is dyn-compatible.
+/// SceneGraph is a trait for all scene graphs to implement.
 pub trait SceneGraph: 'static {
     type ObjectType: Sized;
     type Prefab: PrefabData<Graph = Self>;
@@ -713,17 +711,21 @@ pub trait SceneGraph: 'static {
     fn add_node(&mut self, node: Self::Node) -> Handle<Self::Node>;
 
     /// Destroys the node and its children recursively.
-    fn remove_node(&mut self, node_handle: Handle<Self::Node>);
+    fn remove_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>);
 
     /// Links specified child with specified parent.
-    fn link_nodes(&mut self, child: Handle<Self::Node>, parent: Handle<Self::Node>);
+    fn link_nodes(
+        &mut self,
+        child: Handle<impl ObjectOrVariant<Self::Node>>,
+        parent: Handle<impl ObjectOrVariant<Self::Node>>,
+    );
 
     /// Unlinks specified node from its parent and attaches it to root graph node.
-    fn unlink_node(&mut self, node_handle: Handle<Self::Node>);
+    fn unlink_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>);
 
     /// Detaches the node from its parent, making the node unreachable from any other node in the
     /// graph.
-    fn isolate_node(&mut self, node_handle: Handle<Self::Node>);
+    fn isolate_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>);
 
     /// Borrows a node by its handle.
     fn node(&self, handle: Handle<Self::Node>) -> &Self::Node {
@@ -1831,7 +1833,8 @@ mod test {
             handle
         }
 
-        fn remove_node(&mut self, node_handle: Handle<Self::Node>) {
+        fn remove_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+            let node_handle = node_handle.to_base();
             self.isolate_node(node_handle);
             let mut stack = vec![node_handle];
             while let Some(handle) = stack.pop() {
@@ -1840,18 +1843,26 @@ mod test {
             }
         }
 
-        fn link_nodes(&mut self, child: Handle<Self::Node>, parent: Handle<Self::Node>) {
+        fn link_nodes(
+            &mut self,
+            child: Handle<impl ObjectOrVariant<Self::Node>>,
+            parent: Handle<impl ObjectOrVariant<Self::Node>>,
+        ) {
+            let child = child.to_base();
+            let parent = parent.to_base();
             self.isolate_node(child);
             self.nodes[child].parent = parent;
             self.nodes[parent].children.push(child);
         }
 
-        fn unlink_node(&mut self, node_handle: Handle<Self::Node>) {
+        fn unlink_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
             self.isolate_node(node_handle);
             self.link_nodes(node_handle, self.root);
         }
 
-        fn isolate_node(&mut self, node_handle: Handle<Self::Node>) {
+        fn isolate_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+            let node_handle = node_handle.to_base();
+
             let parent_handle =
                 std::mem::replace(&mut self.nodes[node_handle].parent, Handle::NONE);
 

fyrox-impl/src/resource/model/mod.rs

@@ -568,7 +568,7 @@ impl ModelResourceExtension for ModelResource {
             .with_scale(local_scale)
             .finish();
 
-        scene.graph.link_nodes(instance, parent.transmute());
+        scene.graph.link_nodes(instance, parent);
 
         instance
     }

fyrox-impl/src/scene/graph/mod.rs

@@ -1984,7 +1984,9 @@ impl SceneGraph for Graph {
     }
 
     #[inline]
-    fn remove_node(&mut self, node_handle: Handle<Self::Node>) {
+    fn remove_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+        let node_handle = node_handle.to_base();
+
         self.isolate_node(node_handle);
 
         self.stack.clear();
@@ -2005,7 +2007,14 @@ impl SceneGraph for Graph {
     }
 
     #[inline]
-    fn link_nodes(&mut self, child: Handle<Self::Node>, parent: Handle<Self::Node>) {
+    fn link_nodes(
+        &mut self,
+        child: Handle<impl ObjectOrVariant<Self::Node>>,
+        parent: Handle<impl ObjectOrVariant<Self::Node>>,
+    ) {
+        let child = child.to_base();
+        let parent = parent.to_base();
+
         self.isolate_node(child);
         self.pool[child].parent = parent;
         self.pool[parent].children.push(child);
@@ -2017,7 +2026,8 @@ impl SceneGraph for Graph {
     }
 
     #[inline]
-    fn unlink_node(&mut self, node_handle: Handle<Node>) {
+    fn unlink_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+        let node_handle = node_handle.to_base();
         self.isolate_node(node_handle);
         self.link_nodes(node_handle, self.root);
         self.pool[node_handle]
@@ -2026,7 +2036,8 @@ impl SceneGraph for Graph {
     }
 
     #[inline]
-    fn isolate_node(&mut self, node_handle: Handle<Self::Node>) {
+    fn isolate_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+        let node_handle = node_handle.to_base();
         // Replace parent handle of child
         let parent_handle = std::mem::replace(&mut self.pool[node_handle].parent, Handle::NONE);
 

fyrox-ui/src/lib.rs

@@ -3223,10 +3223,12 @@ impl UserInterface {
     #[inline]
     pub fn link_nodes(
         &mut self,
-        child_handle: Handle<UiNode>,
-        parent_handle: Handle<UiNode>,
+        child_handle: Handle<impl ObjectOrVariant<UiNode>>,
+        parent_handle: Handle<impl ObjectOrVariant<UiNode>>,
         in_front: bool,
     ) {
+        let child_handle = child_handle.to_base();
+        let parent_handle = parent_handle.to_base();
         assert_ne!(child_handle, parent_handle);
         self.isolate_node(child_handle);
         self.nodes[child_handle].set_parent(parent_handle);
@@ -3572,7 +3574,8 @@ impl SceneGraph for UserInterface {
     }
 
     #[inline]
-    fn remove_node(&mut self, node: Handle<Self::Node>) {
+    fn remove_node(&mut self, node: Handle<impl ObjectOrVariant<Self::Node>>) {
+        let node = node.to_base();
         self.isolate_node(node);
 
         let sender = self.sender.clone();
@@ -3605,18 +3608,23 @@ impl SceneGraph for UserInterface {
     }
 
     #[inline]
-    fn link_nodes(&mut self, child: Handle<Self::Node>, parent: Handle<Self::Node>) {
-        self.link_nodes(child, parent, false)
+    fn link_nodes(
+        &mut self,
+        child: Handle<impl ObjectOrVariant<Self::Node>>,
+        parent: Handle<impl ObjectOrVariant<Self::Node>>,
+    ) {
+        self.link_nodes(child.to_base(), parent.to_base(), false)
     }
 
     #[inline]
-    fn unlink_node(&mut self, node_handle: Handle<Self::Node>) {
+    fn unlink_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
         self.isolate_node(node_handle);
         self.link_nodes(node_handle, self.root_canvas, false);
     }
 
     #[inline]
-    fn isolate_node(&mut self, node_handle: Handle<Self::Node>) {
+    fn isolate_node(&mut self, node_handle: Handle<impl ObjectOrVariant<Self::Node>>) {
+        let node_handle = node_handle.to_base();
         let node = self.nodes.borrow_mut(node_handle);
         let parent_handle = node.parent();
         if parent_handle.is_some() {