From cbb09a9d97daa19e65e6a80747830e3ad6d04576 Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Sat, 5 Nov 2022 17:56:09 -0400
Subject: [PATCH] refactor: remove item alias remote_methods

---
 src/nodes/input/mod.rs     |  6 +++---
 src/nodes/input/pointer.rs | 15 ++++++---------
 src/nodes/items/mod.rs     |  2 --
 src/wayland/panel_item.rs  |  1 -
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/nodes/input/mod.rs b/src/nodes/input/mod.rs
index b9e6334..6d0866d 100644
--- a/src/nodes/input/mod.rs
+++ b/src/nodes/input/mod.rs
@@ -77,7 +77,7 @@ impl InputMethod {
 		node: &Arc<Node>,
 		specialization: InputType,
 		datamap: Option<Datamap>,
-	) -> Result<()> {
+	) -> Result<Arc<InputMethod>> {
 		ensure!(
 			node.spatial.get().is_some(),
 			"Internal: Node does not have a spatial attached!"
@@ -94,8 +94,8 @@ impl InputMethod {
 			datamap: Mutex::new(datamap),
 		};
 		let method = INPUT_METHOD_REGISTRY.add(method);
-		let _ = node.input_method.set(method);
-		Ok(())
+		let _ = node.input_method.set(method.clone());
+		Ok(method)
 	}
 
 	fn set_datamap(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> {
diff --git a/src/nodes/input/pointer.rs b/src/nodes/input/pointer.rs
index 1549b0c..6586abb 100644
--- a/src/nodes/input/pointer.rs
+++ b/src/nodes/input/pointer.rs
@@ -1,5 +1,5 @@
 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 glam::{vec3, Mat4};
 use stardust_xr::schemas::flat::{InputDataType, Pointer as FlatPointer};
@@ -17,14 +17,11 @@ pub struct Pointer {}
 // }
 impl Pointer {
 	fn ray_march(&self, space: &Arc<Spatial>, field: &Field) -> RayMarchResult {
-		ray_march(
-			Ray {
-				origin: vec3(0_f32, 0_f32, 0_f32),
-				direction: vec3(0_f32, 0_f32, 1_f32),
-				space: space.clone(),
-			},
-			field,
-		)
+		field.ray_march(Ray {
+			origin: vec3(0_f32, 0_f32, 0_f32),
+			direction: vec3(0_f32, 0_f32, 1_f32),
+			space: space.clone(),
+		})
 	}
 }
 
diff --git a/src/nodes/items/mod.rs b/src/nodes/items/mod.rs
index 1fbe2a6..b885131 100644
--- a/src/nodes/items/mod.rs
+++ b/src/nodes/items/mod.rs
@@ -38,7 +38,6 @@ lazy_static! {
 		aliased_local_signals: vec!["applySkyTex", "applySkyLight"],
 		aliased_local_methods: vec![],
 		aliased_remote_signals: vec![],
-		aliased_remote_methods: vec![],
 		ui: Default::default(),
 		items: Registry::new(),
 		acceptors: Registry::new(),
@@ -70,7 +69,6 @@ pub struct TypeInfo {
 	pub aliased_local_signals: Vec<&'static str>,
 	pub aliased_local_methods: Vec<&'static str>,
 	pub aliased_remote_signals: Vec<&'static str>,
-	pub aliased_remote_methods: Vec<&'static str>,
 	pub ui: Mutex<Weak<ItemUI>>,
 	pub items: Registry<Item>,
 	pub acceptors: Registry<ItemAcceptor>,
diff --git a/src/wayland/panel_item.rs b/src/wayland/panel_item.rs
index c33d1ea..8224138 100644
--- a/src/wayland/panel_item.rs
+++ b/src/wayland/panel_item.rs
@@ -46,7 +46,6 @@ lazy_static! {
 		],
 		aliased_local_methods: vec![],
 		aliased_remote_signals: vec!["resize", "setCursor",],
-		aliased_remote_methods: vec![],
 		ui: Default::default(),
 		items: Registry::new(),
 		acceptors: Registry::new(),