refactor: clean up all warnings by commenting or refactoring
This commit is contained in:
@@ -23,9 +23,9 @@ impl<'a> Client<'a> {
|
|||||||
self.messenger.dispatch(&self.scenegraph)
|
self.messenger.dispatch(&self.scenegraph)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_messenger(&self) -> &Messenger<'a> {
|
// pub fn get_messenger(&self) -> &Messenger<'a> {
|
||||||
&self.messenger
|
// &self.messenger
|
||||||
}
|
// }
|
||||||
pub fn get_scenegraph(&self) -> &Scenegraph<'a> {
|
pub fn get_scenegraph(&self) -> &Scenegraph<'a> {
|
||||||
&self.scenegraph
|
&self.scenegraph
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ pub type Method = fn(&Node, Rc<Client>, &[u8]) -> Result<Vec<u8>>;
|
|||||||
pub struct Node<'a> {
|
pub struct Node<'a> {
|
||||||
client: Weak<Client<'a>>,
|
client: Weak<Client<'a>>,
|
||||||
path: String,
|
path: String,
|
||||||
trailing_slash_pos: usize,
|
// trailing_slash_pos: usize,
|
||||||
local_signals: HashMap<String, Signal>,
|
local_signals: HashMap<String, Signal>,
|
||||||
local_methods: HashMap<String, Method>,
|
local_methods: HashMap<String, Method>,
|
||||||
destroyable: bool,
|
destroyable: bool,
|
||||||
@@ -22,9 +22,9 @@ impl<'a> Node<'a> {
|
|||||||
pub fn get_client(&self) -> Option<Rc<Client<'a>>> {
|
pub fn get_client(&self) -> Option<Rc<Client<'a>>> {
|
||||||
self.client.clone().upgrade()
|
self.client.clone().upgrade()
|
||||||
}
|
}
|
||||||
pub fn get_name(&self) -> &str {
|
// pub fn get_name(&self) -> &str {
|
||||||
&self.path[self.trailing_slash_pos + 1..]
|
// &self.path[self.trailing_slash_pos + 1..]
|
||||||
}
|
// }
|
||||||
pub fn get_path(&self) -> &str {
|
pub fn get_path(&self) -> &str {
|
||||||
self.path.as_str()
|
self.path.as_str()
|
||||||
}
|
}
|
||||||
@@ -39,7 +39,7 @@ impl<'a> Node<'a> {
|
|||||||
let mut node = Node {
|
let mut node = Node {
|
||||||
client,
|
client,
|
||||||
path,
|
path,
|
||||||
trailing_slash_pos: parent.len(),
|
// trailing_slash_pos: parent.len(),
|
||||||
local_signals: HashMap::new(),
|
local_signals: HashMap::new(),
|
||||||
local_methods: HashMap::new(),
|
local_methods: HashMap::new(),
|
||||||
destroyable,
|
destroyable,
|
||||||
@@ -92,23 +92,23 @@ impl<'a> Node<'a> {
|
|||||||
.ok_or_else(|| anyhow!("Method {} not found", method))?;
|
.ok_or_else(|| anyhow!("Method {} not found", method))?;
|
||||||
method(self, calling_client, data)
|
method(self, calling_client, data)
|
||||||
}
|
}
|
||||||
pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
// pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
||||||
self.get_client()
|
// self.get_client()
|
||||||
.ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))?
|
// .ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))?
|
||||||
.get_messenger()
|
// .get_messenger()
|
||||||
.send_remote_signal(self.path.as_str(), method, data)
|
// .send_remote_signal(self.path.as_str(), method, data)
|
||||||
.map_err(|_| anyhow!("Unable to write in messenger"))
|
// .map_err(|_| anyhow!("Unable to write in messenger"))
|
||||||
}
|
// }
|
||||||
pub fn execute_remote_method(
|
// pub fn execute_remote_method(
|
||||||
&self,
|
// &self,
|
||||||
method: &str,
|
// method: &str,
|
||||||
data: &[u8],
|
// data: &[u8],
|
||||||
callback: Box<dyn Fn(&[u8]) + 'a>,
|
// callback: Box<dyn Fn(&[u8]) + 'a>,
|
||||||
) -> Result<()> {
|
// ) -> Result<()> {
|
||||||
self.get_client()
|
// self.get_client()
|
||||||
.ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))?
|
// .ok_or_else(|| anyhow!("Node has no client, can't send remote signal!"))?
|
||||||
.get_messenger()
|
// .get_messenger()
|
||||||
.execute_remote_method(self.path.as_str(), method, data, callback)
|
// .execute_remote_method(self.path.as_str(), method, data, callback)
|
||||||
.map_err(|_| anyhow!("Unable to write in messenger"))
|
// .map_err(|_| anyhow!("Unable to write in messenger"))
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ use glam::{Mat4, Quat, Vec3};
|
|||||||
use libstardustxr::flex::flexbuffer_from_vector_arguments;
|
use libstardustxr::flex::flexbuffer_from_vector_arguments;
|
||||||
use libstardustxr::push_to_vec;
|
use libstardustxr::push_to_vec;
|
||||||
use libstardustxr::{flex_to_quat, flex_to_vec3};
|
use libstardustxr::{flex_to_quat, flex_to_vec3};
|
||||||
use rccell::{RcCell, WeakCell};
|
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<'a> {
|
||||||
node: WeakCell<Node<'a>>,
|
// node: WeakCell<Node<'a>>,
|
||||||
parent: RefCell<Option<Rc<Spatial<'a>>>>,
|
parent: RefCell<Option<Rc<Spatial<'a>>>>,
|
||||||
transform: Cell<Mat4>,
|
transform: Cell<Mat4>,
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,7 @@ impl<'a> Spatial<'a> {
|
|||||||
bail!("Node already has a Spatial aspect!");
|
bail!("Node already has a Spatial aspect!");
|
||||||
}
|
}
|
||||||
let spatial = Spatial {
|
let spatial = Spatial {
|
||||||
node: node.downgrade(),
|
// node: node.downgrade(),
|
||||||
parent: RefCell::new(parent),
|
parent: RefCell::new(parent),
|
||||||
transform: Cell::new(transform),
|
transform: Cell::new(transform),
|
||||||
};
|
};
|
||||||
@@ -69,9 +69,15 @@ impl<'a> Spatial<'a> {
|
|||||||
let (mut reference_space_scl, mut reference_space_rot, mut reference_space_pos) =
|
let (mut reference_space_scl, mut reference_space_rot, mut reference_space_pos) =
|
||||||
local_transform_in_reference_space.to_scale_rotation_translation();
|
local_transform_in_reference_space.to_scale_rotation_translation();
|
||||||
|
|
||||||
pos.map(|pos| reference_space_pos = pos);
|
if let Some(pos) = pos {
|
||||||
rot.map(|rot| reference_space_rot = rot);
|
reference_space_pos = pos
|
||||||
scl.map(|scl| reference_space_scl = scl);
|
}
|
||||||
|
if let Some(rot) = rot {
|
||||||
|
reference_space_rot = rot
|
||||||
|
}
|
||||||
|
if let Some(scl) = scl {
|
||||||
|
reference_space_scl = scl
|
||||||
|
}
|
||||||
|
|
||||||
local_transform_in_reference_space = Mat4::from_scale_rotation_translation(
|
local_transform_in_reference_space = Mat4::from_scale_rotation_translation(
|
||||||
reference_space_scl,
|
reference_space_scl,
|
||||||
@@ -122,7 +128,9 @@ impl<'a> Spatial<'a> {
|
|||||||
.as_ref()
|
.as_ref()
|
||||||
.ok_or_else(|| anyhow!("Node somehow is not spatial"))?;
|
.ok_or_else(|| anyhow!("Node somehow is not spatial"))?;
|
||||||
let reference_space_path = flex_vec.idx(0).as_str();
|
let reference_space_path = flex_vec.idx(0).as_str();
|
||||||
let reference_space_transform = if reference_space_path != "" {
|
let reference_space_transform = if reference_space_path.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
Some(
|
Some(
|
||||||
calling_client
|
calling_client
|
||||||
.get_scenegraph()
|
.get_scenegraph()
|
||||||
@@ -134,8 +142,6 @@ impl<'a> Spatial<'a> {
|
|||||||
.ok_or_else(|| anyhow!("Node is not a Spatial!"))?
|
.ok_or_else(|| anyhow!("Node is not a Spatial!"))?
|
||||||
.clone(),
|
.clone(),
|
||||||
)
|
)
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
};
|
||||||
spatial.set_local_transform_components(
|
spatial.set_local_transform_components(
|
||||||
reference_space_transform.as_deref(),
|
reference_space_transform.as_deref(),
|
||||||
|
|||||||
Reference in New Issue
Block a user