equal
deleted
inserted
replaced
20 LandGenerationParameters, LandGenerator, |
20 LandGenerationParameters, LandGenerator, |
21 }; |
21 }; |
22 use rand::{seq::SliceRandom, Rng}; |
22 use rand::{seq::SliceRandom, Rng}; |
23 |
23 |
24 use std::{borrow::Borrow, collections::hash_map::HashMap}; |
24 use std::{borrow::Borrow, collections::hash_map::HashMap}; |
|
25 use rand::prelude::IndexedRandom; |
25 use vec2d::Vec2D; |
26 use vec2d::Vec2D; |
26 |
27 |
27 #[derive(PartialEq, Eq, Hash, Clone, Debug)] |
28 #[derive(PartialEq, Eq, Hash, Clone, Debug)] |
28 struct TemplateType(String); |
29 struct TemplateType(String); |
29 |
30 |
166 .template_types |
167 .template_types |
167 .into_iter() |
168 .into_iter() |
168 .map(|(size, indices)| { |
169 .map(|(size, indices)| { |
169 ( |
170 ( |
170 TemplateType(size), |
171 TemplateType(size), |
171 indices.iter().map(|i| (&templates[*i]).to_template(&desc.tiles, &desc.edges)).collect(), |
172 indices.iter().map(|i| templates[*i].to_template(&desc.tiles, &desc.edges)).collect(), |
172 ) |
173 ) |
173 }) |
174 }) |
174 .collect(); |
175 .collect(); |
175 } |
176 } |
176 |
177 |