Make some more stuff shared in the themes. Make the room theme functi…

…onal by bringing in its branch-specific images.
WBOR-91-1-FM · Oct 8, 2024 · f3d75e1 · f3d75e1
1 parent bfd29a2
commit f3d75e1
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 84 deletions.
diff --git a/assets/alternative_text_bubble.png b/assets/alternative_text_bubble.png
diff --git a/assets/dashboard_background.png b/assets/dashboard_background.png
diff --git a/src/dashboard_defs/themes/barebones.rs b/src/dashboard_defs/themes/barebones.rs
@@ -338,33 +338,6 @@ pub async fn make_dashboard(
 
 	////////// Making some static texture windows
 
-	type StaticTextureSetInfo = [(&'static str, Vec2f, Vec2f, bool)];
-
-	async fn make_creation_info_for_static_texture_set(all_info: &StaticTextureSetInfo) -> GenericResult<Vec<TextureCreationInfo>> {
-		TextureCreationInfo::from_paths_async(all_info.iter().map(|&(path, ..)| path)).await
-	}
-
-	fn add_static_texture_set(set: &mut Vec<Window>, all_info: &StaticTextureSetInfo,
-		all_creation_info: &[TextureCreationInfo<'_>], texture_pool: &mut TexturePool<'_>) {
-
-		set.extend(all_info.iter().zip(all_creation_info).map(
-			|(&(_, tl, size, skip_ar_correction), creation_info)| {
-
-			let mut window = Window::new(
-				None,
-				DynamicOptional::NONE,
-				WindowContents::make_texture_contents(creation_info, texture_pool).unwrap(),
-				None,
-				tl,
-				size,
-				None
-			);
-
-			window.set_aspect_ratio_correction_skipping(skip_ar_correction);
-			window
-		}));
-	}
-
 	let mut all_main_windows = vec![twilio_window, weather_window, credit_window];
 	all_main_windows.extend(spinitron_windows);
 	add_static_texture_set(&mut all_main_windows, &main_static_texture_info, &main_static_texture_creation_info, texture_pool);
@@ -408,7 +381,7 @@ pub async fn make_dashboard(
 	let all_windows_window = Window::new(
 		None,
 		DynamicOptional::NONE,
-		WindowContents::Nothing,
+		WindowContents::Color(ColorSDL::RGB(23, 23, 23)),
 		None,
 		Vec2f::ZERO,
 		Vec2f::ONE,

diff --git a/src/dashboard_defs/themes/shared_utils.rs b/src/dashboard_defs/themes/shared_utils.rs
@@ -2,8 +2,14 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 use crate::{
 	error_msg,
-	texture::TextureCreationInfo,
-	utility_types::generic_result::*
+	window_tree::{Window, WindowContents},
+	texture::{TextureCreationInfo, TexturePool},
+
+	utility_types::{
+		vec2f::Vec2f,
+		generic_result::*,
+		dynamic_optional::DynamicOptional
+	}
 };
 
 //////////
@@ -58,3 +64,32 @@ pub fn run_command(command: &str, args: &[&str]) -> GenericResult<String> {
 		String::from_utf8(output.stdout).to_generic().map(|s| s.trim().to_owned())
 	}
 }
+
+//////////
+
+pub type StaticTextureSetInfo = [(&'static str, Vec2f, Vec2f, bool)];
+
+pub async fn make_creation_info_for_static_texture_set(all_info: &StaticTextureSetInfo) -> GenericResult<Vec<TextureCreationInfo>> {
+	TextureCreationInfo::from_paths_async(all_info.iter().map(|&(path, ..)| path)).await
+}
+
+pub fn add_static_texture_set(set: &mut Vec<Window>, all_info: &StaticTextureSetInfo,
+	all_creation_info: &[TextureCreationInfo<'_>], texture_pool: &mut TexturePool<'_>) {
+
+	set.extend(all_info.iter().zip(all_creation_info).map(
+		|(&(_, tl, size, skip_ar_correction), creation_info)| {
+
+		let mut window = Window::new(
+			None,
+			DynamicOptional::NONE,
+			WindowContents::make_texture_contents(creation_info, texture_pool).unwrap(),
+			None,
+			tl,
+			size,
+			None
+		);
+
+		window.set_aspect_ratio_correction_skipping(skip_ar_correction);
+		window
+	}));
+}
diff --git a/src/dashboard_defs/themes/standard.rs b/src/dashboard_defs/themes/standard.rs
@@ -342,33 +342,6 @@ pub async fn make_dashboard(
 
 	////////// Making some static texture windows
 
-	type StaticTextureSetInfo = [(&'static str, Vec2f, Vec2f, bool)];
-
-	async fn make_creation_info_for_static_texture_set(all_info: &StaticTextureSetInfo) -> GenericResult<Vec<TextureCreationInfo>> {
-		TextureCreationInfo::from_paths_async(all_info.iter().map(|&(path, ..)| path)).await
-	}
-
-	fn add_static_texture_set(set: &mut Vec<Window>, all_info: &StaticTextureSetInfo,
-		all_creation_info: &[TextureCreationInfo<'_>], texture_pool: &mut TexturePool<'_>) {
-
-		set.extend(all_info.iter().zip(all_creation_info).map(
-			|(&(_, tl, size, skip_ar_correction), creation_info)| {
-
-			let mut window = Window::new(
-				None,
-				DynamicOptional::NONE,
-				WindowContents::make_texture_contents(creation_info, texture_pool).unwrap(),
-				None,
-				tl,
-				size,
-				None
-			);
-
-			window.set_aspect_ratio_correction_skipping(skip_ar_correction);
-			window
-		}));
-	}
-
 	let mut all_main_windows = vec![twilio_window, credit_window];
 	all_main_windows.extend(spinitron_windows);
 	add_static_texture_set(&mut all_main_windows, &main_static_texture_info, &main_static_texture_creation_info, texture_pool);

diff --git a/src/dashboard_defs/themes/the_room.rs b/src/dashboard_defs/themes/the_room.rs
@@ -339,33 +339,6 @@ pub async fn make_dashboard(
 
 	////////// Making some static texture windows
 
-	type StaticTextureSetInfo = [(&'static str, Vec2f, Vec2f, bool)];
-
-	async fn make_creation_info_for_static_texture_set(all_info: &StaticTextureSetInfo) -> GenericResult<Vec<TextureCreationInfo>> {
-		TextureCreationInfo::from_paths_async(all_info.iter().map(|&(path, ..)| path)).await
-	}
-
-	fn add_static_texture_set(set: &mut Vec<Window>, all_info: &StaticTextureSetInfo,
-		all_creation_info: &[TextureCreationInfo<'_>], texture_pool: &mut TexturePool<'_>) {
-
-		set.extend(all_info.iter().zip(all_creation_info).map(
-			|(&(_, tl, size, skip_ar_correction), creation_info)| {
-
-			let mut window = Window::new(
-				None,
-				DynamicOptional::NONE,
-				WindowContents::make_texture_contents(creation_info, texture_pool).unwrap(),
-				None,
-				tl,
-				size,
-				None
-			);
-
-			window.set_aspect_ratio_correction_skipping(skip_ar_correction);
-			window
-		}));
-	}
-
 	let mut all_main_windows = Vec::new();
 
 	all_main_windows.extend(spinitron_windows);