From faf13aef243d7d63e6dd6e9c1a515512a7260ea2 Mon Sep 17 00:00:00 2001 From: Nova Date: Mon, 26 Sep 2022 01:54:48 -0400 Subject: [PATCH] refactor(spatial): rename get_*_flex to parse_ --- src/nodes/data.rs | 4 ++-- src/nodes/drawable/model.rs | 4 ++-- src/nodes/input/mod.rs | 4 ++-- src/nodes/items/mod.rs | 6 +++--- src/nodes/spatial.rs | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/nodes/data.rs b/src/nodes/data.rs index 7cca182..f02d764 100644 --- a/src/nodes/data.rs +++ b/src/nodes/data.rs @@ -1,5 +1,5 @@ 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 crate::core::client::Client; use crate::core::nodelist::LifeLinkedNodeList; @@ -287,7 +287,7 @@ pub fn create_pulse_receiver_flex( true, ); 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 .scenegraph .get_node(flex_vec.idx(4).as_str()) diff --git a/src/nodes/drawable/model.rs b/src/nodes/drawable/model.rs index 0f227ea..2812496 100644 --- a/src/nodes/drawable/model.rs +++ b/src/nodes/drawable/model.rs @@ -3,7 +3,7 @@ use crate::core::client::Client; use crate::core::destroy_queue; use crate::core::registry::Registry; 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 flexbuffers::FlexBufferType; use once_cell::sync::OnceCell; @@ -173,7 +173,7 @@ pub fn create(_node: &Node, calling_client: Arc, data: &[u8]) -> Result< ); 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 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(); Spatial::add_to(&node, Some(parent), transform)?; Model::add_to(&node, resource_id)?; diff --git a/src/nodes/input/mod.rs b/src/nodes/input/mod.rs index c286a3b..f949e00 100644 --- a/src/nodes/input/mod.rs +++ b/src/nodes/input/mod.rs @@ -5,7 +5,7 @@ use self::hand::Hand; use self::pointer::Pointer; 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 crate::core::client::Client; use crate::core::eventloop::FRAME; @@ -218,7 +218,7 @@ pub fn create_input_handler_flex( true, ); 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 .scenegraph .get_node(flex_vec.idx(4).as_str()) diff --git a/src/nodes/items/mod.rs b/src/nodes/items/mod.rs index b1462a2..743c739 100644 --- a/src/nodes/items/mod.rs +++ b/src/nodes/items/mod.rs @@ -3,7 +3,7 @@ mod environment; use self::environment::EnvironmentItem; 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 crate::core::client::{Client, INTERNAL_CLIENT}; use crate::core::nodelist::LifeLinkedNodeList; @@ -352,7 +352,7 @@ pub fn create_environment_item_flex( true, ); 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(); Spatial::add_to(&node, None, transform * space.global_transform())?; 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 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 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 .scenegraph .get_node(flex_vec.idx(4).get_str()?) diff --git a/src/nodes/spatial.rs b/src/nodes/spatial.rs index 04998d7..43830f8 100644 --- a/src/nodes/spatial.rs +++ b/src/nodes/spatial.rs @@ -266,7 +266,7 @@ pub fn get_spatial_parent_flex( .ok_or_else(|| anyhow!("Spatial parent node is not a spatial"))? .clone()) } -pub fn get_transform_pose_flex( +pub fn parse_pose( translation: flexbuffers::Reader, rotation: flexbuffers::Reader, ) -> Result { @@ -279,7 +279,7 @@ pub fn get_transform_pose_flex( .into(), )) } -pub fn get_transform_flex( +pub fn parse_transform( translation: flexbuffers::Reader, rotation: flexbuffers::Reader, scale: flexbuffers::Reader, @@ -312,7 +312,7 @@ pub fn create_spatial_flex(_node: &Node, calling_client: Arc, data: &[u8 true, ); 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(); Spatial::add_to(&node, Some(parent), transform)?; Ok(())