feat: update stereokit

src/objects/input/mouse_pointer.rs

@@ -12,10 +12,7 @@ use glam::{vec3, Mat4};
 use nanoid::nanoid;
 use stardust_xr::{schemas::flat::Datamap, values::Transform};
 use std::{convert::TryFrom, sync::Arc};
-use stereokit::{
-	input::{ButtonState, Key, Ray as SkRay},
-	StereoKit,
-};
+use stereokit::input::{ButtonState, Key, Ray as SkRay, StereoKitInput};
 
 const SK_KEYMAP: &str = include_str!("sk.kmp");
 
@@ -48,7 +45,7 @@ impl MousePointer {
 			keyboard_sender,
 		}
 	}
-	pub fn update(&self, sk: &StereoKit) {
+	pub fn update(&self, sk: &impl StereoKitInput) {
 		let mouse = sk.input_mouse();
 
 		if let Some(ray) = SkRay::from_mouse(mouse) {
@@ -90,7 +87,7 @@ impl MousePointer {
 		self.send_keyboard_input(sk);
 	}
 
-	fn send_keyboard_input(&self, sk: &StereoKit) {
+	fn send_keyboard_input(&self, sk: &impl StereoKitInput) {
 		let rx = PULSE_RECEIVER_REGISTRY
 			.get_valid_contents()
 			.into_iter()

src/objects/input/sk_controller.rs

@@ -5,10 +5,7 @@ use crate::nodes::{
 use glam::Mat4;
 use stardust_xr::{schemas::flat::Datamap, values::Transform};
 use std::sync::{Arc, Weak};
-use stereokit::{
-	input::{ButtonState, Handed},
-	StereoKit,
-};
+use stereokit::input::{ButtonState, Handed, StereoKitInput};
 
 pub struct SkController {
 	tip: Arc<InputMethod>,
@@ -24,7 +21,7 @@ impl SkController {
 			handed,
 		}
 	}
-	pub fn update(&mut self, sk: &StereoKit) {
+	pub fn update(&mut self, sk: &impl StereoKitInput) {
 		let controller = sk.input_controller(self.handed);
 		*self.tip.enabled.lock() = controller.tracked.contains(ButtonState::Active);
 		if *self.tip.enabled.lock() {

src/objects/input/sk_hand.rs

@@ -6,8 +6,8 @@ use glam::Mat4;
 use stardust_xr::schemas::flat::{Datamap, Hand as FlatHand, Joint};
 use std::sync::{Arc, Weak};
 use stereokit::{
-	input::{ButtonState, Handed, Joint as SkJoint},
-	StereoKit,
+	input::{ButtonState, Handed, Joint as SkJoint, StereoKitInput},
+	lifecycle::StereoKitDraw,
 };
 
 fn convert_joint(joint: SkJoint) -> Joint {
@@ -37,7 +37,7 @@ impl SkHand {
 			handed,
 		}
 	}
-	pub fn update(&mut self, sk: &StereoKit) {
+	pub fn update(&mut self, sk: &StereoKitDraw) {
 		let sk_hand = sk.input_hand(self.handed);
 		if let InputType::Hand(hand) = &mut *self.hand.specialization.lock() {
 			let controller = sk.input_controller(self.handed);