StardustXR/protostar
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cleanup: no more clippy warnings

Browse Source
This commit is contained in:
nik012003
2023-07-24 14:46:21 +02:00
parent f7ea663a3d
commit 6b4511bdd6
7 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/app_grid.rs
View File

@@ -17,7 +17,6 @@ use stardust_xr_fusion::{
use stardust_xr_molecules::{GrabData, Grabbable};
use std::f32::consts::PI;
const APP_LIMIT: usize = 300;
const APP_SIZE: f32 = 0.05;
const GRID_PADDING: f32 = 0.01;
@@ -80,7 +79,7 @@ impl RootHandler for AppGrid {
}
fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
return match &icon.icon_type {
match &icon.icon_type {
IconType::Png => {
// let t = Transform::from_rotation_scale(
// Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
@@ -107,7 +106,7 @@ fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
&ResourceID::new_direct(icon.path.clone())?,
)?),
_ => panic!("Invalid Icon Type"),
};
}
}
pub struct App {

12
examples/hexagon_launcher.rs
View File

@@ -218,7 +218,7 @@ impl RootHandler for Button {
// Model handling
fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
return match &icon.icon_type {
match &icon.icon_type {
IconType::Png => {
let t = Transform::from_rotation_scale(
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
@@ -245,7 +245,7 @@ fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
&ResourceID::new_direct(icon.path.clone())?,
)?),
_ => panic!("Invalid Icon Type"),
};
}
}
pub struct App {
@@ -341,7 +341,9 @@ impl App {
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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(true).unwrap()
}
self.grabbable_move = Some(Tweener::quart_in_out(0.0001, 1.0, 0.25));
}
self.currently_shown = !self.currently_shown;
@@ -368,7 +370,9 @@ impl RootHandler for App {
} 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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(false).unwrap()
}
}
self.grabbable_move = None;
}

16
examples/sirius.rs
View File

@@ -146,7 +146,7 @@ impl RootHandler for Sirius {
println!("{}", starpos);
star.content_parent()
.set_position(
Some(&self.grabbable.content_parent()),
Some(self.grabbable.content_parent()),
[starpos, 0.1, 0.0],
)
.ok();
@@ -155,7 +155,7 @@ impl RootHandler for Sirius {
false => {
for star in &self.clients {
star.content_parent()
.set_position(Some(&self.grabbable.content_parent()), [0.0, 0.0, 0.0])
.set_position(Some(self.grabbable.content_parent()), [0.0, 0.0, 0.0])
.ok();
}
}
@@ -197,7 +197,7 @@ impl RootHandler for Sirius {
}
fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
return match &icon.icon_type {
match &icon.icon_type {
IconType::Png => {
let t = Transform::from_rotation_scale(
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
@@ -224,7 +224,7 @@ fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
&ResourceID::new_direct(icon.path.clone())?,
)?),
_ => panic!("Invalid Icon Type"),
};
}
}
pub struct App {
@@ -320,7 +320,9 @@ impl App {
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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(true).unwrap()
}
self.grabbable_move = Some(Tweener::quart_in_out(0.0001, 1.0, 0.25));
}
self.currently_shown = !self.currently_shown;
@@ -347,7 +349,9 @@ impl RootHandler for App {
} 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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(false).unwrap()
}
}
self.grabbable_move = None;
}

5
src/application.rs
View File

@@ -44,10 +44,7 @@ impl Application {
if prefer_3d {
icon = raw_icons
.into_iter()
.find(|i| match i.icon_type {
IconType::Gltf => true,
_ => false,
})
.find(|i| i.icon_type == IconType::Gltf)
.or(icon);
}

2
src/main.rs
View File

@@ -22,7 +22,7 @@ async fn main() -> Result<()> {
let protostar = ProtoStar::create_from_desktop_file(
client.get_root(),
[0.0, 0.0, 0.0],
parse_desktop_file(args.desktop_file).map_err(|e| Report::msg(e))?,
parse_desktop_file(args.desktop_file).map_err(Report::msg)?,
)?;
let _root = client.wrap_root(protostar);

13
src/protostar.rs
View File

@@ -21,7 +21,7 @@ const MODEL_SCALE: f32 = 0.03;
const ACTIVATION_DISTANCE: f32 = 0.5;
fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
return match &icon.icon_type {
match &icon.icon_type {
IconType::Png => {
let t = Transform::from_rotation_scale(
Quat::from_rotation_x(PI / 2.0) * Quat::from_rotation_y(PI),
@@ -48,7 +48,7 @@ fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
&ResourceID::new_direct(icon.path.clone())?,
)?),
_ => panic!("Invalid Icon Type"),
};
}
}
pub struct ProtoStar {
@@ -64,6 +64,7 @@ pub struct ProtoStar {
grabbable_move: Option<Tweener<f32, f64, QuartInOut>>,
currently_shown: bool,
}
impl ProtoStar {
pub fn create_from_desktop_file(
parent: &Spatial,
@@ -143,7 +144,9 @@ impl ProtoStar {
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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(true).unwrap()
}
self.grabbable_move = Some(Tweener::quart_in_out(0.0001, 1.0, 0.25));
}
self.currently_shown = !self.currently_shown;
@@ -170,7 +173,9 @@ impl RootHandler for ProtoStar {
} 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());
if let Some(label) = self.label.as_ref() {
label.set_enabled(false).unwrap()
}
}
self.grabbable_move = None;
}

23
src/xdg.rs
View File

@@ -64,12 +64,12 @@ lazy_static! {
}
fn get_data_dirs() -> Vec<PathBuf> {
let xdg_data_dirs_str = std::env::var("XDG_DATA_DIRS").unwrap_or_default();
xdg_data_dirs_str
.split(":")
std::env::var("XDG_DATA_DIRS") // parse XDG_DATA_DIRS
.unwrap_or_default()
.split(':')
.filter_map(|dir| PathBuf::from_str(dir).ok())
.chain(dirs::home_dir().into_iter().map(|d| d.join(".local/share")))
.chain(PathBuf::from_str("/usr/share").into_iter())
.chain(dirs::home_dir().into_iter().map(|d| d.join(".local/share"))) // $HOME/.local/share
.chain(PathBuf::from_str("/usr/share").into_iter()) // /usr/share
.filter(|dir| dir.exists() && dir.is_dir())
.collect()
}
@@ -172,12 +172,7 @@ pub fn parse_desktop_file(path: PathBuf) -> Result<DesktopFile, String> {
.collect()
}
"Icon" => icon = Some(value.to_string()),
"NoDisplay" => {
no_display = match value {
"true" => true,
_ => false,
}
}
"NoDisplay" => no_display = value == "true",
_ => (), // Ignore unknown keys
}
}
@@ -304,11 +299,11 @@ impl Icon {
Some("glb") | Some("gltf") => IconType::Gltf,
_ => return None,
};
return Some(Icon {
Some(Icon {
icon_type,
path,
size,
});
})
}
pub fn cached_process(self, size: u16) -> Result<Icon, std::io::Error> {
@@ -382,7 +377,7 @@ pub fn get_image_cache_dir() -> PathBuf {
}
let image_cache_dir = cache_dir.join("protostar_icon_cache");
create_dir_all(&image_cache_dir).expect("Could not create image cache directory");
return image_cache_dir;
image_cache_dir
}
pub fn get_png_from_svg(svg_path: impl AsRef<Path>, size: u16) -> Result<PathBuf, std::io::Error> {