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

refactor(spatial): rename get_*_flex to parse_

Browse Source
This commit is contained in:
Nova
2022-09-26 01:54:48 -04:00
parent 20f022afc2
commit faf13aef24
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nodes/data.rs
View File

@@ -1,5 +1,5 @@
use super::fields::Field; use super::fields::Field;
use super::spatial::{get_spatial_parent_flex, get_transform_pose_flex, Spatial}; use super::spatial::{get_spatial_parent_flex, parse_pose, Spatial};
use super::{Alias, Node}; use super::{Alias, Node};
use crate::core::client::Client; use crate::core::client::Client;
use crate::core::nodelist::LifeLinkedNodeList; use crate::core::nodelist::LifeLinkedNodeList;
@@ -287,7 +287,7 @@ pub fn create_pulse_receiver_flex(
true, true,
); );
let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?; let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let transform = get_transform_pose_flex(flex_vec.idx(2), flex_vec.idx(3))?; let transform = parse_pose(flex_vec.idx(2), flex_vec.idx(3))?;
let field = calling_client let field = calling_client
.scenegraph .scenegraph
.get_node(flex_vec.idx(4).as_str()) .get_node(flex_vec.idx(4).as_str())

4
src/nodes/drawable/model.rs
View File

@@ -3,7 +3,7 @@ use crate::core::client::Client;
use crate::core::destroy_queue; use crate::core::destroy_queue;
use crate::core::registry::Registry; use crate::core::registry::Registry;
use crate::core::resource::{parse_resource_id, ResourceID}; use crate::core::resource::{parse_resource_id, ResourceID};
use crate::nodes::spatial::{get_spatial_parent_flex, get_transform_flex, Spatial}; use crate::nodes::spatial::{get_spatial_parent_flex, parse_transform, Spatial};
use anyhow::{anyhow, bail, ensure, Result}; use anyhow::{anyhow, bail, ensure, Result};
use flexbuffers::FlexBufferType; use flexbuffers::FlexBufferType;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
@@ -173,7 +173,7 @@ pub fn create(_node: &Node, calling_client: Arc<Client>, data: &[u8]) -> Result<
); );
let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?; let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let resource_id = parse_resource_id(flex_vec.idx(2))?; let resource_id = parse_resource_id(flex_vec.idx(2))?;
let transform = get_transform_flex(flex_vec.index(3)?, flex_vec.index(4)?, flex_vec.index(5)?)?; let transform = parse_transform(flex_vec.index(3)?, flex_vec.index(4)?, flex_vec.index(5)?)?;
let node = node.add_to_scenegraph(); let node = node.add_to_scenegraph();
Spatial::add_to(&node, Some(parent), transform)?; Spatial::add_to(&node, Some(parent), transform)?;
Model::add_to(&node, resource_id)?; Model::add_to(&node, resource_id)?;

4
src/nodes/input/mod.rs
View File

@@ -5,7 +5,7 @@ use self::hand::Hand;
use self::pointer::Pointer; use self::pointer::Pointer;
use super::fields::Field; use super::fields::Field;
use super::spatial::{get_spatial_parent_flex, get_transform_pose_flex, Spatial}; use super::spatial::{get_spatial_parent_flex, parse_pose, Spatial};
use super::Node; use super::Node;
use crate::core::client::Client; use crate::core::client::Client;
use crate::core::eventloop::FRAME; use crate::core::eventloop::FRAME;
@@ -218,7 +218,7 @@ pub fn create_input_handler_flex(
true, true,
); );
let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?; let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let transform = get_transform_pose_flex(flex_vec.idx(2), flex_vec.idx(3))?; let transform = parse_pose(flex_vec.idx(2), flex_vec.idx(3))?;
let field = calling_client let field = calling_client
.scenegraph .scenegraph
.get_node(flex_vec.idx(4).as_str()) .get_node(flex_vec.idx(4).as_str())

6
src/nodes/items/mod.rs
View File

@@ -3,7 +3,7 @@ mod environment;
use self::environment::EnvironmentItem; use self::environment::EnvironmentItem;
use super::fields::Field; use super::fields::Field;
use super::spatial::{get_spatial_parent_flex, get_transform_pose_flex, Spatial}; use super::spatial::{get_spatial_parent_flex, parse_pose, Spatial};
use super::{Alias, Node}; use super::{Alias, Node};
use crate::core::client::{Client, INTERNAL_CLIENT}; use crate::core::client::{Client, INTERNAL_CLIENT};
use crate::core::nodelist::LifeLinkedNodeList; use crate::core::nodelist::LifeLinkedNodeList;
@@ -352,7 +352,7 @@ pub fn create_environment_item_flex(
true, true,
); );
let space = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?; let space = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let transform = get_transform_pose_flex(flex_vec.idx(2), flex_vec.idx(3))?; let transform = parse_pose(flex_vec.idx(2), flex_vec.idx(3))?;
let node = node.add_to_scenegraph(); let node = node.add_to_scenegraph();
Spatial::add_to(&node, None, transform * space.global_transform())?; Spatial::add_to(&node, None, transform * space.global_transform())?;
EnvironmentItem::add_to(&node, flex_vec.idx(4).get_str()?.to_string()); EnvironmentItem::add_to(&node, flex_vec.idx(4).get_str()?.to_string());
@@ -372,7 +372,7 @@ pub fn create_item_acceptor_flex(
let flex_vec = root.get_vector()?; let flex_vec = root.get_vector()?;
let parent_name = format!("/item/{}/acceptor/", ITEM_TYPE_INFO_ENVIRONMENT.type_name); let parent_name = format!("/item/{}/acceptor/", ITEM_TYPE_INFO_ENVIRONMENT.type_name);
let space = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?; let space = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let transform = get_transform_pose_flex(flex_vec.idx(2), flex_vec.idx(3))?; let transform = parse_pose(flex_vec.idx(2), flex_vec.idx(3))?;
let field = calling_client let field = calling_client
.scenegraph .scenegraph
.get_node(flex_vec.idx(4).get_str()?) .get_node(flex_vec.idx(4).get_str()?)

6
src/nodes/spatial.rs
View File

@@ -266,7 +266,7 @@ pub fn get_spatial_parent_flex(
.ok_or_else(|| anyhow!("Spatial parent node is not a spatial"))? .ok_or_else(|| anyhow!("Spatial parent node is not a spatial"))?
.clone()) .clone())
} }
pub fn get_transform_pose_flex<B: flexbuffers::Buffer>( pub fn parse_pose<B: flexbuffers::Buffer>(
translation: flexbuffers::Reader<B>, translation: flexbuffers::Reader<B>,
rotation: flexbuffers::Reader<B>, rotation: flexbuffers::Reader<B>,
) -> Result<Mat4> { ) -> Result<Mat4> {
@@ -279,7 +279,7 @@ pub fn get_transform_pose_flex<B: flexbuffers::Buffer>(
.into(), .into(),
)) ))
} }
pub fn get_transform_flex<B: flexbuffers::Buffer>( pub fn parse_transform<B: flexbuffers::Buffer>(
translation: flexbuffers::Reader<B>, translation: flexbuffers::Reader<B>,
rotation: flexbuffers::Reader<B>, rotation: flexbuffers::Reader<B>,
scale: flexbuffers::Reader<B>, scale: flexbuffers::Reader<B>,
@@ -312,7 +312,7 @@ pub fn create_spatial_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8
true, true,
); );
let parent = get_spatial_parent_flex(&calling_client, flex_vec.index(1)?.get_str()?)?; let parent = get_spatial_parent_flex(&calling_client, flex_vec.index(1)?.get_str()?)?;
let transform = get_transform_flex(flex_vec.index(2)?, flex_vec.index(3)?, flex_vec.index(4)?)?; let transform = parse_transform(flex_vec.index(2)?, flex_vec.index(3)?, flex_vec.index(4)?)?;
let node = node.add_to_scenegraph(); let node = node.add_to_scenegraph();
Spatial::add_to(&node, Some(parent), transform)?; Spatial::add_to(&node, Some(parent), transform)?;
Ok(()) Ok(())