From 323d1e01fe2cb5b7349d1d6233db20071ba5e5a8 Mon Sep 17 00:00:00 2001 From: Nova Date: Tue, 17 May 2022 16:32:06 -0400 Subject: [PATCH] feat(scenegraph): default interface creation --- src/core/client.rs | 3 ++- src/core/scenegraph.rs | 16 +++++++++++----- src/nodes/spatial.rs | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/core/client.rs b/src/core/client.rs index 6a49d77..a566003 100644 --- a/src/core/client.rs +++ b/src/core/client.rs @@ -1,4 +1,5 @@ use super::scenegraph::Scenegraph; +use crate::nodes::core::{Node, NodeRef}; use libstardustxr::messenger::Messenger; use mio::net::UnixStream; use std::rc::{Rc, Weak}; @@ -11,7 +12,7 @@ pub struct Client<'a> { impl<'a> Client<'a> { pub fn from_connection(connection: UnixStream) -> Self { Client { - scenegraph: Scenegraph::new(), + scenegraph: Default::default(), messenger: Rc::new(Messenger::new(connection)), } } diff --git a/src/core/scenegraph.rs b/src/core/scenegraph.rs index afbe3d6..201d6e2 100644 --- a/src/core/scenegraph.rs +++ b/src/core/scenegraph.rs @@ -1,4 +1,6 @@ -use crate::nodes::core::Node; +use crate::core::client::Client; +use crate::nodes::core::{Node, NodeRef}; +use crate::nodes::spatial::Spatial; use anyhow::Result; use libstardustxr::scenegraph; use libstardustxr::scenegraph::ScenegraphError; @@ -7,13 +9,11 @@ use std::{cell::RefCell, collections::HashMap, rc::Rc, rc::Weak}; #[derive(Default)] pub struct Scenegraph<'a> { nodes: HashMap>>>, + root: NodeRef<'a>, + hmd: NodeRef<'a>, } impl<'a> Scenegraph<'a> { - pub fn new() -> Self { - Default::default() - } - pub fn add_node(&mut self, node: Rc>>) { let path = node.borrow().get_path().to_string(); self.nodes.insert(path, node); @@ -26,6 +26,12 @@ impl<'a> Scenegraph<'a> { pub fn get_node(&self, path: &str) -> Weak>> { self.nodes.get(path).map_or(Weak::default(), Rc::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> scenegraph::Scenegraph for Scenegraph<'a> { diff --git a/src/nodes/spatial.rs b/src/nodes/spatial.rs index 7b233f1..2b7cf2f 100644 --- a/src/nodes/spatial.rs +++ b/src/nodes/spatial.rs @@ -13,7 +13,7 @@ impl<'a> Spatial { } pub fn new_node( - client: Option<&'a mut Client<'a>>, + client: Option<&mut Client<'a>>, path: &str, transform: Mat4, ) -> Result> {