typed handles for is_valid_handle

Author: mrDIMAS

editor/src/scene/mod.rs

@@ -475,13 +475,11 @@ impl GameScene {
     }
 
     fn select_object(&mut self, handle: ErasedHandle, engine: &Engine) {
-        if engine.scenes[self.scene]
-            .graph
-            .is_valid_handle(handle.into())
-        {
+        let handle = Handle::<Node>::from(handle);
+        if engine.scenes[self.scene].graph.is_valid_handle(handle) {
             self.sender
                 .do_command(ChangeSelectionCommand::new(Selection::new(
-                    GraphSelection::single_or_empty(handle.into()),
+                    GraphSelection::single_or_empty(handle),
                 )))
         }
     }

editor/src/world/graph.rs

@@ -122,7 +122,7 @@ impl WorldViewerDataProvider for EditorSceneWrapper<'_> {
     }
 
     fn is_valid_handle(&self, node: ErasedHandle) -> bool {
-        self.scene.graph.is_valid_handle(node.into())
+        self.scene.graph.is_valid_handle(Handle::<Node>::from(node))
     }
 
     fn icon_of(&self, node: ErasedHandle) -> Option<TextureResource> {

fyrox-core/src/pool/mod.rs

@@ -1233,7 +1233,7 @@ where
     /// assert_eq!(pool.is_valid_handle(handle), true)
     /// ```
     #[inline]
-    pub fn is_valid_handle(&self, handle: Handle<T>) -> bool {
+    pub fn is_valid_handle(&self, handle: Handle<impl ObjectOrVariant<T>>) -> bool {
         if let Ok(record) = self.records_get(handle.index) {
             record.payload.is_some() && record.generation == handle.generation
         } else {

fyrox-graph/src/lib.rs

@@ -705,7 +705,7 @@ pub trait SceneGraph: 'static {
     ) -> Result<&mut Self::Node, PoolError>;
 
     /// Checks whether the given node handle is valid or not.
-    fn is_valid_handle(&self, handle: Handle<Self::Node>) -> bool;
+    fn is_valid_handle(&self, handle: Handle<impl ObjectOrVariant<Self::Node>>) -> bool;
 
     /// Adds a new node to the graph.
     fn add_node(&mut self, node: Self::Node) -> Handle<Self::Node>;
@@ -1809,7 +1809,7 @@ mod test {
             self.root = root;
         }
 
-        fn is_valid_handle(&self, handle: Handle<Self::Node>) -> bool {
+        fn is_valid_handle(&self, handle: Handle<impl ObjectOrVariant<Self::Node>>) -> bool {
             self.nodes.is_valid_handle(handle)
         }
 

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

@@ -1942,7 +1942,7 @@ impl SceneGraph for Graph {
     }
 
     #[inline]
-    fn is_valid_handle(&self, handle: Handle<Self::Node>) -> bool {
+    fn is_valid_handle(&self, handle: Handle<impl ObjectOrVariant<Self::Node>>) -> bool {
         self.pool.is_valid_handle(handle)
     }
 

fyrox-ui/src/lib.rs

@@ -3546,7 +3546,7 @@ impl SceneGraph for UserInterface {
     }
 
     #[inline]
-    fn is_valid_handle(&self, handle: Handle<Self::Node>) -> bool {
+    fn is_valid_handle(&self, handle: Handle<impl ObjectOrVariant<Self::Node>>) -> bool {
         self.nodes.is_valid_handle(handle)
     }