refactor: clean up code

src/main.rs

@@ -10,11 +10,11 @@ mod wayland;
 
 use crate::core::destroy_queue;
 // use crate::nodes::items::camera;
-use crate::nodes::{audio, drawable, input};
+use crate::nodes::input;
 
 use bevy::a11y::AccessibilityPlugin;
 use bevy::app::{
-	App, AppExit, PluginGroup, PluginsState, PostUpdate, ScheduleRunnerPlugin, Startup,
+	App, AppExit, PluginGroup, PostUpdate, ScheduleRunnerPlugin, Startup,
 	TerminalCtrlCHandlerPlugin, Update,
 };
 use bevy::asset::{load_internal_binary_asset, AssetApp as _, AssetPlugin, AssetServer, Handle};
@@ -27,18 +27,17 @@ use bevy::image::Image;
 use bevy::input::InputPlugin;
 use bevy::pbr::PbrPlugin;
 use bevy::prelude::{
-	on_event, resource_added, Camera3d, ClearColor, Commands, Entity, EventReader, HierarchyPlugin,
-	ImagePlugin, IntoSystemConfigs, Local, Query, Res, ResMut, Resource, Transform,
-	TransformPlugin, With, World,
+	on_event, Camera3d, ClearColor, Commands, Entity, EventReader, HierarchyPlugin, ImagePlugin,
+	IntoSystemConfigs, Local, Query, Res, ResMut, Resource, TransformPlugin, With, World,
 };
 use bevy::render::pipelined_rendering::PipelinedRenderingPlugin;
 use bevy::render::RenderPlugin;
 use bevy::scene::ScenePlugin;
 use bevy::text::{Font, FontLoader};
 use bevy::time::Time;
 use bevy::window::WindowPlugin;
-use bevy::winit::{EventLoopProxyWrapper, WakeUp, WinitPlugin};
-use bevy::{DefaultPlugins, MinimalPlugins};
+use bevy::winit::{WakeUp, WinitPlugin};
+use bevy::MinimalPlugins;
 use bevy_mod_meshtext::MeshTextPlugin;
 use bevy_mod_openxr::action_set_syncing::{OxrActionSyncingPlugin, OxrSyncActionSet};
 use bevy_mod_openxr::exts::OxrExtensions;
@@ -55,7 +54,6 @@ use bevy_mod_xr::spaces::XrPrimaryReferenceSpace;
 use bevy_plugin::{DbusConnection, DummyPbrPlugin, InputUpdate, StardustBevyPlugin, StardustFirst};
 use bevy_sk::skytext::SphericalHarmonicsPlugin;
 use clap::Parser;
-use color_eyre::eyre::eyre;
 use core::client::Client;
 use core::task;
 use directories::ProjectDirs;
@@ -77,7 +75,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use tokio::net::UnixListener;
 use tokio::sync::Notify;
-use tracing::level_filters::LevelFilter;
 use tracing::{debug_span, error, info, warn};
 use tracing_subscriber::{fmt, prelude::*, EnvFilter};
 use zbus::fdo::ObjectManager;
@@ -293,6 +290,7 @@ fn bevy_loop(
 		.add(CorePipelinePlugin)
 		// very unsure what is needed here
 		.add(PbrPlugin {
+			// hoping that there is very little overdraw in stardust
 			prepass_enabled: false,
 			add_default_deferred_lighting_plugin: false,
 			use_gpu_instance_buffer_builder: false,
@@ -366,7 +364,7 @@ fn bevy_loop(
 	load_internal_binary_asset!(
 		bevy_app,
 		Handle::default(),
-		"FiraMono-subset.ttf",
+		"nodes/drawable/assets/FiraMono-subset.ttf",
 		|bytes: &[u8], _path: String| { Font::try_from_bytes(bytes.to_vec()).unwrap() }
 	);
 	#[derive(Resource)]
@@ -452,7 +450,7 @@ fn bevy_loop(
 	sk_ready_notifier.notify_waiters();
 	info!("Stardust ready!");
 
-	let mut objects = ServerObjects::new(dbus_connection.clone());
+	let objects = ServerObjects::new(dbus_connection.clone());
 	fn sync_sets(session: Res<OxrSession>, mut events: EventReader<OxrSyncActionSet>) {
 		let sets = events
 			.read()
@@ -490,7 +488,7 @@ fn bevy_loop(
 			.run_system_cached(openxr_session_running)
 			.unwrap_or(true)
 		{
-			world.run_system_cached(sync_sets);
+			let _ = world.run_system_cached(sync_sets);
 		}
 		let thread = world
 			.run_system_cached(should_run_frame_loop)
@@ -525,7 +523,7 @@ fn bevy_loop(
 		}
 		#[cfg(feature = "wayland")]
 		wayland.update();
-	};
+	}
 	bevy_app.add_systems(StardustFirst, bevy_step);
 	let out = bevy_app.run();
 

src/nodes/audio.rs

@@ -49,7 +49,7 @@ fn spawn_sounds(reader: Res<SpawnSoundReader>, mut cmds: Commands, asset_server:
 				},
 			))
 			.id();
-		sound.entity.set(e);
+		let _ = sound.entity.set(e);
 	}
 }
 

src/nodes/drawable/mod.rs

@@ -1,8 +1,5 @@
 pub mod lines;
 pub mod model;
-#[cfg(feature = "wayland")]
-pub mod shader_manipulation;
-pub mod shaders;
 pub mod text;
 
 use self::{lines::Lines, model::Model, text::Text};
@@ -16,7 +13,6 @@ use crate::core::{
 	resource::get_resource_file,
 };
 use crate::nodes::spatial::SPATIAL_ASPECT_ALIAS_INFO;
-use color_eyre::eyre::eyre;
 use model::ModelPart;
 use parking_lot::Mutex;
 use stardust_xr::values::ResourceID;

src/nodes/drawable/model.rs

@@ -46,33 +46,28 @@ impl MaterialParameter {
 		asset_server: &AssetServer,
 	) {
 		match self {
-			MaterialParameter::Bool(val) => match parameter_name {
-				name => {
-					if let Some(field) = material.get_field_mut::<bool>(name) {
-						*field = *val;
-					} else {
-						warn!("unknown bool material parameter name: {name}");
-					}
+			MaterialParameter::Bool(val) => {
+				let name = parameter_name;
+				if let Some(field) = material.get_field_mut::<bool>(name) {
+					*field = *val;
+				} else {
+					warn!("unknown bool material parameter name: {name}");
 				}
-			},
-			MaterialParameter::Int(val) => match parameter_name {
-				name => {
-					if let Some(field) = material.get_field_mut::<i32>(name) {
-						*field = *val;
-					} else {
-						warn!("unknown i32 material parameter name: {name}");
-					}
+			}
+			MaterialParameter::Int(val) => {
+				if let Some(field) = material.get_field_mut::<i32>(parameter_name) {
+					*field = *val;
+				} else {
+					warn!("unknown i32 material parameter name: {parameter_name}");
 				}
-			},
-			MaterialParameter::UInt(val) => match parameter_name {
-				name => {
-					if let Some(field) = material.get_field_mut::<u32>(name) {
-						*field = *val;
-					} else {
-						warn!("unknown u32 material parameter name: {name}");
-					}
+			}
+			MaterialParameter::UInt(val) => {
+				if let Some(field) = material.get_field_mut::<u32>(parameter_name) {
+					*field = *val;
+				} else {
+					warn!("unknown u32 material parameter name: {parameter_name}");
 				}
-			},
+			}
 			MaterialParameter::Float(val) => match parameter_name {
 				"cutoff" => {
 					// should this only set the value if AlphaMode is already AlphaMode::Mask?
@@ -89,24 +84,20 @@ impl MaterialParameter {
 					}
 				}
 			},
-			MaterialParameter::Vec2(val) => match parameter_name {
-				name => {
-					if let Some(field) = material.get_field_mut::<Vec2>(name) {
-						*field = (*val).into();
-					} else {
-						warn!("unknown vec2 material parameter name: {name}");
-					}
+			MaterialParameter::Vec2(val) => {
+				if let Some(field) = material.get_field_mut::<Vec2>(parameter_name) {
+					*field = (*val).into();
+				} else {
+					warn!("unknown vec2 material parameter name: {parameter_name}");
 				}
-			},
-			MaterialParameter::Vec3(val) => match parameter_name {
-				name => {
-					if let Some(field) = material.get_field_mut::<Vec3>(name) {
-						*field = (*val).into();
-					} else {
-						warn!("unknown vec3 material parameter name: {name}");
-					}
+			}
+			MaterialParameter::Vec3(val) => {
+				if let Some(field) = material.get_field_mut::<Vec3>(parameter_name) {
+					*field = (*val).into();
+				} else {
+					warn!("unknown vec3 material parameter name: {parameter_name}");
 				}
-			},
+			}
 			MaterialParameter::Color(val) => match parameter_name {
 				"color" => {
 					material.color = Srgba::new(val.c.r, val.c.g, val.c.b, val.a).into()
@@ -176,7 +167,7 @@ pub struct StardustModelPlugin;
 impl Plugin for StardustModelPlugin {
 	fn build(&self, app: &mut bevy::prelude::App) {
 		let (tx, rx) = crossbeam_channel::unbounded();
-		LOAD_MODEL_SENDER.set(tx);
+		let _ = LOAD_MODEL_SENDER.set(tx);
 		app.insert_resource(LoadModelReader(rx));
 		app.add_systems(Update, create_model_parts_for_loaded_models);
 		app.add_systems(PreUpdate, load_models);
@@ -214,7 +205,7 @@ fn load_models(rx: Res<LoadModelReader>, mut cmds: Commands, asset_server: Res<A
 				UnprocessedModel,
 			))
 			.id();
-		model.entity.set(entity);
+		let _ = model.entity.set(entity);
 	}
 }
 
@@ -444,7 +435,7 @@ impl Model {
 		});
 		MODEL_REGISTRY.add_raw(&model);
 		if let Some(sender) = LOAD_MODEL_SENDER.get() {
-			sender.send((pending_model_path, model.clone()));
+			let _ = sender.send((pending_model_path, model.clone()));
 		}
 		node.add_aspect_raw(model.clone());
 		Ok(model)