From bb356f6cb154491cfdb33a6c871209d5cf9cdbdb Mon Sep 17 00:00:00 2001 From: Nova Date: Mon, 6 Jun 2022 23:34:44 -0400 Subject: [PATCH] refactor(node): use sized fn instead of dyn Fn for signals/methods --- src/nodes/core.rs | 20 +++---- src/nodes/spatial.rs | 123 +++++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 73 deletions(-) diff --git a/src/nodes/core.rs b/src/nodes/core.rs index 7d75d43..34b124c 100644 --- a/src/nodes/core.rs +++ b/src/nodes/core.rs @@ -4,18 +4,18 @@ 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 = fn(&Node, Rc, &[u8]) -> Result<()>; +pub type Method = fn(&Node, Rc, &[u8]) -> Result>; pub struct Node<'a> { client: Weak>, path: String, trailing_slash_pos: usize, - local_signals: HashMap>, - local_methods: HashMap>, + local_signals: HashMap, + local_methods: HashMap, destroyable: bool, - pub spatial: Option>, + pub spatial: Option>>, } impl<'a> Node<'a> { @@ -44,7 +44,7 @@ impl<'a> Node<'a> { } } - pub fn add_local_signal(&mut self, method: &str, signal: Signal<'a>) { + pub fn add_local_signal(&mut self, method: &str, signal: Signal) { self.local_signals.insert(method.to_string(), signal); } @@ -58,7 +58,7 @@ impl<'a> Node<'a> { .local_signals .get(method) .ok_or_else(|| anyhow!("Signal {} not found", method))?; - signal(calling_client, data) + signal(self, calling_client, data) } pub fn execute_local_method( &self, @@ -66,9 +66,11 @@ impl<'a> Node<'a> { method: &str, data: &[u8], ) -> Result> { - self.local_methods + let method = self + .local_methods .get(method) - .ok_or_else(|| anyhow!("Method {} not found", method))?(calling_client, data) + .ok_or_else(|| anyhow!("Method {} not found", method))?; + method(self, calling_client, data) } pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> { self.get_client() diff --git a/src/nodes/spatial.rs b/src/nodes/spatial.rs index a9414d6..c660dae 100644 --- a/src/nodes/spatial.rs +++ b/src/nodes/spatial.rs @@ -4,12 +4,13 @@ use anyhow::{anyhow, bail, ensure, Result}; use glam::Mat4; use libstardustxr::{flex_to_quat, flex_to_vec3}; use rccell::{RcCell, WeakCell}; +use std::cell::Cell; use std::rc::Rc; pub struct Spatial<'a> { node: WeakCell>, parent: WeakCell>, - transform: Mat4, + transform: Cell, } impl<'a> Spatial<'a> { @@ -24,57 +25,52 @@ impl<'a> Spatial<'a> { let spatial = Spatial { node: node.downgrade(), parent, - transform, + transform: Cell::new(transform), }; - let node_captured = node.clone(); - node.borrow_mut().add_local_signal( - "setTransform", - Box::new(move |calling_client, data| { - let root = flexbuffers::Reader::get_root(data)?; - let flex_vec = root.get_vector()?; - let client = node_captured - .borrow() - .get_client() - .ok_or_else(|| anyhow!("Node somehow has no client"))?; - let other_spatial = calling_client - .get_scenegraph() - .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!" - ); - let pos = flex_to_vec3!(flex_vec.idx(1)); - let rot = flex_to_quat!(flex_vec.idx(2)); - let scl = flex_to_vec3!(flex_vec.idx(3)); - node_captured - .borrow_mut() - .spatial - .as_mut() - .unwrap() - .set_transform_components(client, other_spatial, pos, rot, scl); - Ok(()) - }), + node.borrow_mut() + .add_local_signal("setTransform", Spatial::set_transform_flex); + node.borrow_mut().spatial = Some(Rc::new(spatial)); + Ok(()) + } + + pub fn set_transform_flex(node: &Node, calling_client: Rc, data: &[u8]) -> Result<()> { + let root = flexbuffers::Reader::get_root(data)?; + let flex_vec = root.get_vector()?; + let client = node + .get_client() + .ok_or_else(|| anyhow!("Node somehow has no client"))?; + let other_spatial = calling_client + .get_scenegraph() + .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!" ); - node.borrow_mut().spatial = Some(spatial); + let pos = flex_to_vec3!(flex_vec.idx(1)); + let rot = flex_to_quat!(flex_vec.idx(2)); + let scl = flex_to_vec3!(flex_vec.idx(3)); + node.spatial + .as_ref() + .unwrap() + .set_transform_components(other_spatial, pos, rot, scl); Ok(()) } pub fn local_transform(&self) -> Mat4 { - self.transform + self.transform.get() } pub fn global_transform(&self) -> Mat4 { match self.parent.upgrade() { Some(value) => { - value.borrow().spatial.as_ref().unwrap().global_transform() * self.transform + value.borrow().spatial.as_ref().unwrap().global_transform() * self.transform.get() } - None => self.transform, + None => self.transform.get(), } } pub fn set_transform_components( - &mut self, - calling_client: Rc, + &self, relative_space: RcCell, pos: Option>, rot: Option>, @@ -88,32 +84,31 @@ impl<'a> Spatial<'a> { 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( - Rc::downgrade(&calling_client), - "/spatial", - flex_vec.idx(0).get_str()?, - true, - ); - let transform = Mat4::from_scale_rotation_translation( - flex_to_vec3!(flex_vec.idx(4)) - .ok_or_else(|| anyhow!("Scale not found"))? - .into(), - flex_to_quat!(flex_vec.idx(3)) - .ok_or_else(|| anyhow!("Rotation not found"))? - .into(), - flex_to_vec3!(flex_vec.idx(2)) - .ok_or_else(|| anyhow!("Position not found"))? - .into(), - ); - let node_rc = calling_client.get_scenegraph().add_node(node); - Spatial::add_to(node_rc, WeakCell::new(), transform)?; - Ok(()) - }), - ); + node.add_local_signal("createSpatial", create_spatial_flex); client.get_scenegraph().add_node(node); } + +pub fn create_spatial_flex(_node: &Node, calling_client: Rc, data: &[u8]) -> Result<()> { + let root = flexbuffers::Reader::get_root(data)?; + let flex_vec = root.get_vector()?; + let spatial = Node::create( + Rc::downgrade(&calling_client), + "/spatial", + flex_vec.idx(0).get_str()?, + true, + ); + let transform = Mat4::from_scale_rotation_translation( + flex_to_vec3!(flex_vec.idx(4)) + .ok_or_else(|| anyhow!("Scale not found"))? + .into(), + flex_to_quat!(flex_vec.idx(3)) + .ok_or_else(|| anyhow!("Rotation not found"))? + .into(), + flex_to_vec3!(flex_vec.idx(2)) + .ok_or_else(|| anyhow!("Position not found"))? + .into(), + ); + let spatial_rc = calling_client.get_scenegraph().add_node(spatial); + Spatial::add_to(spatial_rc, WeakCell::new(), transform)?; + Ok(()) +}