StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(spatial): return Rc<Spatial> from add_to

Browse Source
This commit is contained in:
Nova
2022-06-11 15:44:05 -04:00
parent c325cb8595
commit c0df71a40f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nodes/spatial.rs
View File

@@ -16,7 +16,11 @@ pub struct Spatial {
} }
impl Spatial { impl Spatial {
pub fn add_to(node: RcCell<Node>, parent: Option<Rc<Spatial>>, transform: Mat4) -> Result<()> { pub fn add_to(
node: &RcCell<Node>,
parent: Option<Rc<Spatial>>,
transform: Mat4,
) -> Result<Rc<Spatial>> {
if node.borrow_mut().spatial.is_none() { if node.borrow_mut().spatial.is_none() {
bail!("Node already has a Spatial aspect!"); bail!("Node already has a Spatial aspect!");
} }
@@ -29,8 +33,9 @@ impl Spatial {
.add_local_method("getTransform", Spatial::get_transform_flex); .add_local_method("getTransform", Spatial::get_transform_flex);
node.borrow_mut() node.borrow_mut()
.add_local_signal("setTransform", Spatial::set_transform_flex); .add_local_signal("setTransform", Spatial::set_transform_flex);
node.borrow_mut().spatial = Some(Rc::new(spatial)); let spatial_rc = Rc::new(spatial);
Ok(()) node.borrow_mut().spatial = Some(spatial_rc.clone());
Ok(spatial_rc)
} }
pub fn space_to_space_matrix(from: Option<&Spatial>, to: Option<&Spatial>) -> Mat4 { pub fn space_to_space_matrix(from: Option<&Spatial>, to: Option<&Spatial>) -> Mat4 {
@@ -180,6 +185,6 @@ pub fn create_spatial_flex(_node: &Node, calling_client: Rc<Client>, data: &[u8]
.into(), .into(),
); );
let spatial_rc = calling_client.get_scenegraph().add_node(spatial); let spatial_rc = calling_client.get_scenegraph().add_node(spatial);
Spatial::add_to(spatial_rc, parent, transform)?; Spatial::add_to(&spatial_rc, parent, transform)?;
Ok(()) Ok(())
} }