Make use of type hint, use load() in examples

Author: Bromeon

examples/native-plugin/src/lib.rs

@@ -1,7 +1,7 @@
 // Rust GDNative implementation of this Godot tutorial:
 // https://docs.godotengine.org/en/stable/tutorials/plugins/editor/making_plugins.html#a-custom-node
 
-use gdnative::api::{EditorPlugin, Resource, Script, Texture};
+use gdnative::api::{EditorPlugin, Script, Texture};
 use gdnative::prelude::*;
 
 #[derive(NativeClass)]
@@ -18,10 +18,8 @@ impl CustomNode {
     fn _enter_tree(&self, #[base] owner: TRef<EditorPlugin>) {
         // Initialization of the plugin goes here.
         // Add the new type with a name, a parent type, a script and an icon.
-        let script = unsafe { load::<Script>("res://my_button.gdns", "Script").unwrap() };
-        let texture = unsafe {
-            load::<Texture>("res://making_plugins-custom_node_icon.png", "Texture").unwrap()
-        };
+        let script = load::<Script>("res://my_button.gdns").unwrap();
+        let texture = load::<Texture>("res://making_plugins-custom_node_icon.png").unwrap();
         owner.add_custom_type("MyButton", "Button", script, texture);
     }
 
@@ -56,15 +54,6 @@ impl MyButton {
     }
 }
 
-unsafe fn load<T>(path: &str, hint: &str) -> Option<Ref<T, Shared>>
-where
-    T: GodotObject<Memory = RefCounted> + SubClass<Resource>,
-{
-    let resource = ResourceLoader::godot_singleton().load(path, hint, false)?;
-    let resource = resource.assume_safe().claim();
-    resource.cast::<T>()
-}
-
 fn init(handle: InitHandle) {
     handle.add_tool_class::<CustomNode>();
     handle.add_tool_class::<MyButton>();

examples/scene-create/src/lib.rs

@@ -105,11 +105,9 @@ fn init(handle: InitHandle) {
 }
 
 pub fn load_scene(path: &str) -> Option<Ref<PackedScene, ThreadLocal>> {
-    let scene = ResourceLoader::godot_singleton().load(path, "PackedScene", false)?;
-
+    let scene = load::<PackedScene>(path)?;
     let scene = unsafe { scene.assume_thread_local() };
-
-    scene.cast::<PackedScene>()
+    Some(scene)
 }
 
 /// Root here is needs to be the same type (or a parent type) of the node that you put in the child

gdnative/src/globalscope.rs

@@ -56,7 +56,8 @@ pub fn load<T>(path: &str) -> Option<Ref<T>>
 where
     T: SubClass<Resource> + GodotObject<Memory = RefCounted>,
 {
+    let type_hint = T::class_name();
     ResourceLoader::godot_singleton()
-        .load(path, "", false)
+        .load(path, type_hint, false)
         .and_then(|res| res.cast::<T>())
 }