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

refactor(spatial): get_transform_flex

Browse Source
This commit is contained in:
Nova
2022-09-26 01:53:37 -04:00
parent beca805a54
commit 20f022afc2
5 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nodes/spatial.rs
View File

@@ -267,8 +267,8 @@ pub fn get_spatial_parent_flex(
.clone())
}
pub fn get_transform_pose_flex<B: flexbuffers::Buffer>(
translation: &flexbuffers::Reader<B>,
rotation: &flexbuffers::Reader<B>,
translation: flexbuffers::Reader<B>,
rotation: flexbuffers::Reader<B>,
) -> Result<Mat4> {
Ok(Mat4::from_rotation_translation(
flex_to_quat!(rotation)
@@ -279,6 +279,23 @@ pub fn get_transform_pose_flex<B: flexbuffers::Buffer>(
.into(),
))
}
pub fn get_transform_flex<B: flexbuffers::Buffer>(
translation: flexbuffers::Reader<B>,
rotation: flexbuffers::Reader<B>,
scale: flexbuffers::Reader<B>,
) -> Result<Mat4> {
Ok(Mat4::from_scale_rotation_translation(
flex_to_vec3!(scale)
.ok_or_else(|| anyhow!("Scale not found"))?
.into(),
flex_to_quat!(rotation)
.ok_or_else(|| anyhow!("Rotation not found"))?
.into(),
flex_to_vec3!(translation)
.ok_or_else(|| anyhow!("Position not found"))?
.into(),
))
}
pub fn create_interface(client: &Arc<Client>) {
let node = Node::create(client, "", "spatial", false);
@@ -294,18 +311,8 @@ pub fn create_spatial_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8
flex_vec.idx(0).get_str()?,
true,
);
let parent = get_spatial_parent_flex(&calling_client, flex_vec.idx(1).get_str()?)?;
let transform = Mat4::from_scale_rotation_translation(
flex_to_vec3!(flex_vec.idx(4))
.ok_or_else(|| anyhow!("Scale not found"))?
.into(),
flex_to_quat!(flex_vec.idx(3))
.ok_or_else(|| anyhow!("Rotation not found"))?
.into(),
flex_to_vec3!(flex_vec.idx(2))
.ok_or_else(|| anyhow!("Position not found"))?
.into(),
);
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 node = node.add_to_scenegraph();
Spatial::add_to(&node, Some(parent), transform)?;
Ok(())