Merge branch 'main' into barebones

src/dashboard_defs/spinitron.rs

@@ -75,9 +75,7 @@ pub fn make_spinitron_windows(
 		//////////
 
 		let texture_creation_info = if let Some(text_color) = individual_window_state.maybe_text_color {
-			let model = spinitron_state.get_model_by_name(model_name);
-			let age_state = spinitron_state.get_model_age_info(model_name).1;
-			let model_text = model.to_string(age_state);
+			let model_text = spinitron_state.model_to_string(model_name);
 
 			TextureCreationInfo::Text((
 				Cow::Borrowed(inner_shared_state.font_info),

src/spinitron/state.rs

@@ -308,17 +308,17 @@ impl SpinitronState {
 		})
 	}
 
-	pub fn get_model_age_info(&self, model_name: SpinitronModelName) -> (bool, ModelAgeState) {
-		let age_data = &self.continually_updated.get_data().age_data[model_name as usize];
-		(age_data.just_updated_state, age_data.curr_age_state.clone())
+	const fn get(&self) -> &SpinitronStateData {
+		self.continually_updated.get_data()
 	}
 
-	pub fn get_model_by_name(&self, model_name: SpinitronModelName) -> &dyn SpinitronModel {
-		self.continually_updated.get_data().get_model_by_name(model_name)
+	pub fn get_model_age_info(&self, model_name: SpinitronModelName) -> (bool, ModelAgeState) {
+		let age_data = &self.get().age_data[model_name as usize];
+		(age_data.just_updated_state, age_data.curr_age_state.clone())
 	}
 
 	pub const fn model_was_updated(&self, model_name: SpinitronModelName) -> bool {
-		self.continually_updated.get_data().update_statuses[model_name as usize]
+		self.get().update_statuses[model_name as usize]
 	}
 
 	/* This is meant to be called by a spin texture window, so that the
@@ -328,9 +328,14 @@ impl SpinitronState {
 		self.saved_continually_updated_param = size;
 	}
 
+	pub fn model_to_string(&self, model_name: SpinitronModelName) -> Cow<str> {
+		let age_state = self.get_model_age_info(model_name).1;
+		self.get().get_model_by_name(model_name).to_string(age_state)
+	}
+
 	// Note: this is not for text textures.
 	pub fn get_cached_texture_creation_info(&self, model_name: SpinitronModelName) -> TextureCreationInfo {
-		let bytes = &self.continually_updated.get_data().precached_texture_bytes[model_name as usize];
+		let bytes = &self.get().precached_texture_bytes[model_name as usize];
 		TextureCreationInfo::RawBytes(bytes)
 	}