upgrade godot-rust-script (builtin hotreload)

TitanNano · Jan 5, 2024 · 55fed63 · 55fed63
1 parent 5af9b12
commit 55fed63
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 160 deletions.
diff --git a/native/Cargo.lock b/native/Cargo.lock
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -1,13 +1,3 @@
-[workspace]
-resolver = "2"
-
-members = [
-  "scripts",
-]
-
-[workspace.dependencies]
-godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "928159e6f6a73a249d5504ca6c136809b5ed07c0", default-features = false }
-
 [package]
 name = "native"
 version = "0.4.0"
@@ -17,11 +7,12 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-godot = { git = "https://github.com/titannano/gdext", rev = "a5d17342b7b47e8af652a6a733f497c468bbd59a" }
+godot = { git = "https://github.com/titannano/gdext", rev = "4ce4714" }
 lerp = "0.4.0"
 backtrace = "0.3.64"
 num = "0.4.0"
 rayon = "1.5.1"
 itertools = "0.10.3"
-godot-rust-script = { workspace = true, features = ["runtime"] }
-scripts = { path = "./scripts" }
+num_enum = "0.7.1"
+
+godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "a2a5c018fcf0247f1d242ec2bf8a994cc975c1ee" }
diff --git a/native/scripts/Cargo.toml b/native/scripts/Cargo.toml
diff --git a/native/src/lib.rs b/native/src/lib.rs
@@ -1,36 +1,27 @@
+mod scripts;
 mod terrain_builder;
 
-use std::cell::RefCell;
-
 use godot::prelude::{gdextension, ExtensionLibrary, InitLevel};
-use godot_rust_script::{self, RustScriptExtensionLayer};
-
-godot_rust_script::setup!(scripts);
+use godot_rust_script;
 
 struct NativeLib;
 
-thread_local! {
-    static RUST_SCRIPT_LAYER: RefCell<RustScriptExtensionLayer> = RefCell::new(godot_rust_script::init!());
-}
-
 #[gdextension]
 unsafe impl ExtensionLibrary for NativeLib {
     fn on_level_init(level: InitLevel) {
         match level {
             InitLevel::Core => (),
             InitLevel::Servers => (),
-            InitLevel::Scene => {
-                RUST_SCRIPT_LAYER.with_borrow_mut(|layer| layer.initialize());
-            }
+            InitLevel::Scene => godot_rust_script::init!(scripts),
             InitLevel::Editor => (),
         }
     }
 
     fn on_level_deinit(level: InitLevel) {
         match level {
             InitLevel::Editor => (),
-            InitLevel::Scene => RUST_SCRIPT_LAYER.with_borrow_mut(|layer| layer.deinitialize()),
-            InitLevel::Servers => {}
+            InitLevel::Scene => godot_rust_script::deinit!(),
+            InitLevel::Servers => (),
             InitLevel::Core => (),
         }
     }

diff --git a/native/scripts/src/lib.rs → native/src/scripts/mod.rs b/native/scripts/src/lib.rs → native/src/scripts/mod.rs
diff --git a/...e/scripts/src/particles/dust_particles.rs → ...e/src/scripts/particles/dust_particles.rs b/...e/scripts/src/particles/dust_particles.rs → ...e/src/scripts/particles/dust_particles.rs
diff --git a/native/scripts/src/particles/mod.rs → native/src/scripts/particles/mod.rs b/native/scripts/src/particles/mod.rs → native/src/scripts/particles/mod.rs
diff --git a/native/scripts/src/scene_object_registry.rs → native/src/scripts/scene_object_registry.rs b/native/scripts/src/scene_object_registry.rs → native/src/scripts/scene_object_registry.rs
diff --git a/native/scripts/src/spawner/car_spawner.rs → native/src/scripts/spawner/car_spawner.rs b/native/scripts/src/spawner/car_spawner.rs → native/src/scripts/spawner/car_spawner.rs
@@ -12,7 +12,6 @@ use godot_rust_script::{
 #[script(base = Node3D)]
 struct CarSpawner {
 	default_car: Option<Gd<PackedScene>>,
-	car: Option<Gd<PackedScene>>,
 
 	#[export]
 	pub road_network_path: NodePath,
@@ -31,10 +30,6 @@ impl CarSpawner {
 				"res://resources/Objects/Vehicles/car_station_wagon.tscn",
 			))
 			.map(|res| res.cast());
-
-		self.car = loader
-			.load(GString::from("res://src/Objects/Vehicles/Car.gd"))
-			.map(|res| res.cast());
 	}
 
 	pub fn spawn_car(&mut self) {
@@ -88,7 +83,7 @@ impl CarSpawner {
 
 				timer.connect(
 					StringName::from("timeout"),
-					Callable::from_object_method(self.base.clone(), "start_auto_spawn"),
+					Callable::from_object_method(&self.base, "start_auto_spawn"),
 				);
 
 				self.timer.as_mut().unwrap()

diff --git a/native/scripts/src/spawner/mod.rs → native/src/scripts/spawner/mod.rs b/native/scripts/src/spawner/mod.rs → native/src/scripts/spawner/mod.rs
diff --git a/native/src/terrain_builder.rs b/native/src/terrain_builder.rs
@@ -173,7 +173,7 @@ struct ThreadContext<'a> {
 }
 
 #[derive(GodotClass)]
-#[class(base=RefCounted)]
+#[class(base=RefCounted, init)]
 pub struct TerrainBuilder {
     tile_size: u8,
     city_size: u16,
@@ -186,6 +186,23 @@ pub struct TerrainBuilder {
 
 #[godot_api]
 impl TerrainBuilder {
+    #[func]
+    fn new(
+        tilelist: Dictionary,
+        rotation: Gd<TerrainRotation>,
+        materials: Dictionary,
+    ) -> Gd<TerrainBuilder> {
+        Gd::from_object(TerrainBuilder {
+            tile_size: 16,
+            city_size: 0,
+            tile_height: 8,
+            sea_level: 0,
+            rotation,
+            tilelist,
+            materials,
+        })
+    }
+
     #[func]
     fn set_city_size(&mut self, value: u16) {
         self.city_size = value;

diff --git a/resources/Objects/Helis/Helicopter.tscn b/resources/Objects/Helis/Helicopter.tscn
@@ -1,17 +1,17 @@
 [gd_scene load_steps=8 format=3 uid="uid://dl34exjsm3sq4"]
 
-[ext_resource type="Material" uid="uid://cjoloelf8ku4k" path="res://resources/Materials/dust_material.tres" id="1"]
+[ext_resource type="Material" uid="uid://cjoloelf8ku4k" path="res://resources/Materials/dust_material.tres" id="2_8yiqd"]
+[ext_resource type="Script" path="res://native/src/scripts/particles/dust_particles.rs" id="2_ocmjg"]
 [ext_resource type="Script" path="res://src/Objects/Helicopters/Helicopter.gd" id="3"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://xbcrg5mghpup" path="res://resources/Animations/HelicopterRotorSoundStates.tres" id="4_8iee2"]
 [ext_resource type="AnimationLibrary" uid="uid://uec74t4jqdxi" path="res://resources/Animations/Helicopter.tres" id="5_ayahk"]
-[ext_resource type="Script" path="res://src/Objects/Particles/DustParticles.gd" id="12"]
 
 [sub_resource type="PhysicsMaterial" id="20"]
 friction = 0.5
 bounce = 0.7
 
-[sub_resource type="QuadMesh" id="9"]
-material = ExtResource("1")
+[sub_resource type="QuadMesh" id="QuadMesh_e0n42"]
+material = ExtResource("2_8yiqd")
 
 [node name="Helicopter" type="RigidBody3D" node_paths=PackedStringArray("child_engine_sound_tree", "child_dust_particles")]
 mass = 929.8
@@ -35,14 +35,12 @@ amount = 100
 lifetime = 0.4
 visibility_aabb = AABB(-8.76025, -1.34854, -8.13392, 17.451, 2.29104, 17.5903)
 draw_order = 2
-draw_pass_1 = SubResource("9")
-script = ExtResource("12")
+draw_pass_1 = SubResource("QuadMesh_e0n42")
+script = ExtResource("2_ocmjg")
+strength = null
 
 [node name="RotorAudioTree" type="AnimationTree" parent="."]
 root_node = NodePath(".")
-libraries = {
-"": ExtResource("5_ayahk")
-}
 tree_root = ExtResource("4_8iee2")
 advance_expression_base_node = NodePath("")
 anim_player = NodePath("../RotorAudioPlayer")