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

refactor: remove item alias remote_methods

Browse Source
This commit is contained in:
Nova
2022-11-05 17:56:09 -04:00
parent 201ab3aee8
commit cffb968d2e
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nodes/input/mod.rs
View File

@@ -77,7 +77,7 @@ impl InputMethod {
node: &Arc<Node>, node: &Arc<Node>,
specialization: InputType, specialization: InputType,
datamap: Option<Datamap>, datamap: Option<Datamap>,
) -> Result<()> { ) -> Result<Arc<InputMethod>> {
ensure!( ensure!(
node.spatial.get().is_some(), node.spatial.get().is_some(),
"Internal: Node does not have a spatial attached!" "Internal: Node does not have a spatial attached!"
@@ -94,8 +94,8 @@ impl InputMethod {
datamap: Mutex::new(datamap), datamap: Mutex::new(datamap),
}; };
let method = INPUT_METHOD_REGISTRY.add(method); let method = INPUT_METHOD_REGISTRY.add(method);
let _ = node.input_method.set(method); let _ = node.input_method.set(method.clone());
Ok(()) Ok(method)
} }
fn set_datamap(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> { fn set_datamap(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> {

15
src/nodes/input/pointer.rs
View File

@@ -1,5 +1,5 @@
use super::{DistanceLink, InputSpecialization}; use super::{DistanceLink, InputSpecialization};
use crate::nodes::fields::{ray_march, Field, Ray, RayMarchResult}; use crate::nodes::fields::{Field, Ray, RayMarchResult};
use crate::nodes::spatial::Spatial; use crate::nodes::spatial::Spatial;
use glam::{vec3, Mat4}; use glam::{vec3, Mat4};
use stardust_xr::schemas::flat::{InputDataType, Pointer as FlatPointer}; use stardust_xr::schemas::flat::{InputDataType, Pointer as FlatPointer};
@@ -17,14 +17,11 @@ pub struct Pointer {}
// } // }
impl Pointer { impl Pointer {
fn ray_march(&self, space: &Arc<Spatial>, field: &Field) -> RayMarchResult { fn ray_march(&self, space: &Arc<Spatial>, field: &Field) -> RayMarchResult {
ray_march( field.ray_march(Ray {
Ray { origin: vec3(0_f32, 0_f32, 0_f32),
origin: vec3(0_f32, 0_f32, 0_f32), direction: vec3(0_f32, 0_f32, 1_f32),
direction: vec3(0_f32, 0_f32, 1_f32), space: space.clone(),
space: space.clone(), })
},
field,
)
} }
} }

2
src/nodes/items/mod.rs
View File

@@ -38,7 +38,6 @@ lazy_static! {
aliased_local_signals: vec!["applySkyTex", "applySkyLight"], aliased_local_signals: vec!["applySkyTex", "applySkyLight"],
aliased_local_methods: vec![], aliased_local_methods: vec![],
aliased_remote_signals: vec![], aliased_remote_signals: vec![],
aliased_remote_methods: vec![],
ui: Default::default(), ui: Default::default(),
items: Registry::new(), items: Registry::new(),
acceptors: Registry::new(), acceptors: Registry::new(),
@@ -70,7 +69,6 @@ pub struct TypeInfo {
pub aliased_local_signals: Vec<&'static str>, pub aliased_local_signals: Vec<&'static str>,
pub aliased_local_methods: Vec<&'static str>, pub aliased_local_methods: Vec<&'static str>,
pub aliased_remote_signals: Vec<&'static str>, pub aliased_remote_signals: Vec<&'static str>,
pub aliased_remote_methods: Vec<&'static str>,
pub ui: Mutex<Weak<ItemUI>>, pub ui: Mutex<Weak<ItemUI>>,
pub items: Registry<Item>, pub items: Registry<Item>,
pub acceptors: Registry<ItemAcceptor>, pub acceptors: Registry<ItemAcceptor>,

1
src/wayland/panel_item.rs
View File

@@ -46,7 +46,6 @@ lazy_static! {
], ],
aliased_local_methods: vec![], aliased_local_methods: vec![],
aliased_remote_signals: vec!["resize", "setCursor",], aliased_remote_signals: vec!["resize", "setCursor",],
aliased_remote_methods: vec![],
ui: Default::default(), ui: Default::default(),
items: Registry::new(), items: Registry::new(),
acceptors: Registry::new(), acceptors: Registry::new(),