fix(objects): properly destroy nodes

src/nodes/input/method.rs

@@ -22,11 +22,11 @@ pub struct InputMethod {
 	pub data: Mutex<InputDataType>,
 	pub datamap: Mutex<Datamap>,
 
-	pub capture_requests: Registry<InputHandler>,
-	pub captures: Registry<InputHandler>,
 	handler_aliases: AliasList,
 	handler_field_aliases: AliasList,
 	pub(super) handler_order: Mutex<Vec<Weak<InputHandler>>>,
+	pub capture_requests: Registry<InputHandler>,
+	pub captures: Registry<InputHandler>,
 }
 impl InputMethod {
 	pub fn add_to(
@@ -39,11 +39,11 @@ impl InputMethod {
 			data: Mutex::new(data),
 			datamap: Mutex::new(datamap),
 
-			capture_requests: Registry::new(),
-			captures: Registry::new(),
 			handler_aliases: AliasList::default(),
 			handler_field_aliases: AliasList::default(),
 			handler_order: Mutex::new(Vec::new()),
+			capture_requests: Registry::new(),
+			captures: Registry::new(),
 		};
 		<InputMethod as InputMethodRefAspect>::add_node_members(node);
 		<InputMethod as InputMethodAspect>::add_node_members(node);

src/nodes/mod.rs

@@ -50,6 +50,13 @@ pub type Method = fn(Arc<Node>, Arc<Client>, Message, MethodResponseSender);
 
 stardust_xr_server_codegen::codegen_node_protocol!();
 
+pub struct OwnedNode(pub Arc<Node>);
+impl Drop for OwnedNode {
+	fn drop(&mut self) {
+		self.0.destroy();
+	}
+}
+
 pub struct Node {
 	enabled: AtomicBool,
 	id: u64,
@@ -95,6 +102,14 @@ impl Node {
 			.scenegraph
 			.add_node(self))
 	}
+	pub fn add_to_scenegraph_owned(self) -> Result<OwnedNode> {
+		Ok(OwnedNode(
+			self.get_client()
+				.ok_or_else(|| eyre!("Internal: Unable to get client"))?
+				.scenegraph
+				.add_node(self),
+		))
+	}
 	pub fn enabled(&self) -> bool {
 		self.enabled.load(Ordering::Relaxed)
 	}