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

refactor(spatial): remove explicit lifetime specifier

Browse Source
This commit is contained in:
Nova
2022-06-11 14:39:26 -04:00
parent 26f66fc5a4
commit 7fbf92daf0
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nodes/core.rs
View File

@@ -15,7 +15,7 @@ pub struct Node<'a> {
local_methods: HashMap<String, Method>, local_methods: HashMap<String, Method>,
destroyable: bool, destroyable: bool,
pub spatial: Option<Rc<Spatial<'a>>>, pub spatial: Option<Rc<Spatial>>,
} }
impl<'a> Node<'a> { impl<'a> Node<'a> {

12
src/nodes/spatial.rs
View File

@@ -9,18 +9,14 @@ use rccell::RcCell;
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use std::rc::Rc; use std::rc::Rc;
pub struct Spatial<'a> { pub struct Spatial {
// node: WeakCell<Node<'a>>, // node: WeakCell<Node<'a>>,
parent: RefCell<Option<Rc<Spatial<'a>>>>, parent: RefCell<Option<Rc<Spatial>>>,
transform: Cell<Mat4>, transform: Cell<Mat4>,
} }
impl<'a> Spatial<'a> { impl Spatial {
pub fn add_to( pub fn add_to(node: RcCell<Node>, parent: Option<Rc<Spatial>>, transform: Mat4) -> Result<()> {
node: RcCell<Node<'a>>,
parent: Option<Rc<Spatial<'a>>>,
transform: Mat4,
) -> Result<()> {
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!");
} }