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

fix(lines): add a check to prevenmodel.enh

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-09-02 22:40:47 +02:00
parent bf85140b65
commit 6f113a9ec4
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ fn gen_model_parts(
client.scenegraph.add_node(Node::generate(&client, false)); client.scenegraph.add_node(Node::generate(&client, false));
let spatial = Spatial::add_to( let spatial = Spatial::add_to(
&node, &node,
Some(parent_spatial), Some(parent_spatial.clone()),
transform.compute_matrix(), transform.compute_matrix(),
false, false,
); );
@@ -241,6 +241,7 @@ fn gen_model_parts(
.and_then(|v| v.bounds.get().copied()) .and_then(|v| v.bounds.get().copied())
.unwrap_or_default() .unwrap_or_default()
}); });
spatial.set_spatial_parent(&parent_spatial);
spatial.set_local_transform(transform.compute_matrix()); spatial.set_local_transform(transform.compute_matrix());
spatial.set_entity(entity); spatial.set_entity(entity);

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

@@ -30,6 +30,7 @@ impl Plugin for SpatialNodePlugin {
PostUpdate, PostUpdate,
( (
spawn_spatial_nodes, spawn_spatial_nodes,
despawn_unneeded_spatial_nodes,
update_spatial_node_parenting, update_spatial_node_parenting,
update_spatial_nodes, update_spatial_nodes,
) )
@@ -48,7 +49,7 @@ fn spawn_spatial_nodes(mut cmds: Commands) {
let entity = cmds let entity = cmds
.spawn((SpatialNode(Arc::downgrade(&spatial)), Name::new("Spatial"))) .spawn((SpatialNode(Arc::downgrade(&spatial)), Name::new("Spatial")))
.id(); .id();
_ = spatial.set_entity(entity); spatial.set_entity(entity);
} }
} }
@@ -60,13 +61,18 @@ fn update_spatial_node_parenting(
let Some(spatial) = spatial.0.upgrade() else { let Some(spatial) = spatial.0.upgrade() else {
continue; continue;
}; };
let parent_entity = spatial
let Some(parent_entity) = spatial
.get_parent() .get_parent()
.and_then(|v| v.entity.lock().as_ref().map(|v| v.0)); .map(|v| v.entity.lock().as_ref().map(|v| v.0))
else {
continue;
};
// no changes needed, early exit // no changes needed, early exit
if parent.map(|v| v.0) == parent_entity { if parent.map(|v| v.0) == parent_entity {
continue; continue;
} }
info!("changing bevy parent: {:?} to {:?}", parent.map(|v| v.0), parent_entity);
match parent_entity { match parent_entity {
Some(e) => cmds.entity(entity).insert(ChildOf(e)), Some(e) => cmds.entity(entity).insert(ChildOf(e)),
None => cmds.entity(entity).remove::<ChildOf>(), None => cmds.entity(entity).remove::<ChildOf>(),
@@ -74,6 +80,15 @@ fn update_spatial_node_parenting(
} }
} }
fn despawn_unneeded_spatial_nodes(query: Query<(Entity, &SpatialNode)>, cmds: ParallelCommands) {
query.par_iter().for_each(|(entity, spatial_node)| {
if spatial_node.0.upgrade().is_none() {
info!("despawn {entity}");
cmds.command_scope(|mut cmds| cmds.entity(entity).despawn());
}
});
}
fn update_spatial_nodes( fn update_spatial_nodes(
mut query: Query<( mut query: Query<(
&mut BevyTransform, &mut BevyTransform,
@@ -321,6 +336,7 @@ impl Spatial {
self.parent.lock().clone() self.parent.lock().clone()
} }
fn set_parent(self: &Arc<Self>, new_parent: &Arc<Spatial>) { fn set_parent(self: &Arc<Self>, new_parent: &Arc<Spatial>) {
info!("setting parent for {:?}", self.node().map(|v| v.id));
if let Some(parent) = self.get_parent() { if let Some(parent) = self.get_parent() {
parent.children.remove(self); parent.children.remove(self);
} }