diff --git a/src/core/client.rs b/src/core/client.rs index d96e374..8ca2eea 100644 --- a/src/core/client.rs +++ b/src/core/client.rs @@ -2,20 +2,20 @@ use super::scenegraph::Scenegraph; use crate::nodes::spatial; use libstardustxr::messenger::Messenger; use mio::net::UnixStream; -use rccell::{RcCell, WeakCell}; +use std::rc::Rc; pub struct Client<'a> { - pub messenger: Messenger<'a>, + messenger: Messenger<'a>, scenegraph: Scenegraph<'a>, } impl<'a> Client<'a> { - pub fn from_connection(connection: UnixStream) -> RcCell { - let client = RcCell::new(Client { - scenegraph: Default::default(), + pub fn from_connection(connection: UnixStream) -> Rc { + let client = Rc::new(Client { messenger: Messenger::new(connection), + scenegraph: Default::default(), }); - client.borrow_mut().scenegraph.set_client(client.clone()); + client.scenegraph.set_client(&client); spatial::create_interface(client.clone()); client } @@ -29,7 +29,4 @@ impl<'a> Client<'a> { pub fn get_scenegraph(&self) -> &Scenegraph<'a> { &self.scenegraph } - pub fn get_scenegraph_mut(&mut self) -> &mut Scenegraph<'a> { - &mut self.scenegraph - } } diff --git a/src/core/eventloop.rs b/src/core/eventloop.rs index a5a650a..4777b36 100644 --- a/src/core/eventloop.rs +++ b/src/core/eventloop.rs @@ -1,12 +1,12 @@ use super::client::Client; -use anyhow::{anyhow, Result}; +use anyhow::Result; use libstardustxr::server; use mio::net::UnixListener; use mio::unix::pipe; use mio::{Events, Interest, Poll, Token}; -use rccell::RcCell; use slab::Slab; use std::io::Write; +use std::rc::Rc; use std::thread::{self, JoinHandle}; pub struct EventLoop { @@ -24,7 +24,7 @@ impl EventLoop { let join_handle = thread::Builder::new() .name("event_loop".to_owned()) .spawn(move || -> Result<()> { - let mut clients: Slab>> = Slab::new(); + let mut clients: Slab>> = Slab::new(); let mut poll = Poll::new()?; let mut events = Events::with_capacity(1024); const LISTENER: Token = Token(usize::MAX - 1); @@ -59,14 +59,7 @@ impl EventLoop { }, STOP => return Ok(()), token => loop { - match clients - .get(token.0) - .unwrap() - .as_ref() - .unwrap() - .borrow() - .dispatch() - { + match clients.get(token.0).unwrap().as_ref().unwrap().dispatch() { Ok(_) => continue, Err(e) => { if e.kind() == std::io::ErrorKind::WouldBlock { diff --git a/src/core/scenegraph.rs b/src/core/scenegraph.rs index bba4a58..679602c 100644 --- a/src/core/scenegraph.rs +++ b/src/core/scenegraph.rs @@ -3,43 +3,45 @@ use crate::nodes::core::Node; use anyhow::Result; use libstardustxr::scenegraph; use libstardustxr::scenegraph::ScenegraphError; -use rccell::{RcCell, WeakCell}; +use rccell::RcCell; +use std::cell::RefCell; use std::collections::HashMap; +use std::rc::{Rc, Weak}; +use std::sync::RwLock; +#[derive(Default)] pub struct Scenegraph<'a> { - client: WeakCell>, - pub nodes: HashMap>>, + client: RefCell>>, + pub nodes: RwLock>>>, } impl<'a> Scenegraph<'a> { - pub fn set_client(&mut self, client: RcCell>) { - self.client = client.downgrade(); + pub fn get_client(&self) -> Rc> { + self.client.borrow().upgrade().unwrap() } - pub fn add_node(&mut self, node: Node<'a>) -> RcCell> { + pub fn set_client(&self, client: &Rc>) { + *self.client.borrow_mut() = Rc::downgrade(client); + } + + pub fn add_node(&self, node: Node<'a>) -> RcCell> { let path = node.get_path().to_string(); let node_rc = RcCell::new(node); - self.nodes.insert(path, node_rc.clone()); + self.nodes.write().unwrap().insert(path, node_rc.clone()); node_rc } -} -impl<'a> Default for Scenegraph<'a> { - fn default() -> Self { - Scenegraph { - client: WeakCell::new(), - nodes: HashMap::new(), - } + pub fn get_node(&self, path: &str) -> Option>> { + Some(self.nodes.read().ok()?.get(path)?.clone()) } } impl<'a> scenegraph::Scenegraph for Scenegraph<'a> { fn send_signal(&self, path: &str, method: &str, data: &[u8]) -> Result<(), ScenegraphError> { - self.nodes - .get(path) + self.get_node(path) .ok_or(ScenegraphError::NodeNotFound)? .borrow() - .send_local_signal(self.client.upgrade().unwrap(), method, data) + .send_local_signal(self.get_client(), method, data) .map_err(|_| ScenegraphError::MethodNotFound) } fn execute_method( @@ -48,11 +50,10 @@ impl<'a> scenegraph::Scenegraph for Scenegraph<'a> { method: &str, data: &[u8], ) -> Result, ScenegraphError> { - self.nodes - .get(path) + self.get_node(path) .ok_or(ScenegraphError::NodeNotFound)? .borrow() - .execute_local_method(self.client.upgrade().unwrap(), method, data) + .execute_local_method(self.get_client(), method, data) .map_err(|_| ScenegraphError::MethodNotFound) } } diff --git a/src/nodes/core.rs b/src/nodes/core.rs index 6a26256..7d75d43 100644 --- a/src/nodes/core.rs +++ b/src/nodes/core.rs @@ -1,14 +1,14 @@ use crate::core::client::Client; use crate::nodes::spatial::Spatial; -use anyhow::{anyhow, ensure, Result}; -use rccell::{RcCell, WeakCell}; +use anyhow::{anyhow, Result}; +use std::rc::{Rc, Weak}; use std::{collections::HashMap, vec::Vec}; -pub type Signal<'a> = Box, &[u8]) -> Result<()> + 'a>; -pub type Method<'a> = Box, &[u8]) -> Result> + 'a>; +pub type Signal<'a> = Box, &[u8]) -> Result<()> + 'a>; +pub type Method<'a> = Box, &[u8]) -> Result> + 'a>; pub struct Node<'a> { - client: WeakCell>, + client: Weak>, path: String, trailing_slash_pos: usize, local_signals: HashMap>, @@ -19,7 +19,7 @@ pub struct Node<'a> { } impl<'a> Node<'a> { - pub fn get_client(&self) -> Option>> { + pub fn get_client(&self) -> Option>> { self.client.clone().upgrade() } pub fn get_name(&self) -> &str { @@ -29,18 +29,13 @@ impl<'a> Node<'a> { self.path.as_str() } - pub fn create( - client: WeakCell>, - parent: &str, - name: &str, - destroyable: bool, - ) -> Self { + pub fn create(client: Weak>, parent: &str, name: &str, destroyable: bool) -> Self { let mut path = parent.to_string(); path.push('/'); path.push_str(name); Node { client, - path: path, + path, trailing_slash_pos: parent.len(), local_signals: HashMap::new(), local_methods: HashMap::new(), @@ -55,7 +50,7 @@ impl<'a> Node<'a> { pub fn send_local_signal( &self, - calling_client: RcCell, + calling_client: Rc, method: &str, data: &[u8], ) -> Result<()> { @@ -67,7 +62,7 @@ impl<'a> Node<'a> { } pub fn execute_local_method( &self, - calling_client: RcCell, + calling_client: Rc, method: &str, data: &[u8], ) -> Result> { @@ -77,8 +72,7 @@ impl<'a> Node<'a> { } pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> { self.get_client() - .ok_or(anyhow!("Node has no client, can't send remote signal!"))? - .borrow() + .ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))? .get_messenger() .send_remote_signal(self.path.as_str(), method, data) .map_err(|_| anyhow!("Unable to write in messenger")) @@ -90,8 +84,7 @@ impl<'a> Node<'a> { callback: Box, ) -> Result<()> { self.get_client() - .ok_or(anyhow!("Node has no client, can't send remote signal!"))? - .borrow() + .ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))? .get_messenger() .execute_remote_method(self.path.as_str(), method, data, callback) .map_err(|_| anyhow!("Unable to write in messenger")) diff --git a/src/nodes/spatial.rs b/src/nodes/spatial.rs index 0170b5f..a9414d6 100644 --- a/src/nodes/spatial.rs +++ b/src/nodes/spatial.rs @@ -1,9 +1,10 @@ use super::core::Node; use crate::core::client::Client; use anyhow::{anyhow, bail, ensure, Result}; -use glam::{Mat4, Quat, Vec3}; +use glam::Mat4; use libstardustxr::{flex_to_quat, flex_to_vec3}; use rccell::{RcCell, WeakCell}; +use std::rc::Rc; pub struct Spatial<'a> { node: WeakCell>, @@ -34,14 +35,11 @@ impl<'a> Spatial<'a> { let client = node_captured .borrow() .get_client() - .ok_or(anyhow!("Node somehow has no client!"))?; + .ok_or_else(|| anyhow!("Node somehow has no client"))?; let other_spatial = calling_client - .borrow() .get_scenegraph() - .nodes - .get(flex_vec.idx(0).as_str()) - .ok_or(anyhow!("Spatial node not found"))? - .clone(); + .get_node(flex_vec.idx(0).as_str()) + .ok_or_else(|| anyhow!("Other spatial node not found"))?; ensure!( other_spatial.borrow().spatial.is_some(), "Node is not a Spatial!" @@ -54,7 +52,7 @@ impl<'a> Spatial<'a> { .spatial .as_mut() .unwrap() - .set_transform_components(client, other_spatial, pos.into(), rot, scl); + .set_transform_components(client, other_spatial, pos, rot, scl); Ok(()) }), ); @@ -76,7 +74,7 @@ impl<'a> Spatial<'a> { pub fn set_transform_components( &mut self, - calling_client: RcCell, + calling_client: Rc, relative_space: RcCell, pos: Option>, rot: Option>, @@ -88,15 +86,15 @@ impl<'a> Spatial<'a> { // pub fn relative_transform(&self, space: WeakCell) {} } -pub fn create_interface(client: RcCell) { - let mut node = Node::create(client.downgrade(), "", "spatial", false); +pub fn create_interface(client: Rc) { + let mut node = Node::create(Rc::downgrade(&client), "", "spatial", false); node.add_local_signal( "createSpatial", Box::new(move |calling_client, data| { let root = flexbuffers::Reader::get_root(data)?; let flex_vec = root.get_vector()?; let node = Node::create( - calling_client.downgrade(), + Rc::downgrade(&calling_client), "/spatial", flex_vec.idx(0).get_str()?, true, @@ -112,13 +110,10 @@ pub fn create_interface(client: RcCell) { .ok_or_else(|| anyhow!("Position not found"))? .into(), ); - let node_rc = calling_client - .borrow_mut() - .get_scenegraph_mut() - .add_node(node); + let node_rc = calling_client.get_scenegraph().add_node(node); Spatial::add_to(node_rc, WeakCell::new(), transform)?; Ok(()) }), ); - client.borrow_mut().get_scenegraph_mut().add_node(node); + client.get_scenegraph().add_node(node); }