Moved fade shader images to a submodule of the state.

zsw/src/panel.rs

@@ -2,7 +2,6 @@
 
 // Modules
 mod geometry;
-mod images;
 mod panels;
 mod renderer;
 mod state;
@@ -10,18 +9,13 @@ mod state;
 // Exports
 pub use self::{
 	geometry::{PanelGeometry, PanelGeometryUniforms},
-	images::{PanelFadeImage, PanelFadeImages},
 	panels::Panels,
 	renderer::{PanelFadeShader, PanelShader, PanelSlideShader, PanelsRenderer, PanelsRendererShared},
-	state::{PanelFadeState, PanelNoneState, PanelSlideState, PanelState},
+	state::{PanelFadeImage, PanelFadeState, PanelNoneState, PanelSlideState, PanelState},
 };
 
 // Imports
-use {
-	crate::{display::Display, playlist::PlaylistPlayer},
-	std::sync::Arc,
-	tokio::sync::RwLock,
-};
+use {crate::display::Display, std::sync::Arc, tokio::sync::RwLock};
 
 /// Panel
 #[derive(Debug)]

zsw/src/panel/state.rs

@@ -6,7 +6,11 @@ pub mod none;
 pub mod slide;
 
 // Exports
-pub use self::{fade::PanelFadeState, none::PanelNoneState, slide::PanelSlideState};
+pub use self::{
+	fade::{PanelFadeImage, PanelFadeState},
+	none::PanelNoneState,
+	slide::PanelSlideState,
+};
 
 // Imports
 use super::PanelShader;

zsw/src/panel/state/fade.rs

@@ -1,11 +1,14 @@
 //! Panel fade state
 
+// Modules
+pub mod images;
+
+// Exports
+pub use self::images::{PanelFadeImage, PanelFadeImages};
+
 // Imports
 use {
-	crate::{
-		panel::{PanelFadeImages, PanelFadeShader},
-		playlist::PlaylistPlayer,
-	},
+	crate::{panel::PanelFadeShader, playlist::PlaylistPlayer},
 	chrono::TimeDelta,
 	core::time::Duration,
 	std::{sync::Arc, time::Instant},

zsw/src/panel/state/fade/images.rs

@@ -1,11 +1,10 @@
-//! Panel images
+//! Panel fade images
 
 // Imports
 use {
-	super::PlaylistPlayer,
-	::image::DynamicImage,
+	crate::playlist::PlaylistPlayer,
 	app_error::Context,
-	image::imageops,
+	image::{DynamicImage, imageops},
 	std::{self, mem, path::Path, sync::Arc},
 	tokio::sync::OnceCell,
 	zsw_util::{AppError, Loadable, loadable::Loader},