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

fix: cache global transform

Browse Source
This commit is contained in:
Nova
2025-09-21 02:47:34 -07:00
parent 3e4be41d3f
commit b542dc1b23
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nodes/spatial/mod.rs
View File

@@ -164,6 +164,7 @@ pub struct Spatial {
parent: Mutex<Option<Arc<Spatial>>>, parent: Mutex<Option<Arc<Spatial>>>,
old_parent: Mutex<Option<Arc<Spatial>>>, old_parent: Mutex<Option<Arc<Spatial>>>,
transform: Mutex<Mat4>, transform: Mutex<Mat4>,
cached_global_transform: Mutex<Option<Mat4>>,
zone: Mutex<Weak<Zone>>, zone: Mutex<Weak<Zone>>,
children: Registry<Spatial>, children: Registry<Spatial>,
pub bounding_box_calc: OnceLock<fn(&Node) -> Aabb>, pub bounding_box_calc: OnceLock<fn(&Node) -> Aabb>,
@@ -177,6 +178,7 @@ impl Spatial {
parent: Mutex::new(parent), parent: Mutex::new(parent),
old_parent: Mutex::new(None), old_parent: Mutex::new(None),
transform: Mutex::new(transform), transform: Mutex::new(transform),
cached_global_transform: Mutex::new(None),
zone: Mutex::new(Weak::new()), zone: Mutex::new(Weak::new()),
children: Registry::new(), children: Registry::new(),
bounding_box_calc: OnceLock::default(), bounding_box_calc: OnceLock::default(),
@@ -237,18 +239,27 @@ impl Spatial {
bounds bounds
} }
fn clear_cached_global_transform(&self) {
self.cached_global_transform.lock().take();
for child in self.children.get_valid_contents() {
child.clear_cached_global_transform();
}
}
pub fn local_transform(&self) -> Mat4 { pub fn local_transform(&self) -> Mat4 {
*self.transform.lock() *self.transform.lock()
} }
pub fn global_transform(&self) -> Mat4 { pub fn global_transform(&self) -> Mat4 {
let parent_transform = self *self.cached_global_transform.lock().get_or_insert_with(|| {
.get_parent() let parent_transform = self
.as_deref() .get_parent()
.map(Self::global_transform) .as_deref()
.unwrap_or_default(); .map(Self::global_transform)
parent_transform * self.local_transform() .unwrap_or_default();
parent_transform * self.local_transform()
})
} }
pub fn set_local_transform(&self, transform: Mat4) { pub fn set_local_transform(&self, transform: Mat4) {
self.clear_cached_global_transform();
*self.transform.lock() = transform; *self.transform.lock() = transform;
} }
pub fn set_local_transform_components( pub fn set_local_transform_components(
@@ -317,6 +328,7 @@ impl Spatial {
parent.children.remove(self); parent.children.remove(self);
} }
new_parent.children.add_raw(self); new_parent.children.add_raw(self);
self.clear_cached_global_transform();
*self.parent.lock() = Some(new_parent.clone()); *self.parent.lock() = Some(new_parent.clone());
} }