minor code refactor

main
Elijah Voigt 2 years ago
parent aed804863b
commit af53e5c2ea

@ -51,7 +51,7 @@ impl Deck {
Self::cards().into_iter() Self::cards().into_iter()
} }
pub(crate) fn shuffled() -> impl Iterator<Item = Card> { pub(crate) fn shuffled() -> Vec<Card> {
let rs = RandomState::new(); let rs = RandomState::new();
let mut base = Self::cards(); let mut base = Self::cards();
let len = base.len(); let len = base.len();
@ -62,7 +62,11 @@ impl Deck {
base.swap(a as usize, b as usize); base.swap(a as usize, b as usize);
} }
}); });
base.into_iter() base
}
pub(crate) fn iter_shuffled() -> impl Iterator<Item = Card> {
Deck::shuffled().into_iter()
} }
} }

@ -21,7 +21,9 @@ impl Plugin for SetupPlugin {
/// Setup drawing our cards on the screen /// Setup drawing our cards on the screen
pub(crate) fn setup_cards(mut commands: Commands, deck: Res<Deck>) { pub(crate) fn setup_cards(mut commands: Commands, deck: Res<Deck>) {
let size = 75.0; let size = 75.0;
Deck::shuffled().enumerate().for_each(|(i, this_card)| { Deck::iter_shuffled()
.enumerate()
.for_each(|(i, this_card)| {
let this = deck let this = deck
.cards .cards
.get(&this_card) .get(&this_card)

Loading…
Cancel
Save