From 44a34800224cf8c6d1e03e42fa9be32631541f4f Mon Sep 17 00:00:00 2001 From: Nova Date: Mon, 24 Feb 2025 15:27:02 -0800 Subject: [PATCH] refactor: minimize dependencies --- Cargo.lock | 35 +---------------------------------- Cargo.toml | 10 +--------- src/nodes/drawable/lines.rs | 11 +++++------ 3 files changed, 7 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cdd8ca5..f57a966 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,16 +87,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "angular-units" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1c36cde4b75aa8518ad38880fdc7b649d7bf22b359a296964756e2319d598d" -dependencies = [ - "approx 0.3.2", - "num-traits", -] - [[package]] name = "anstream" version = "0.6.15" @@ -158,15 +148,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - [[package]] name = "approx" version = "0.4.0" @@ -569,7 +550,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "approx 0.4.0", + "approx", "num-traits", ] @@ -2157,17 +2138,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "prisma" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5640533116b656900156ef15e22d3789edb9a71f36ec04a2678a307be243495" -dependencies = [ - "angular-units", - "approx 0.3.2", - "num-traits", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -2688,12 +2658,9 @@ dependencies = [ "global_counter", "input-event-codes", "lazy_static", - "libc", "mint", "nanoid", - "nix 0.29.0", "parking_lot 0.12.3", - "prisma", "rand", "rustc-hash", "send_wrapper", diff --git a/Cargo.toml b/Cargo.toml index de4bf71..7168aab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,6 +68,7 @@ parking_lot = "0.12.3" color-eyre = { version = "0.6.3", default-features = false } clap = { version = "4.5.13", features = ["derive"] } console-subscriber = { version = "0.4.0", optional = true } +thiserror = "2.0.9" tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-tracy = { version = "0.11.1", optional = true } @@ -81,11 +82,8 @@ toml = "0.8.19" glam = { version = "0.29.0", features = ["mint", "serde"] } mint = "0.5.9" tokio = { version = "1.39.2", features = ["rt-multi-thread", "signal", "time"] } -prisma = "0.1.1" # linux stuffs -libc = "0.2.155" -nix = "0.29.0" input-event-codes = "6.2.0" zbus = { version = "5.0.0", default-features = false, features = ["tokio"] } directories = "5.0.1" @@ -94,22 +92,16 @@ xkbcommon-rs = "0.1.0" # wayland wayland-backend = { version = "0.3.7", optional = true, default-features = false } wayland-scanner = { version = "0.31.4", optional = true } -thiserror = "2.0.9" [dependencies.smithay] -# git = "https://github.com/technobaboo/smithay.git" -# git = "https://github.com/colinmarc/smithay.git" git = "https://github.com/smithay/smithay.git" -# path = "../smithay" default-features = false features = ["desktop", "backend_drm", "renderer_gl", "wayland_frontend"] optional = true [dependencies.stereokit-rust] -# path = "../StereoKit-rust" git = "https://github.com/mvvvv/StereoKit-rust.git" -# git = "https://github.com/technobaboo/StereoKit-rust.git" features = ["no-event-loop"] default-features = false diff --git a/src/nodes/drawable/lines.rs b/src/nodes/drawable/lines.rs index efb6242..d414e00 100644 --- a/src/nodes/drawable/lines.rs +++ b/src/nodes/drawable/lines.rs @@ -3,9 +3,8 @@ use crate::{ core::{client::Client, error::Result, registry::Registry}, nodes::{Node, spatial::Spatial}, }; -use glam::Vec3; +use glam::{FloatExt, Vec3}; use parking_lot::Mutex; -use prisma::Lerp; use std::{collections::VecDeque, sync::Arc}; use stereokit_rust::{ maths::Bounds, sk::MainThreadToken, system::LinePoint as SkLinePoint, util::Color128, @@ -62,10 +61,10 @@ impl Lines { let last = line.points.last().unwrap(); let color = Color128 { - r: first.color.c.r.lerp(&last.color.c.r, 0.5), - g: first.color.c.g.lerp(&last.color.c.g, 0.5), - b: first.color.c.b.lerp(&last.color.c.b, 0.5), - a: first.color.a.lerp(&last.color.a, 0.5), + r: first.color.c.r.lerp(last.color.c.r, 0.5), + g: first.color.c.g.lerp(last.color.c.g, 0.5), + b: first.color.c.b.lerp(last.color.c.b, 0.5), + a: first.color.a.lerp(last.color.a, 0.5), }; let connect_point = SkLinePoint { pt: transform_mat