Added text

2023-02-22 23:37:48 +01:00
parent 26b1003bae
commit bf28887ece
5 changed files with 70 additions and 124 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,15 +123,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.11.1"
@@ -301,15 +292,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"

-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -368,16 +350,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "cxx"
 version = "1.0.83"
@@ -428,16 +400,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"

-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "directories"
 version = "4.0.1"
@@ -654,16 +616,6 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"

-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.8"
@@ -1396,7 +1348,6 @@ dependencies = [
 "nix 0.26.1",
 "resvg",
 "rustc-hash",
- "sha2",
 "stardust-xr-molecules",
 "tempdir",
 "tokio",
@@ -1710,17 +1661,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -2135,12 +2075,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f114398da254e78168e12edec0ece6b4ca15a97262ecd8e5efd5025e3fc30204"

-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,6 @@ mint = "0.5.9"
 nix = "0.26.1"
 resvg = "0.28.0"
 rustc-hash = "1.1.0"
-sha2 = "0.10.6"
 stardust-xr-molecules = "0.17.0"
 tokio = { version = "1.24.1", features = ["full"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
--- a/examples/app_grid.rs
+++ b/examples/app_grid.rs
@@ -1,4 +1,5 @@
 use color_eyre::eyre::Result;
+use glam::Quat;
 use manifest_dir_macros::directory_relative_path;
 use mint::Vector3;
 use protostar::{
@@ -7,10 +8,10 @@ use protostar::{
 };
 use stardust_xr_molecules::fusion::{
 	client::{Client, FrameInfo, RootHandler},
-	spatial::Spatial,
+	spatial::Spatial, drawable::{Text, TextStyle, Bounds, TextFit, Alignment}, core::values::Transform,
 };

-const APP_LIMIT: usize = 50;
+const APP_LIMIT: usize = 100;
 const APP_SIZE: f32 = 0.05;
 const GRID_PADDING: f32 = 0.01;

@@ -35,8 +36,10 @@ async fn main() -> Result<()> {

 struct AppGrid {
 	apps: Vec<App>,
+	//style: TextStyle,
 }
 impl AppGrid {
+
 	fn new(client: &Client) -> Self {
 		let apps = get_desktop_files()
 			.into_iter()
@@ -53,6 +56,7 @@ impl AppGrid {
 						0.0,
 					],
 					a,
+					//style,
 				)
 			})
 			.collect::<Vec<_>>();
@@ -67,44 +71,46 @@ impl RootHandler for AppGrid {
 	}
 }
 struct App {
-	// _text: Text,
+	_text: Text,
 	_desktop_file: DesktopFile,
 	protostar: ProtoStar,
 }
+
 impl App {
 	fn new(
 		parent: &Spatial,
 		position: impl Into<Vector3<f32>>,
 		desktop_file: DesktopFile,
+		//style: TextStyle,
 	) -> Option<Self> {
 		let position = position.into();
-
+		let style = TextStyle {
+			character_height: APP_SIZE * 0.1,
+			bounds: Some(Bounds {
+				bounds: [APP_SIZE; 2].into(),
+				fit: TextFit::Wrap,
+				bounds_align: Alignment::XCenter | Alignment::YCenter,
+			}),
+			text_align: Alignment::XCenter | Alignment::YCenter,
+			..Default::default()
+		};
 		let protostar = ProtoStar::create_from_desktop_file(parent, desktop_file.clone()).ok()?;
-		// let text = Text::create(
-		// 	protostar.content_parent(),
-		// 	Transform::from_position_rotation(
-		// 		[0.0, 0.0, APP_SIZE / 2.0],
-		// 		Quat::from_rotation_y(PI),
-		// 	),
-		// 	desktop_file.name.as_deref().unwrap_or("Unknown"),
-		// 	TextStyle {
-		// 		character_height: APP_SIZE * 0.1,
-		// 		bounds: Some(Bounds {
-		// 			bounds: [APP_SIZE; 2].into(),
-		// 			fit: TextFit::Wrap,
-		// 			bounds_align: Alignment::XCenter | Alignment::YCenter,
-		// 		}),
-		// 		text_align: Alignment::XCenter | Alignment::YCenter,
-		// 		..Default::default()
-		// 	},
-		// )
-		// .unwrap();
+		let text = Text::create(
+		 	protostar.content_parent(),
+		 	Transform::from_position_rotation(
+		 		[0.0, 0.0, APP_SIZE / 2.0],
+		 		Quat::from_rotation_y(3.14),
+		 	),
+		 	desktop_file.name.as_deref().unwrap_or("Unknown"),
+		 	style,
+		 )
+		 .unwrap();
 		protostar
 			.content_parent()
 			.set_position(None, position)
 			.unwrap();
 		Some(App {
-			// _text: text,
+			_text: text,
 			_desktop_file: desktop_file,
 			protostar,
 		})
--- a/src/protostar.rs
+++ b/src/protostar.rs
@@ -1,4 +1,4 @@
-use crate::xdg::{DesktopFile, Icon, RawIconType};
+use crate::xdg::{DesktopFile, Icon, IconType};
 use color_eyre::eyre::{eyre, Result};
 use glam::Quat;
 use mint::Vector3;
@@ -21,7 +21,7 @@ use ustr::ustr;

 fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
 	return match &icon.icon_type {
-		RawIconType::Png(path) => {
+		IconType::Png(path) => {
 			let model = Model::create(
 				parent,
 				Transform::from_rotation(Quat::from_rotation_y(PI)),
@@ -34,7 +34,7 @@ fn model_from_icon(parent: &Spatial, icon: &Icon) -> Result<Model> {
 			)?;
 			Ok(model)
 		}
-		RawIconType::Gltf(path) => Ok(Model::create(
+		IconType::Gltf(path) => Ok(Model::create(
 			parent,
 			Transform::from_scale([0.05; 3]),
 			&ResourceID::new_direct(path)?,
@@ -54,19 +54,29 @@ pub struct ProtoStar {
 impl ProtoStar {
 	pub fn create_from_desktop_file(parent: &Spatial, desktop_file: DesktopFile) -> Result<Self> {
 		// dbg!(&desktop_file);
-		dbg!(&desktop_file);
-		let mut raw_icons = dbg!(desktop_file.get_raw_icons());
-		let last_icon = raw_icons.pop();
-		let icon = raw_icons
+		let raw_icons = desktop_file.get_raw_icons();
+		let mut icon = raw_icons
+			.clone()
 			.into_iter()
 			.find(|i| match i.icon_type {
-				RawIconType::Png(_) => false,
-				RawIconType::Svg(_) => false,
-				RawIconType::Gltf(_) => true,
+				IconType::Gltf(_) => true,
+				_ => false,
 			})
-			.or(last_icon)
-			.map(|i| i.process(128).ok())
-			.ok_or_else(|| eyre!("No compatible icons found"))?;
+			.or(
+			raw_icons
+				.into_iter()
+				.max_by_key(|i| i.size)
+			);
+
+		match icon{
+			Some(i) => {
+				icon = match i.process(128) {
+					Ok(i) => Some(i),
+					_ => None,
+			}},
+			None => {},
+		}
+
 		Self::new_raw(
 			parent,
 			icon,
--- a/src/xdg.rs
+++ b/src/xdg.rs
@@ -9,7 +9,6 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::{env, fs};
 use walkdir::WalkDir;
-use sha2::{Sha224, Digest};
 use linicon;

 fn get_data_dirs() -> Vec<PathBuf> {
@@ -44,7 +43,6 @@ pub fn get_desktop_files() -> Vec<PathBuf> {
 	let desktop_extension = OsString::from_str("desktop").unwrap();
 	// Get the list of directories to search
 	let app_dirs = get_app_dirs();
-	dbg!(&app_dirs);
 	app_dirs
 		.into_iter()
 		.flat_map(|dir| {
@@ -180,8 +178,13 @@ impl DesktopFile {
 			}
 		}
 		
-		let mut icons_iter= linicon::lookup_icon(icon_name);
+		let mut icons_iter= linicon::lookup_icon(icon_name).use_fallback_themes(false).peekable();
 		
+		if icons_iter.peek().is_none(){
+			//dbg!("No icons found in current theme");
+			icons_iter= linicon::lookup_icon(icon_name).peekable();
+		}
+
 		let sized_png : Vec<Icon> = icons_iter
 			.filter_map(|i| i.ok())
 			.filter(|i| i.icon_type != linicon::IconType::XMP) //TODO: support XMP
@@ -191,14 +194,14 @@ impl DesktopFile {
 	}
 }

-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Icon {
-	pub icon_type: RawIconType,
+	pub icon_type: IconType,
 	pub size: u16,
 }

-#[derive(Debug, PartialEq, Eq)]
-pub enum RawIconType {
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum IconType {
 	Png(PathBuf),
 	Svg(PathBuf),
 	Gltf(PathBuf),
@@ -206,9 +209,9 @@ pub enum RawIconType {
 impl Icon {
 	pub fn from_path(path: PathBuf, size: u16) -> Option<Icon>{
 		let icon_type = match path.extension().and_then(|ext| ext.to_str()) {
-			Some("png") => Some(RawIconType::Png(path)),
-			Some("svg") => Some(RawIconType::Svg(path)),
-			Some("glb") | Some("gltf") => Some(RawIconType::Gltf(path)),
+			Some("png") => Some(IconType::Png(path)),
+			Some("svg") => Some(IconType::Svg(path)),
+			Some("glb") | Some("gltf") => Some(IconType::Gltf(path)),
 			_ => {return None},
 		}.unwrap();
 		return Some(Icon{icon_type,size})		
@@ -216,7 +219,7 @@ impl Icon {

 	pub fn process(self, size: u16) -> Result<Icon, std::io::Error> {
 		match self.icon_type {
-			RawIconType::Svg(path) => Ok(Icon::from_path(get_png_from_svg(&path, size)?,size).unwrap()),
+			IconType::Svg(path) => Ok(Icon::from_path(get_png_from_svg(&path, size)?,size).unwrap()),
 			_ => Ok(self),
 		}
 	}
@@ -244,8 +247,9 @@ fn test_get_icon_path() {

 pub fn get_png_from_svg(svg_path: impl AsRef<Path>, size: u16,) -> Result<PathBuf, std::io::Error> {
 	let svg_path = fs::canonicalize(svg_path)?;
+	let svg_data = fs::read(svg_path.as_path())?;
 	let tree = Tree::from_data(
-		fs::read(svg_path.as_path())?.as_slice(),
+		svg_data.as_slice(),
 		&resvg::usvg::Options::default(),
 	)
 	.map_err(|_| ErrorKind::InvalidData)?;
@@ -262,16 +266,9 @@ pub fn get_png_from_svg(svg_path: impl AsRef<Path>, size: u16,) -> Result<PathBu
 	let image_cache_dir = cache_dir.join("protostar_icon_cache");
 	
 	create_dir_all(&image_cache_dir).expect("Could not create image cache directory");
-
-	//TODO: come up with a better way to cache images system
-	let mut hasher = Sha224::new();
-	let mut svg_file = fs::File::open(&svg_path)?;
-	io::copy(&mut svg_file, &mut hasher)?;
-	let hash_bytes = hasher.finalize();
 	
 	let png_path = image_cache_dir
-		.join(format!("{}-{:02x}",svg_path.with_extension("").file_name().unwrap().to_str().unwrap(), hash_bytes))
-		.with_extension("png");
+		.join(format!("{}-{}.png",svg_path.file_name().unwrap().to_str().unwrap(), svg_data.len()));

 	if png_path.exists() {
 		return Ok(png_path)