-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enable the use of named colors (#10)
* Add infrastructure for named colors * Apply named colors on text * Fix color updates not being tracked * Update dynamic example with animated colors * Make tag reference more readable * Remove unused variable
- Loading branch information
1 parent
994518c
commit fcec8aa
Showing
7 changed files
with
173 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| use bevy::{ | ||
| prelude::*, | ||
| utils::{HashMap, HashSet}, | ||
| }; | ||
|
|
||
| pub struct ColorPlugin; | ||
|
|
||
| impl Plugin for ColorPlugin { | ||
| fn build(&self, app: &mut App) { | ||
| app.init_resource::<ColorMap>() | ||
| .add_systems(Update, update_colors); | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub enum BbCodeColor { | ||
| Named(String), | ||
| Static(Color), | ||
| } | ||
|
|
||
| impl BbCodeColor { | ||
| pub fn to_color(&self, color_map: &ColorMap) -> Option<Color> { | ||
| match self { | ||
| Self::Static(color) => Some(*color), | ||
| Self::Named(name) => color_map.get(name), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl From<Color> for BbCodeColor { | ||
| fn from(value: Color) -> Self { | ||
| Self::Static(value) | ||
| } | ||
| } | ||
|
|
||
| impl From<String> for BbCodeColor { | ||
| fn from(value: String) -> Self { | ||
| Self::Named(value) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Resource, Default)] | ||
| pub struct ColorMap { | ||
| /// The map from name to color. | ||
| map: HashMap<String, Color>, | ||
|
|
||
| /// Internal tracker for names where the corresponding color has been updated. | ||
| /// | ||
| /// Used to only update what's needed. | ||
| was_updated: HashSet<String>, | ||
| } | ||
|
|
||
| impl ColorMap { | ||
| /// Insert (add or update) a new named color. | ||
| /// | ||
| /// Returns `&mut self` for chaining. | ||
| pub fn insert<N, C>(&mut self, name: N, color: C) -> &mut Self | ||
| where | ||
| N: Into<String>, | ||
| C: Into<Color>, | ||
| { | ||
| let name = name.into(); | ||
| self.map.insert(name.clone(), color.into()); | ||
| self.was_updated.insert(name); | ||
| self | ||
| } | ||
|
|
||
| /// Get the color for the given name. | ||
| pub fn get(&self, name: &str) -> Option<Color> { | ||
| self.map.get(name).copied() | ||
| } | ||
|
|
||
| /// Determine if any color has been updated. | ||
| pub(crate) fn has_update(&self) -> bool { | ||
| !self.was_updated.is_empty() | ||
| } | ||
|
|
||
| /// Determine if the color with the given name has been updated, and if yes to which value. | ||
| /// | ||
| /// You should probably call [`ColorMap::clear_was_updated`] at some point afterwards. | ||
| pub(crate) fn get_update(&self, name: &str) -> Option<Color> { | ||
| if self.was_updated.contains(name) { | ||
| self.map.get(name).copied() | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
|
|
||
| /// Clear the tracker for the color names which had their values updated. | ||
| pub(crate) fn clear_was_updated(&mut self) { | ||
| self.was_updated.clear(); | ||
| } | ||
| } | ||
|
|
||
| /// Tracker for text that's colored via named BBCode components. | ||
| #[derive(Debug, Component)] | ||
| pub struct BbCodeColored { | ||
| pub name: String, | ||
| } | ||
|
|
||
| /// Update all colors whose name has changed. | ||
| fn update_colors( | ||
| mut color_map: ResMut<ColorMap>, | ||
| mut colored_text_query: Query<(&BbCodeColored, &mut Text)>, | ||
| ) { | ||
| if !color_map.is_changed() || !color_map.has_update() { | ||
| return; | ||
| } | ||
|
|
||
| for (colored, mut text) in colored_text_query.iter_mut() { | ||
| if let Some(color) = color_map.get_update(&colored.name) { | ||
| for section in &mut text.sections { | ||
| section.style.color = color; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| color_map.clear_was_updated(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| pub(crate) mod bbcode; | ||
| pub(crate) mod color; | ||
| pub(crate) mod conversion; | ||
| pub(crate) mod font; | ||
| pub(crate) mod plugin; | ||
|
|
||
| pub use bbcode::{Bbcode, BbcodeBundle, BbcodeSettings}; | ||
| pub use color::ColorMap; | ||
| pub use font::*; | ||
| pub use plugin::BbcodePlugin; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters