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

fix(spatial): set spatial parent in place correct reference space

Browse Source
This commit is contained in:
Nova
2022-09-05 01:22:09 -04:00
parent e5062a4bbb
commit d23d974e34
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nodes/model.rs
View File

@@ -109,9 +109,10 @@ impl Model {
material_parameters.clear(); material_parameters.clear();
} }
let global_transform = self.space.global_transform().into();
sk_model.draw( sk_model.draw(
draw_ctx, draw_ctx,
self.space.global_transform().into(), global_transform,
Rgba::new(Rgb::new(1_f32, 1_f32, 1_f32), 1_f32), Rgba::new(Rgb::new(1_f32, 1_f32, 1_f32), 1_f32),
RenderLayer::Layer0, RenderLayer::Layer0,
); );

4
src/nodes/spatial.rs
View File

@@ -12,7 +12,7 @@ use std::sync::{Arc, Weak};
pub struct Spatial { pub struct Spatial {
pub(super) node: Weak<Node>, pub(super) node: Weak<Node>,
parent: Mutex<Option<Arc<Spatial>>>, parent: Mutex<Option<Arc<Spatial>>>,
transform: Mutex<Mat4>, pub(super) transform: Mutex<Mat4>,
} }
impl Spatial { impl Spatial {
@@ -135,7 +135,7 @@ impl Spatial {
} }
self.set_local_transform(Spatial::space_to_space_matrix( self.set_local_transform(Spatial::space_to_space_matrix(
self.parent.lock().as_deref(), Some(self),
parent.cloned().as_deref(), parent.cloned().as_deref(),
)); ));
*self.parent.lock() = parent.cloned(); *self.parent.lock() = parent.cloned();