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

fix: update imports and use correct types from stardust_xr_fusion for rendering

Browse Source
This commit is contained in:
MayaTheShy
2025-11-08 21:01:26 -05:00
parent d42e15e9f6
commit 8d82f51596
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bridge/src/lib.rs
View File

@@ -10,20 +10,14 @@ use glam::Mat4;
use stardust_xr_asteroids as ast; // alias for brevity use stardust_xr_asteroids as ast; // alias for brevity
use stardust_xr_asteroids::{ use stardust_xr_asteroids::{
client::ClientState, client::ClientState,
elements::{PlaySpace, Lines}, elements::{PlaySpace, Lines, Model},
Migrate, Reify, Migrate, Reify,
}; };
use stardust_xr_asteroids::{CustomElement, Transformable, Projector, Context}; use stardust_xr_asteroids::{CustomElement, Transformable, Projector, Context};
use stardust_xr_molecules::accent_color::AccentColor; use stardust_xr_molecules::accent_color::AccentColor;
use stardust_xr_fusion::objects::connect_client as fusion_connect_client;
// Import drawable types through asteroids to avoid version conflicts use stardust_xr_fusion::node::NodeType;
type FrameInfo = <ast::client::RootAspect as ast::client::RootAspectMethods>::FrameInfo; use stardust_xr_fusion::root::RootAspect;
type Line = ast::client::drawable::Line;
type LinePoint = ast::client::drawable::LinePoint;
type Vector3 = ast::client::values::Vector3;
// Re-export connect_client from the correct version
use ast::client::objects::connect_client as fusion_connect_client;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
#[derive(Clone, serde::Serialize, serde::Deserialize)] #[derive(Clone, serde::Serialize, serde::Deserialize)]
@@ -55,7 +49,7 @@ impl ClientState for BridgeState {
const APP_ID: &'static str = "org.stardustxr.starworld"; const APP_ID: &'static str = "org.stardustxr.starworld";
fn initial_state_update(&mut self) {} fn initial_state_update(&mut self) {}
fn on_frame(&mut self, _info: &FrameInfo) { fn on_frame(&mut self, _info: &stardust_xr_fusion::root::FrameInfo) {
// Sync from the global shared state on each frame // Sync from the global shared state on each frame
if let Ok(ctrl) = CTRL.lock() { if let Ok(ctrl) = CTRL.lock() {
if let Some(shared) = &ctrl.shared_state { if let Some(shared) = &ctrl.shared_state {
@@ -69,6 +63,9 @@ 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::drawable::{Line, LinePoint};
use stardust_xr_fusion::values::{color::rgba_linear, Vector3};
// Root playspace. Create appropriate visuals per entity type // Root playspace. Create appropriate visuals per entity type
let children = self.nodes.iter().filter_map(|(id, node)| { let children = self.nodes.iter().filter_map(|(id, node)| {
// Skip nodes with zero dimensions (like the root node) // Skip nodes with zero dimensions (like the root node)
@@ -87,8 +84,7 @@ impl Reify for BridgeState {
scale scale
}; };
// Use entity color if set - use rgba_linear macro from asteroids // Use entity color if set
use ast::client::values::color::rgba_linear;
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, ... // Entity types: 0=Unknown, 1=Box, 2=Sphere, 3=Model, ...
@@ -212,7 +208,6 @@ impl Reify for BridgeState {
)) ))
}, },
_ => { _ => {
use ast::client::values::color::rgba_linear;
// Unknown/default - render as simple wireframe cube // Unknown/default - render as simple wireframe cube
let t = 0.004; let t = 0.004;
let c = rgba_linear!(0.6, 0.6, 0.6, 0.8); // Gray for unknown let c = rgba_linear!(0.6, 0.6, 0.6, 0.8); // Gray for unknown