equal
deleted
inserted
replaced
158 } |
158 } |
159 } |
159 } |
160 |
160 |
161 impl MapGenerator<WfcTemplate> { |
161 impl MapGenerator<WfcTemplate> { |
162 pub fn import_yaml_templates(&mut self, text: &str) { |
162 pub fn import_yaml_templates(&mut self, text: &str) { |
163 let mut desc: WfcTemplateCollectionDesc = serde_yaml::from_str(text).unwrap(); |
163 let mut desc: WfcTemplateCollectionDesc = toml::from_str(text).unwrap(); |
164 let templates = std::mem::take(&mut desc.templates); |
164 let templates = std::mem::take(&mut desc.templates); |
165 self.templates = desc |
165 self.templates = desc |
166 .template_types |
166 .template_types |
167 .into_iter() |
167 .into_iter() |
168 .map(|(size, indices)| { |
168 .map(|(size, indices)| { |
169 ( |
169 ( |
170 TemplateType(size), |
170 TemplateType(size), |
171 indices.iter().map(|i| (&templates[*i]).into()).collect(), |
171 indices.iter().map(|i| (&templates[*i]).to_template(&desc.tiles, &desc.edges)).collect(), |
172 ) |
172 ) |
173 }) |
173 }) |
174 .collect(); |
174 .collect(); |
175 } |
175 } |
176 |
176 |