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

refactor(node): defer setting client until adding to scenegraph

Browse Source
This commit is contained in:
Nova
2022-06-14 18:18:22 -04:00
parent beaa3d0e6b
commit 651fa5f012
4 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nodes/field.rs
View File

@@ -336,7 +336,7 @@ impl FieldTrait for SphereField {
}
pub fn create_interface(client: Rc<Client>) {
let mut node = Node::create(Rc::downgrade(&client), "", "field", false);
let mut node = Node::create("", "field", false);
node.add_local_signal("createBoxField", create_box_field_flex);
node.add_local_signal("createCylinderField", create_cylinder_field_flex);
node.add_local_signal("createSphereField", create_sphere_field_flex);
@@ -346,12 +346,7 @@ pub fn create_interface(client: Rc<Client>) {
pub fn create_box_field_flex(_node: &Node, calling_client: Rc<Client>, data: &[u8]) -> Result<()> {
let root = flexbuffers::Reader::get_root(data)?;
let flex_vec = root.get_vector()?;
let node = Node::create(
Rc::downgrade(&calling_client),
"/field",
flex_vec.idx(0).get_str()?,
true,
);
let node = Node::create("/field", flex_vec.idx(0).get_str()?, true);
let parent = calling_client
.get_scenegraph()
.get_node(flex_vec.idx(1).as_str())
@@ -378,12 +373,7 @@ pub fn create_cylinder_field_flex(
) -> Result<()> {
let root = flexbuffers::Reader::get_root(data)?;
let flex_vec = root.get_vector()?;
let node = Node::create(
Rc::downgrade(&calling_client),
"/field",
flex_vec.idx(0).get_str()?,
true,
);
let node = Node::create("/field", flex_vec.idx(0).get_str()?, true);
let parent = calling_client
.get_scenegraph()
.get_node(flex_vec.idx(1).as_str())
@@ -411,12 +401,7 @@ pub fn create_sphere_field_flex(
) -> Result<()> {
let root = flexbuffers::Reader::get_root(data)?;
let flex_vec = root.get_vector()?;
let node = Node::create(
Rc::downgrade(&calling_client),
"/field",
flex_vec.idx(0).get_str()?,
true,
);
let node = Node::create("/field", flex_vec.idx(0).get_str()?, true);
let parent = calling_client
.get_scenegraph()
.get_node(flex_vec.idx(1).as_str())