refactor(spatial): store weak reference to parent node

src/core/client.rs

@@ -1,23 +1,24 @@
 use super::scenegraph::Scenegraph;
-use crate::nodes::core::{Node, NodeRef};
 use libstardustxr::messenger::Messenger;
 use mio::net::UnixStream;
 use std::rc::{Rc, Weak};
 
 pub struct Client<'a> {
 	messenger: Rc<Messenger<'a>>,
-	pub scenegraph: Scenegraph<'a>,
+	pub scenegraph: Option<Scenegraph<'a>>,
 }
 
 impl<'a> Client<'a> {
 	pub fn from_connection(connection: UnixStream) -> Self {
-		Client {
-			scenegraph: Default::default(),
+		let mut client = Client {
+			scenegraph: None,
 			messenger: Rc::new(Messenger::new(connection)),
-		}
+		};
+		client.scenegraph = Some(Scenegraph::new(&mut client));
+		client
 	}
 	pub fn dispatch(&self) -> Result<(), std::io::Error> {
-		self.messenger.dispatch(&self.scenegraph)
+		self.messenger.dispatch(self.scenegraph.as_ref().unwrap())
 	}
 
 	pub fn get_weak_messenger(&self) -> Weak<Messenger<'a>> {

src/core/scenegraph.rs

@@ -14,6 +14,13 @@ pub struct Scenegraph<'a> {
 }
 
 impl<'a> Scenegraph<'a> {
+	pub fn new(client: &mut Client<'a>) -> Self {
+		Scenegraph {
+			nodes: HashMap::new(),
+			root: Spatial::new_node(Some(client), "/", Default::default()).unwrap(),
+			hmd: Spatial::new_node(Some(client), "/hmd", Default::default()).unwrap(),
+		}
+	}
 	pub fn add_node(&mut self, node: RcCell<Node<'a>>) {
 		let path = node.borrow().get_path().to_string();
 		self.nodes.insert(path, node);
@@ -28,22 +35,6 @@ impl<'a> Scenegraph<'a> {
 			.get(path)
 			.map_or(WeakCell::new(), RcCell::downgrade)
 	}
-
-	pub fn add_interfaces(&mut self, client: &mut Client<'a>) -> Result<()> {
-		self.root = Spatial::new_node(Some(client), "/", Default::default())?;
-		self.hmd = Spatial::new_node(Some(client), "/hmd", Default::default())?;
-		Ok(())
-	}
-}
-
-impl<'a> Default for Scenegraph<'a> {
-	fn default() -> Self {
-		Scenegraph {
-			nodes: HashMap::new(),
-			root: WeakCell::new(),
-			hmd: WeakCell::new(),
-		}
-	}
 }
 
 impl<'a> scenegraph::Scenegraph for Scenegraph<'a> {