MayaTheShy/Starworld
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: replace model rendering with wireframe representation for all entity types in BridgeState

Browse Source
This commit is contained in:
MayaTheShy
2025-11-08 21:11:30 -05:00
parent a3f3c162a9
commit ddca268eaf
1 changed files with 33 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
bridge/src/lib.rs
View File

@@ -72,7 +72,8 @@ impl ClientState for BridgeState {
impl Reify for BridgeState { impl Reify for BridgeState {
fn reify(&self) -> impl ast::Element<Self> { fn reify(&self) -> impl ast::Element<Self> {
use stardust_xr_fusion::values::color::rgba_linear; use stardust_xr_fusion::values::color::rgba_linear;
use stardust_xr_asteroids::elements::ModelPart; use stardust_xr_fusion::drawable::{Line, LinePoint};
use stardust_xr_fusion::values::Vector3;
eprintln!("[bridge/reify] Reifying {} nodes", self.nodes.len()); eprintln!("[bridge/reify] Reifying {} nodes", self.nodes.len());
@@ -100,59 +101,37 @@ impl Reify for BridgeState {
// Use entity color if set // Use entity color if set
let node_color = rgba_linear!(node.color[0], node.color[1], node.color[2], node.color[3]); let node_color = rgba_linear!(node.color[0], node.color[1], node.color[2], node.color[3]);
// Entity types: 0=Unknown, 1=Box, 2=Sphere, 3=Model, ... // Simple wireframe cube for all entities for now - each entity gets its own Lines element
match node.entity_type { let t = 0.008; // line thickness
1 => { let hs = 0.5f32; // half size in model space (unit cube)
// Box entity - render as solid colored cube using built-in model
Some(( // Create a line for each edge
*id, let seg = |a: [f32;3], b: [f32;3]| -> Line {
Model::namespaced("fusion", "tex_cube") let p0 = LinePoint { point: Vector3 { x: a[0], y: a[1], z: a[2] }, thickness: t, color: node_color };
.part(ModelPart::new("Cube").mat_param("color", MaterialParameter::Color(node_color))) let p1 = LinePoint { point: Vector3 { x: b[0], y: b[1], z: b[2] }, thickness: t, color: node_color };
.pos([trans.x, trans.y, trans.z]) Line { points: vec![p0, p1], cyclic: false }
.rot([rot.x, rot.y, rot.z, rot.w]) };
.scl([vis_scale.x, vis_scale.y, vis_scale.z])
.build() let corners = [
)) [-hs, -hs, -hs], [ hs, -hs, -hs], [ hs, hs, -hs], [-hs, hs, -hs],
}, [-hs, -hs, hs], [ hs, -hs, hs], [ hs, hs, hs], [-hs, hs, hs],
2 => { ];
// Sphere entity - use cube for now with different color/scale to differentiate
// (We could create a custom sphere model or use a different built-in model) // 12 edges of a cube
Some(( let lines = vec![
*id, seg(corners[0], corners[1]), seg(corners[1], corners[2]), seg(corners[2], corners[3]), seg(corners[3], corners[0]),
Model::namespaced("fusion", "tex_cube") seg(corners[4], corners[5]), seg(corners[5], corners[6]), seg(corners[6], corners[7]), seg(corners[7], corners[4]),
.part(ModelPart::new("Cube").mat_param("color", MaterialParameter::Color(node_color))) seg(corners[0], corners[4]), seg(corners[1], corners[5]), seg(corners[2], corners[6]), seg(corners[3], corners[7]),
.pos([trans.x, trans.y, trans.z]) ];
.rot([rot.x, rot.y, rot.z, rot.w])
.scl([vis_scale.x, vis_scale.y, vis_scale.z]) Some((
.build() *id,
)) Lines::new(lines)
}, .pos([trans.x, trans.y, trans.z])
3 if !node.model_url.is_empty() => { .rot([rot.x, rot.y, rot.z, rot.w])
// Model entity - use gyro model to show it's different .scl([vis_scale.x, vis_scale.y, vis_scale.z])
Some(( .build()
*id, ))
Model::namespaced("fusion", "gyro")
.part(ModelPart::new("Cube").mat_param("color", MaterialParameter::Color(node_color)))
.pos([trans.x, trans.y, trans.z])
.rot([rot.x, rot.y, rot.z, rot.w])
.scl([vis_scale.x, vis_scale.y, vis_scale.z])
.build()
))
},
_ => {
// Unknown/default - render as gray cube
let default_color = rgba_linear!(0.6, 0.6, 0.6, 0.8);
Some((
*id,
Model::namespaced("fusion", "tex_cube")
.part(ModelPart::new("Cube").mat_param("color", MaterialParameter::Color(node_color)))
.pos([trans.x, trans.y, trans.z])
.rot([rot.x, rot.y, rot.z, rot.w])
.scl([vis_scale.x, vis_scale.y, vis_scale.z])
.build()
))
}
}
}); });
PlaySpace PlaySpace