refactor: make ready for cargo publishing

Cargo.toml

@@ -1,7 +1,12 @@
 [package]
 edition = "2018"
-name = "stardust-xr"
-version = "0.9.0"
+name = "stardust-xr-server"
+version = "0.9.1"
+authors = ["Nova King <technobaboo@proton.me>"]
+description = "Stardust XR reference display server"
+license = "GPLv2"
+repository = "https://github.com/StardustXR/stardust-xr-server/"
+homepage = "https://stardustxr.org"
 
 [dependencies]
 anyhow = "1.0.57"
@@ -27,16 +32,10 @@ prisma = "0.1.1"
 slog = "2.7.0"
 slog-stdlog = "4.1.1"
 xkbcommon = { version = "0.5.0", default-features = false }
-
-[dependencies.libstardustxr]
-path = "../libstardustxr-rs"
-default-features = false
-
-[dependencies.stereokit]
-path = "../stereokit-rs"
-default-features = false
-features = ["linux-egl"]
+stardust-xr = "0.1.0"
+stardust-xr-schemas = "0.1.0"
+stereokit = {default_features = false, features = ["linux-egl"], version = "0.2.0"}
 
 [dependencies.smithay]
-# git = "https://github.com/Smithay/smithay.git"
-path = "../smithay"
+git = "https://github.com/technobaboo/smithay.git"
+branch = "feature/public_input"

src/core/client.rs

@@ -10,9 +10,9 @@ use crate::nodes::root::Root;
 use crate::nodes::spatial;
 use anyhow::Result;
 use lazy_static::lazy_static;
-use libstardustxr::messenger::Messenger;
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
+use stardust_xr::messenger::Messenger;
 use std::path::PathBuf;
 use std::sync::{Arc, Weak};
 use tokio::net::UnixStream;

src/core/eventloop.rs

@@ -1,7 +1,7 @@
 use super::client::Client;
 use anyhow::Result;
-use libstardustxr::server;
 use slab::Slab;
+use stardust_xr::server;
 use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
 use tokio::net::UnixListener;

src/core/scenegraph.rs

@@ -1,9 +1,9 @@
 use crate::core::client::Client;
 use crate::nodes::Node;
 use anyhow::Result;
-use libstardustxr::scenegraph;
-use libstardustxr::scenegraph::ScenegraphError;
 use once_cell::sync::OnceCell;
+use stardust_xr::scenegraph;
+use stardust_xr::scenegraph::ScenegraphError;
 use std::sync::{Arc, Weak};
 
 use core::hash::BuildHasherDefault;

src/nodes/data.rs

@@ -6,9 +6,9 @@ use crate::core::nodelist::LifeLinkedNodeList;
 use crate::core::registry::Registry;
 use anyhow::{anyhow, ensure, Result};
 use glam::{vec3a, Mat4};
-use libstardustxr::flex::flexbuffer_from_vector_arguments;
-use libstardustxr::{flex_to_quat, flex_to_vec3};
 use parking_lot::Mutex;
+use stardust_xr::flex::flexbuffer_from_vector_arguments;
+use stardust_xr::{flex_to_quat, flex_to_vec3};
 use std::sync::{Arc, Weak};
 
 static PULSE_SENDER_REGISTRY: Registry<PulseSender> = Registry::new();

src/nodes/fields/box.rs

@@ -3,8 +3,8 @@ use crate::core::client::Client;
 use crate::nodes::spatial::{get_spatial_parent_flex, Spatial};
 use anyhow::{anyhow, ensure, Result};
 use glam::{vec3, vec3a, Mat4, Vec3, Vec3A};
-use libstardustxr::{flex_to_quat, flex_to_vec3};
 use parking_lot::Mutex;
+use stardust_xr::{flex_to_quat, flex_to_vec3};
 use std::sync::Arc;
 
 pub struct BoxField {

src/nodes/fields/cylinder.rs

@@ -3,8 +3,8 @@ use crate::core::client::Client;
 use crate::nodes::spatial::{get_spatial_parent_flex, Spatial};
 use anyhow::{anyhow, ensure, Result};
 use glam::{swizzles::*, vec2, Mat4, Vec3A};
-use libstardustxr::{flex_to_quat, flex_to_vec3};
 use portable_atomic::AtomicF32;
+use stardust_xr::{flex_to_quat, flex_to_vec3};
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 

src/nodes/fields/mod.rs

@@ -11,8 +11,8 @@ use super::Node;
 use crate::core::client::Client;
 use anyhow::{anyhow, Result};
 use glam::{vec2, vec3a, Vec3, Vec3A};
-use libstardustxr::flex::FlexBuffable;
-use libstardustxr::flex_to_vec3;
+use stardust_xr::flex::FlexBuffable;
+use stardust_xr::flex_to_vec3;
 
 use std::ops::Deref;
 use std::sync::Arc;

src/nodes/fields/sphere.rs

@@ -3,8 +3,8 @@ use crate::core::client::Client;
 use crate::nodes::spatial::{get_spatial_parent_flex, Spatial};
 use anyhow::{anyhow, ensure, Result};
 use glam::{Mat4, Vec3A};
-use libstardustxr::flex_to_vec3;
 use portable_atomic::AtomicF32;
+use stardust_xr::flex_to_vec3;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 

src/nodes/input/hand.rs

@@ -1,8 +1,8 @@
 use crate::nodes::fields::Field;
 use crate::nodes::spatial::Spatial;
 use glam::{vec3a, Mat4};
-use libstardustxr::schemas::input_hand::HandT;
-use libstardustxr::schemas::{common::JointT, input::InputDataRaw};
+use stardust_xr_schemas::input_hand::HandT;
+use stardust_xr_schemas::{common::JointT, input::InputDataRaw};
 use std::sync::Arc;
 
 use super::{DistanceLink, InputSpecialization};

src/nodes/input/mod.rs

@@ -11,10 +11,10 @@ use crate::core::eventloop::FRAME;
 use crate::core::registry::Registry;
 use anyhow::{anyhow, ensure, Result};
 use glam::Mat4;
-use libstardustxr::schemas::input::{InputData, InputDataArgs, InputDataRaw};
-use libstardustxr::schemas::input_hand::HandT;
 use nanoid::nanoid;
 use parking_lot::Mutex;
+use stardust_xr_schemas::input::{InputData, InputDataArgs, InputDataRaw};
+use stardust_xr_schemas::input_hand::HandT;
 use std::ops::Deref;
 use std::sync::atomic::Ordering;
 use std::sync::{Arc, Weak};

src/nodes/input/pointer.rs

@@ -2,8 +2,8 @@ use super::{DistanceLink, InputSpecialization};
 use crate::nodes::fields::{ray_march, Field, Ray, RayMarchResult};
 use crate::nodes::spatial::Spatial;
 use glam::{vec3, Mat4};
-use libstardustxr::schemas::input::InputDataRaw;
-use libstardustxr::schemas::input_pointer;
+use stardust_xr_schemas::input::InputDataRaw;
+use stardust_xr_schemas::input_pointer;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 

src/nodes/items/mod.rs

@@ -11,9 +11,9 @@ use crate::core::registry::Registry;
 use crate::wayland::panel_item::{register_panel_item_ui_flex, PanelItem};
 use anyhow::{anyhow, ensure, Result};
 use lazy_static::lazy_static;
-use libstardustxr::flex::flexbuffer_from_vector_arguments;
 use nanoid::nanoid;
 use parking_lot::Mutex;
+use stardust_xr::flex::flexbuffer_from_vector_arguments;
 use std::ops::Deref;
 use std::sync::{Arc, Weak};
 

src/nodes/mod.rs

@@ -9,9 +9,9 @@ pub mod root;
 pub mod spatial;
 
 use anyhow::{anyhow, Result};
-use libstardustxr::scenegraph::ScenegraphError;
 use nanoid::nanoid;
 use once_cell::sync::OnceCell;
+use stardust_xr::scenegraph::ScenegraphError;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Weak};
 use std::vec::Vec;

src/nodes/model.rs

@@ -7,12 +7,12 @@ use anyhow::{anyhow, bail, ensure, Result};
 use flexbuffers::FlexBufferType;
 use glam::Mat4;
 use lazy_static::lazy_static;
-use libstardustxr::{flex_to_quat, flex_to_vec3};
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
 use prisma::{Rgb, Rgba};
 use rustc_hash::FxHashMap;
 use send_wrapper::SendWrapper;
+use stardust_xr::{flex_to_quat, flex_to_vec3};
 use std::fmt::Error;
 use std::path::PathBuf;
 use std::sync::Arc;

src/nodes/root.rs

@@ -4,7 +4,7 @@ use crate::core::client::Client;
 use crate::core::registry::Registry;
 use anyhow::Result;
 use glam::Mat4;
-use libstardustxr::flex::flexbuffer_from_vector_arguments;
+use stardust_xr::flex::flexbuffer_from_vector_arguments;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;

src/nodes/spatial.rs

@@ -2,10 +2,10 @@ use super::Node;
 use crate::core::client::Client;
 use anyhow::{anyhow, ensure, Result};
 use glam::{Mat4, Quat, Vec3};
-use libstardustxr::flex::flexbuffer_from_vector_arguments;
-use libstardustxr::push_to_vec;
-use libstardustxr::{flex_to_quat, flex_to_vec3};
 use parking_lot::Mutex;
+use stardust_xr::flex::flexbuffer_from_vector_arguments;
+use stardust_xr::push_to_vec;
+use stardust_xr::{flex_to_quat, flex_to_vec3};
 use std::ptr;
 use std::sync::{Arc, Weak};
 

src/objects/input/sk_hand.rs

@@ -3,7 +3,7 @@ use crate::nodes::{
 	spatial::Spatial,
 };
 use glam::Mat4;
-use libstardustxr::schemas::{common::JointT, input_hand::HandT};
+use stardust_xr_schemas::{common::JointT, input_hand::HandT};
 use std::sync::{Arc, Weak};
 use stereokit::{
 	input::{Handed, Joint as SkJoint},

src/wayland/panel_item.rs

@@ -16,10 +16,6 @@ use crate::{
 use anyhow::{anyhow, bail, Result};
 use glam::Mat4;
 use lazy_static::lazy_static;
-use libstardustxr::{
-	flex::{flexbuffer_from_arguments, flexbuffer_from_vector_arguments},
-	flex_to_vec2,
-};
 use nanoid::nanoid;
 use smithay::{
 	reexports::wayland_server::{
@@ -28,6 +24,10 @@ use smithay::{
 	},
 	wayland::{compositor::SurfaceData, shell::xdg::XdgToplevelSurfaceData},
 };
+use stardust_xr::{
+	flex::{flexbuffer_from_arguments, flexbuffer_from_vector_arguments},
+	flex_to_vec2,
+};
 use std::sync::{Arc, Weak};
 use xkbcommon::xkb::{self, ffi::XKB_KEYMAP_FORMAT_TEXT_V1, Keymap};