Upgrade to gdext-0.5.0

native/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-godot = { version = "0.4.5", features = ["experimental-threads", "api-4-5", "register-docs"] }
-godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "26f10ece493d9cc8cdbe2799fba60f0420e41f65" }
+godot = { version = "0.5.0", features = ["experimental-threads", "api-4-5", "register-docs"] }
+godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "ca89cf182f6b9e051b66e1e52e23489e25f9077c" }
 lerp = "0.4.0"
 backtrace = "0.3.64"
 num = "0.4.0"

native/rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.92.0"
+channel = "1.94.0"
 components = [ "rustfmt", "clippy" ]
 profile = "default"
 

native/src/editor.rs

@@ -21,9 +21,10 @@ use godot::classes::{
     ConfigFile, EditorPlugin, EditorSettings, GDExtensionManager, GltfDocument, IEditorPlugin,
     ProjectSettings,
 };
-use godot::global::{self, godot_error, godot_print, PropertyHint};
+use godot::global::{self, godot_error, godot_print};
 use godot::meta::{AsArg, FromGodot};
 use godot::obj::{Base, Gd, NewGd, OnReady, Singleton as _, WithBaseField};
+use godot::register::info::PropertyHint;
 use godot::register::{godot_api, GodotClass};
 
 use building_imports::SetupBuildingImports;
@@ -133,11 +134,7 @@ impl IEditorPlugin for EditorExtension {
         let ao_baker = {
             let base = self.base();
 
-            AoBaker::new(
-                editor_interface.clone(),
-                base.get_tree()
-                    .expect("SceneTree should be available after entering the tree"),
-            )
+            AoBaker::new(editor_interface.clone(), base.get_tree())
         };
 
         self.ao_baker.init(ao_baker);
@@ -272,4 +269,4 @@ impl EngineSettings for Gd<EditorSettings> {
     fn add_property_info(&mut self, property_info: &VarDictionary) {
         self.deref_mut().add_property_info(property_info);
     }
-}
+}

native/src/editor/ao_baker.rs

@@ -10,22 +10,16 @@ use std::{
     process::{Command, Stdio},
 };
 
-use godot::{
-    builtin::{GString, PackedStringArray, VariantType},
-    classes::{EditorInterface, ProjectSettings, RefCounted, SceneTree},
-    global::PropertyHint,
-    obj::{Base, Gd, Singleton},
-    prelude::{godot_api, GodotClass},
-    task,
-};
+use godot::builtin::{GString, PackedStringArray, VariantType};
+use godot::classes::{EditorInterface, ProjectSettings, RefCounted, SceneTree};
+use godot::obj::{Base, Gd, Singleton};
+use godot::prelude::{godot_api, GodotClass};
+use godot::register::info::PropertyHint;
+use godot::task;
 
-use crate::{
-    editor::{
-        new_non_zero,
-        ui::{ForgroundProcess, ProgressDialog},
-    },
-    util::logger,
-};
+use crate::editor::new_non_zero;
+use crate::editor::ui::{ForgroundProcess, ProgressDialog};
+use crate::util::logger;
 
 #[derive(GodotClass)]
 #[class(base = RefCounted, no_init)]
@@ -245,4 +239,4 @@ impl AoBaker {
 
         dialog.queue_free();
     }
-}
+}

native/src/editor/building_imports.rs

@@ -7,17 +7,15 @@
 
 use std::collections::VecDeque;
 
-use godot::{
-    builtin::{GString, VarDictionary, Vector2i},
-    classes::{
-        editor_file_dialog, ConfigFile, DirAccess, EditorFileDialog, EditorInterface, FileAccess,
-        MeshInstance3D, Object, PackedScene, ResourceLoader,
-    },
-    global::Error,
-    meta::ToGodot,
-    obj::{Base, Gd, GodotClass, NewAlloc, NewGd, Singleton as _, WithBaseField},
-    register::{godot_api, GodotClass},
+use godot::builtin::{GString, VarDictionary, Vector2i};
+use godot::classes::{
+    editor_file_dialog, ConfigFile, DirAccess, EditorFileDialog, EditorInterface, FileAccess,
+    MeshInstance3D, Object, PackedScene, ResourceLoader,
 };
+use godot::global::Error;
+use godot::meta::ToGodot;
+use godot::obj::{Base, Gd, GodotClass, NewAlloc, NewGd, Singleton as _, WithBaseField};
+use godot::register::{godot_api, GodotClass};
 use pomsky_macro::pomsky;
 use regex::Regex;
 
@@ -113,7 +111,7 @@ impl SetupBuildingImports {
 
         while let Some(dir_path) = dir_queue.pop_front() {
             logger::info!("Traversing dir \"{}\"...", dir_path);
-            let Some(mut dir) = DirAccess::open(&dir_path) else {
+            let Some(dir) = DirAccess::open(&dir_path) else {
                 logger::error!("Directory not accessible: {}", root_dir);
                 return;
             };
@@ -218,7 +216,7 @@ impl SetupBuildingImports {
             .for_each(|index| {
                 let path = scene_state.get_node_path(index);
                 let mut config: VarDictionary = nodes
-                    .get(path.clone())
+                    .get(&path)
                     .map(|value| value.try_to())
                     .transpose()
                     .inspect_err(|err| {
@@ -235,11 +233,11 @@ impl SetupBuildingImports {
 
                 nodes.set(
                     format!("PATH:{}", path.to_string().trim_start_matches("./")),
-                    config,
+                    &config,
                 );
             });
 
-        subresources.set("nodes", nodes);
+        subresources.set("nodes", &nodes);
 
         file.set_value("params", "_subresources", &subresources.to_variant());
 
@@ -253,4 +251,4 @@ impl SetupBuildingImports {
             );
         }
     }
-}
+}

native/src/editor/gltf.rs

@@ -7,7 +7,8 @@
 
 use anyhow::Context;
 use godot::builtin::{
-    Array, GString, PackedInt32Array, PackedVector3Array, VarDictionary, Variant, Vector3,
+    Array, GString, PackedInt32Array, PackedVector3Array, StringName, VarDictionary, Variant,
+    Vector3,
 };
 use godot::classes::decal::DecalTexture;
 use godot::classes::mesh::ArrayType;
@@ -125,7 +126,7 @@ fn fix_ao_uv2(state: &mut Gd<GltfState>) -> Result<(), global::Error> {
                     return false;
                 };
 
-                material.get_name() == name.to()
+                material.get_name() == name.to::<GString>()
             })
             .map(|mat| mat.to::<VarDictionary>());
 
@@ -208,7 +209,7 @@ fn use_gd_node(
     };
 
     Ok(node?.map(|mut node| {
-        node.set_name(gltf_node.get_name().arg());
+        node.set_name(&StringName::from(&gltf_node.get_name()));
         node
     }))
 }
@@ -385,4 +386,4 @@ fn create_occluder_node(
     node.set_occluder(&mesh);
 
     Ok(Some(node.upcast()))
-}
+}

native/src/editor/ui.rs

@@ -7,4 +7,4 @@
 
 mod progress_dialog;
 
-pub use progress_dialog::*;
+pub use progress_dialog::*;

native/src/editor/ui/progress_dialog.rs

@@ -185,4 +185,4 @@ fn add_margin_child(
     }
 
     mc
-}
+}

native/src/ext.rs

@@ -5,4 +5,4 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-pub(crate) mod node_3d;
+pub(crate) mod node_3d;