Move a lot of text texture stuff into its own file

WBOR-91-1-FM · Jan 21, 2025 · edc49d2 · edc49d2
1 parent 56a00de
commit edc49d2
Show file tree

Hide file tree

Showing 12 changed files with 235 additions and 212 deletions.
diff --git a/src/dashboard_defs/easing_fns.rs b/src/dashboard_defs/easing_fns.rs
@@ -23,7 +23,7 @@ fn ease_out_bounce(mut x: f64) -> f64 {
 //////////
 
 pub mod scroll {
-	use crate::texture::pool::TextTextureScrollEaser;
+	use crate::texture::text::TextTextureScrollEaser;
 
 	pub const STAY_PUT: TextTextureScrollEaser = (|_, _| (0.0, true), 1.0);
 

diff --git a/src/dashboard_defs/shared_window_state.rs b/src/dashboard_defs/shared_window_state.rs
@@ -1,7 +1,7 @@
 use crate::{
-    spinitron::state::SpinitronState,
-    texture::pool::{FontInfo, TextureCreationInfo},
-    dashboard_defs::{twilio::TwilioState, clock::ClockHands, error::ErrorState}
+	spinitron::state::SpinitronState,
+	texture::{text::FontInfo, pool::TextureCreationInfo},
+	dashboard_defs::{twilio::TwilioState, clock::ClockHands, error::ErrorState}
 };
 
 pub struct SharedWindowState<'a> {

diff --git a/src/dashboard_defs/spinitron.rs b/src/dashboard_defs/spinitron.rs
@@ -7,10 +7,9 @@ use crate::{
 		shared_window_state::SharedWindowState
 	},
 
-	texture::pool::{
-		DisplayText,
-		TextDisplayInfo,
-		TextureCreationInfo
+	texture::{
+		pool::TextureCreationInfo,
+		text::{DisplayText, TextDisplayInfo}
 	},
 
 	utility_types::{

diff --git a/src/dashboard_defs/themes/barebones.rs b/src/dashboard_defs/themes/barebones.rs
@@ -3,7 +3,11 @@ use sdl2::{render::BlendMode, ttf::{FontStyle, Hinting}};
 use crate::{
 	themes::shared_utils::*,
 	spinitron::{model::SpinitronModelName, state::SpinitronState},
-	texture::pool::{FontInfo, TextureCreationInfo, TexturePool, RemakeTransitionInfo},
+
+	texture::{
+		text::FontInfo,
+		pool::{TextureCreationInfo, TexturePool, RemakeTransitionInfo}
+	},
 
 	utility_types::{
 		file_utils,

diff --git a/src/dashboard_defs/themes/retro_room.rs b/src/dashboard_defs/themes/retro_room.rs
@@ -3,7 +3,11 @@ use sdl2::{render::BlendMode, ttf::{FontStyle, Hinting}};
 use crate::{
 	themes::shared_utils::*,
 	spinitron::{model::SpinitronModelName, state::SpinitronState},
-	texture::pool::{FontInfo, TextureCreationInfo, TexturePool, RemakeTransitionInfo},
+
+	texture::{
+		text::FontInfo,
+		pool::{TextureCreationInfo, TexturePool, RemakeTransitionInfo}
+	},
 
 	utility_types::{
 		file_utils,

diff --git a/src/dashboard_defs/themes/standard.rs b/src/dashboard_defs/themes/standard.rs
@@ -3,7 +3,11 @@ use sdl2::{render::BlendMode, ttf::{FontStyle, Hinting}};
 use crate::{
 	themes::shared_utils::*,
 	spinitron::{model::SpinitronModelName, state::SpinitronState},
-	texture::pool::{FontInfo, TextureCreationInfo, TexturePool, RemakeTransitionInfo},
+
+	texture::{
+		text::FontInfo,
+		pool::{TextureCreationInfo, TexturePool, RemakeTransitionInfo}
+	},
 
 	utility_types::{
 		file_utils,

diff --git a/src/dashboard_defs/twilio.rs b/src/dashboard_defs/twilio.rs
@@ -26,7 +26,8 @@ use crate::{
 
 	texture::{
 		subpool_manager::TextureSubpoolManager,
-		pool::{FontInfo, DisplayText, TextDisplayInfo, TextureCreationInfo, TextureHandle, TexturePool, RemakeTransitionInfo}
+		text::{FontInfo, DisplayText, TextDisplayInfo},
+		pool::{TextureCreationInfo, TextureHandle, TexturePool, RemakeTransitionInfo}
 	}
 };
 

diff --git a/src/dashboard_defs/updatable_text_pattern.rs b/src/dashboard_defs/updatable_text_pattern.rs
@@ -1,12 +1,9 @@
 use std::borrow::Cow;
 
 use crate::{
-	texture::pool::{
-		FontInfo,
-		DisplayText,
-		TextDisplayInfo,
-		TextureCreationInfo,
-		TextTextureScrollEaser
+	texture::{
+		pool::TextureCreationInfo,
+		text::{FontInfo, DisplayText, TextDisplayInfo, TextTextureScrollEaser}
 	},
 
 	window_tree::{

diff --git a/src/dashboard_defs/weather.rs b/src/dashboard_defs/weather.rs
@@ -2,7 +2,11 @@ use std::{collections::HashMap, borrow::Cow};
 
 use crate::{
 	request,
-	texture::pool::{DisplayText, TextDisplayInfo, TextureCreationInfo},
+
+	texture::{
+		pool::TextureCreationInfo,
+		text::{DisplayText, TextDisplayInfo}
+	},
 
 	utility_types::{
 		vec2f::Vec2f,

diff --git a/src/texture/mod.rs b/src/texture/mod.rs
@@ -1,2 +1,3 @@
 pub mod pool;
+pub mod text;
 pub mod subpool_manager;