merging
This commit is contained in:
Bennyboiii
2618
Cargo.lock
generated
2618
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
32
Cargo.toml
32
Cargo.toml
@@ -1,32 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "protostar"
|
|
||||||
version = "0.4.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
cached = "0.42.0"
|
|
||||||
clap = { version = "4.1.3", features = ["derive"] }
|
|
||||||
color-eyre = "0.6.2"
|
|
||||||
directories = "4.0.1"
|
|
||||||
dirs = "4.0.0"
|
|
||||||
ez-pixmap = "0.2.2"
|
|
||||||
glam = { version = "0.22.0", features = ["mint"] }
|
|
||||||
image = "0.24.5"
|
|
||||||
lazy_static = "1.4.0"
|
|
||||||
linicon = "2.3.0"
|
|
||||||
manifest-dir-macros = "0.1.16"
|
|
||||||
mint = "0.5.9"
|
|
||||||
nix = "0.26.1"
|
|
||||||
regex = "1.7.1"
|
|
||||||
resvg = "0.29.0"
|
|
||||||
rustc-hash = "1.1.0"
|
|
||||||
stardust-xr-fusion = "0.38.1"
|
|
||||||
stardust-xr-molecules = "0.22.0"
|
|
||||||
tokio = { version = "1.24.1", features = ["full"] }
|
|
||||||
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
|
|
||||||
tween = "2.0.0"
|
|
||||||
ustr = "0.9.0"
|
|
||||||
walkdir = "2.3.2"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
tempdir = "0.3.7"
|
|
||||||
308
src/protostar.rs
308
src/protostar.rs
@@ -1,308 +0,0 @@
|
|||||||
use crate::xdg::{DesktopFile, Icon, IconType};
|
|
||||||
use color_eyre::eyre::{eyre, Result};
|
|
||||||
use glam::Quat;
|
|
||||||
use mint::Vector3;
|
|
||||||
use nix::unistd::setsid;
|
|
||||||
use regex::Regex;
|
|
||||||
use stardust_xr_fusion::{
|
|
||||||
client::{FrameInfo, RootHandler},
|
|
||||||
core::values::Transform,
|
|
||||||
drawable::{Alignment, Bounds, MaterialParameter, Model, ResourceID, Text, TextFit, TextStyle},
|
|
||||||
fields::BoxField,
|
|
||||||
node::NodeType,
|
|
||||||
spatial::Spatial,
|
|
||||||
startup_settings::StartupSettings,
|
|
||||||
};
|
|
||||||
use stardust_xr_molecules::{GrabData, Grabbable};
|
|
||||||
use std::f32::consts::PI;
|
|
||||||
use std::os::unix::process::CommandExt;
|
|
||||||
use std::process::{Command, Stdio};
|
|
||||||
use tween::{QuartInOut, Tweener};
|
|
||||||
|
|
||||||
const MODEL_SCALE: f32 = 0.03;
|
|
||||||
const ACTIVATION_DISTANCE: f32 = 1.0;
|
|
||||||
|
|
||||||
fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
|
|
||||||
return match &icon.icon_type {
|
|
||||||
IconType::Png => {
|
|
||||||
let t = Transform::from_rotation_scale(
|
|
||||||
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
|
|
||||||
[MODEL_SCALE; 3],
|
|
||||||
);
|
|
||||||
|
|
||||||
let model = Model::create(
|
|
||||||
parent,
|
|
||||||
t,
|
|
||||||
&ResourceID::new_namespaced("protostar", "hexagon/hexagon"),
|
|
||||||
)?;
|
|
||||||
model.set_material_parameter(
|
|
||||||
1,
|
|
||||||
"color",
|
|
||||||
MaterialParameter::Color([0.0, 1.0, 1.0, 1.0]),
|
|
||||||
)?;
|
|
||||||
model.set_material_parameter(
|
|
||||||
0,
|
|
||||||
"diffuse",
|
|
||||||
MaterialParameter::Texture(ResourceID::Direct(icon.path.clone())),
|
|
||||||
)?;
|
|
||||||
Ok(model)
|
|
||||||
}
|
|
||||||
IconType::Gltf => Ok(Model::create(
|
|
||||||
parent,
|
|
||||||
Transform::from_scale([0.05; 3]),
|
|
||||||
&ResourceID::new_direct(icon.path.clone())?,
|
|
||||||
)?),
|
|
||||||
_ => panic!("Invalid Icon Type"),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct ProtoStar {
|
|
||||||
parent: Spatial,
|
|
||||||
position: Vector3<f32>,
|
|
||||||
grabbable: Grabbable,
|
|
||||||
field: BoxField,
|
|
||||||
icon: Model,
|
|
||||||
label: Option<Text>,
|
|
||||||
grabbable_shrink: Option<Tweener<f32, f64, QuartInOut>>,
|
|
||||||
grabbable_grow: Option<Tweener<f32, f64, QuartInOut>>,
|
|
||||||
grabbable_move: Option<Tweener<f32, f64, QuartInOut>>,
|
|
||||||
execute_command: String,
|
|
||||||
currently_shown: bool,
|
|
||||||
}
|
|
||||||
impl ProtoStar {
|
|
||||||
pub fn create_from_desktop_file(
|
|
||||||
parent: &Spatial,
|
|
||||||
position: impl Into<Vector3<f32>>,
|
|
||||||
desktop_file: DesktopFile,
|
|
||||||
) -> Result<Self> {
|
|
||||||
// dbg!(&desktop_file);
|
|
||||||
let raw_icons = desktop_file.get_raw_icons();
|
|
||||||
let mut icon = raw_icons
|
|
||||||
.clone()
|
|
||||||
.into_iter()
|
|
||||||
.find(|i| match i.icon_type {
|
|
||||||
IconType::Gltf => true,
|
|
||||||
_ => false,
|
|
||||||
})
|
|
||||||
.or(raw_icons.into_iter().max_by_key(|i| i.size));
|
|
||||||
|
|
||||||
match icon {
|
|
||||||
Some(i) => {
|
|
||||||
icon = match i.cached_process(128) {
|
|
||||||
Ok(i) => Some(i),
|
|
||||||
_ => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
Self::new_raw(
|
|
||||||
parent,
|
|
||||||
position,
|
|
||||||
desktop_file.name.as_deref(),
|
|
||||||
icon,
|
|
||||||
desktop_file.command.ok_or_else(|| eyre!("No command"))?,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
pub fn new_raw(
|
|
||||||
parent: &Spatial,
|
|
||||||
position: impl Into<Vector3<f32>>,
|
|
||||||
name: Option<&str>,
|
|
||||||
icon: Option<Icon>,
|
|
||||||
execute_command: String,
|
|
||||||
) -> Result<Self> {
|
|
||||||
let position = position.into();
|
|
||||||
let field = BoxField::create(parent, Transform::default(), [MODEL_SCALE * 2.0; 3])?;
|
|
||||||
let grabbable = Grabbable::new(
|
|
||||||
parent,
|
|
||||||
Transform::from_position(position),
|
|
||||||
&field,
|
|
||||||
GrabData {
|
|
||||||
max_distance: 0.01,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
)?;
|
|
||||||
grabbable.content_parent().set_spatial_parent(parent)?;
|
|
||||||
field.set_spatial_parent(grabbable.content_parent())?;
|
|
||||||
let icon = icon
|
|
||||||
.map(|i| model_from_icon(grabbable.content_parent(), &i))
|
|
||||||
.unwrap_or_else(|| {
|
|
||||||
Ok(Model::create(
|
|
||||||
grabbable.content_parent(),
|
|
||||||
Transform::from_rotation_scale(
|
|
||||||
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
|
|
||||||
[MODEL_SCALE; 3],
|
|
||||||
),
|
|
||||||
&ResourceID::new_namespaced("protostar", "hexagon/hexagon"),
|
|
||||||
)?)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let label_style = TextStyle {
|
|
||||||
character_height: MODEL_SCALE * 4.0,
|
|
||||||
bounds: Some(Bounds {
|
|
||||||
bounds: [1.0; 2].into(),
|
|
||||||
fit: TextFit::Wrap,
|
|
||||||
bounds_align: Alignment::XCenter | Alignment::YCenter,
|
|
||||||
}),
|
|
||||||
text_align: Alignment::Center.into(),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
let label = name.and_then(|name| {
|
|
||||||
Text::create(
|
|
||||||
&icon,
|
|
||||||
Transform::from_position_rotation(
|
|
||||||
[0.0, 0.1, -(MODEL_SCALE * 8.0)],
|
|
||||||
Quat::from_rotation_x(PI * 0.5),
|
|
||||||
),
|
|
||||||
name,
|
|
||||||
label_style,
|
|
||||||
)
|
|
||||||
.ok()
|
|
||||||
});
|
|
||||||
Ok(ProtoStar {
|
|
||||||
parent: parent.alias(),
|
|
||||||
position,
|
|
||||||
grabbable,
|
|
||||||
field,
|
|
||||||
label,
|
|
||||||
icon,
|
|
||||||
grabbable_shrink: None,
|
|
||||||
grabbable_grow: None,
|
|
||||||
execute_command,
|
|
||||||
currently_shown: true,
|
|
||||||
grabbable_move: None,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
pub fn content_parent(&self) -> &Spatial {
|
|
||||||
self.grabbable.content_parent()
|
|
||||||
}
|
|
||||||
pub fn toggle(&mut self) {
|
|
||||||
self.grabbable.set_enabled(!self.currently_shown).unwrap();
|
|
||||||
if self.currently_shown {
|
|
||||||
self.grabbable_move = Some(Tweener::quart_in_out(1.0, 0.0001, 0.25)); //TODO make the scale a parameter
|
|
||||||
} else {
|
|
||||||
self.icon.set_enabled(true).unwrap();
|
|
||||||
self.label.as_ref().map(|l| l.set_enabled(true).unwrap());
|
|
||||||
self.grabbable_move = Some(Tweener::quart_in_out(0.0001, 1.0, 0.25));
|
|
||||||
}
|
|
||||||
self.currently_shown = !self.currently_shown;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl RootHandler for ProtoStar {
|
|
||||||
fn frame(&mut self, info: FrameInfo) {
|
|
||||||
self.grabbable.update(&info);
|
|
||||||
|
|
||||||
if let Some(grabbable_move) = &mut self.grabbable_move {
|
|
||||||
if !grabbable_move.is_finished() {
|
|
||||||
let scale = grabbable_move.move_by(info.delta);
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_position(
|
|
||||||
Some(&self.parent),
|
|
||||||
[
|
|
||||||
self.position.x * scale,
|
|
||||||
self.position.y * scale,
|
|
||||||
self.position.z * scale,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
} else {
|
|
||||||
if grabbable_move.final_value() == 0.0001 {
|
|
||||||
self.icon.set_enabled(false).unwrap();
|
|
||||||
self.label.as_ref().map(|l| l.set_enabled(false).unwrap());
|
|
||||||
}
|
|
||||||
self.grabbable_move = None;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(grabbable_shrink) = &mut self.grabbable_shrink {
|
|
||||||
if !grabbable_shrink.is_finished() {
|
|
||||||
let scale = grabbable_shrink.move_by(info.delta);
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_scale(Some(&self.parent), Vector3::from([scale; 3]))
|
|
||||||
.unwrap();
|
|
||||||
} else {
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_spatial_parent(&self.parent)
|
|
||||||
.unwrap();
|
|
||||||
if self.currently_shown {
|
|
||||||
self.grabbable_grow = Some(Tweener::quart_in_out(0.0001, 1.0, 0.25));
|
|
||||||
self.grabbable.cancel_angular_velocity();
|
|
||||||
self.grabbable.cancel_linear_velocity();
|
|
||||||
}
|
|
||||||
self.grabbable_shrink = None;
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_position(Some(&self.parent), self.position)
|
|
||||||
.unwrap();
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_rotation(Some(&self.parent), Quat::default())
|
|
||||||
.unwrap();
|
|
||||||
self.icon
|
|
||||||
.set_rotation(
|
|
||||||
None,
|
|
||||||
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
} else if let Some(grabbable_grow) = &mut self.grabbable_grow {
|
|
||||||
if !grabbable_grow.is_finished() {
|
|
||||||
let scale = grabbable_grow.move_by(info.delta);
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_scale(Some(&self.parent), Vector3::from([scale; 3]))
|
|
||||||
.unwrap();
|
|
||||||
} else {
|
|
||||||
self.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.set_spatial_parent(&self.parent)
|
|
||||||
.unwrap();
|
|
||||||
self.grabbable_grow = None;
|
|
||||||
}
|
|
||||||
} else if self.grabbable.grab_action().actor_stopped() {
|
|
||||||
let startup_settings = StartupSettings::create(&self.field.client().unwrap()).unwrap();
|
|
||||||
startup_settings
|
|
||||||
.set_root(self.grabbable.content_parent())
|
|
||||||
.unwrap();
|
|
||||||
self.grabbable_shrink = Some(Tweener::quart_in_out(MODEL_SCALE, 0.0001, 0.25));
|
|
||||||
let distance_future = self
|
|
||||||
.grabbable
|
|
||||||
.content_parent()
|
|
||||||
.get_position_rotation_scale(&self.parent)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let executable = self.execute_command.clone();
|
|
||||||
|
|
||||||
//TODO: split the executable string for the args
|
|
||||||
tokio::task::spawn(async move {
|
|
||||||
let distance_vector = distance_future.await.ok().unwrap().0;
|
|
||||||
let distance = ((distance_vector.x.powi(2) + distance_vector.y.powi(2)).sqrt()
|
|
||||||
+ distance_vector.z.powi(2))
|
|
||||||
.sqrt();
|
|
||||||
if dbg!(distance) > ACTIVATION_DISTANCE {
|
|
||||||
let future = startup_settings.generate_startup_token().unwrap();
|
|
||||||
|
|
||||||
std::env::set_var("STARDUST_STARTUP_TOKEN", future.await.unwrap());
|
|
||||||
let re = Regex::new(r"%[fFuUdDnNickvm]").unwrap();
|
|
||||||
let exec = re.replace_all(&executable, "");
|
|
||||||
unsafe {
|
|
||||||
Command::new("sh")
|
|
||||||
.arg("-c")
|
|
||||||
.arg(exec.to_string())
|
|
||||||
.stdin(Stdio::null())
|
|
||||||
.stdout(Stdio::null())
|
|
||||||
.stderr(Stdio::null())
|
|
||||||
.pre_exec(|| {
|
|
||||||
_ = setsid();
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.spawn()
|
|
||||||
.expect("Failed to start child process");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user